维多利亚

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -83,19 +83,20 @@
         SELECT t.*,
                t2.changeNum
         FROM (
-                 SELECT m.ID                                       AS materialId,
-                        mc.NAME                                    AS categoryName,
-                        m.NAME                                     AS materialName,
-                        m.CODE                                     AS materialCode,
-                        m.Width                                    AS materialWidth,
-                        sum(sd.Quantity)                           AS sum,
-                        count(sd.Quantity)                         AS count,
-                        m.SafetyStock                              AS materialSafetyStock,
-                        IF(a.CheckTagCount = a.TagQuantity AND
-                           a.CheckTagCount = a.HandTagCount, 1, 0) AS inventoryResults,
-                        ifnull(a.CheckTagCount - a.TagQuantity, 0) AS correctionQuantity,
-                        a.CheckTime                                AS checkTime,
-                        uu.RealName                                AS OperUserName
+                 SELECT m.ID                                                                               AS materialId,
+                        mc.NAME                                                                            AS categoryName,
+                        m.NAME                                                                             AS materialName,
+                        m.CODE                                                                             AS materialCode,
+                        m.Width                                                                            AS materialWidth,
+                        sum(sd.Quantity)                                                                   AS sum,
+                        count(sd.Quantity)                                                                 AS count,
+                        m.SafetyStock                                                                      AS materialSafetyStock,
+                        if(a.MaterialCode is null, 1,
+                           IF(a.CheckTagCount = a.TagQuantity AND a.CheckTagCount = a.HandTagCount, 1,
+                              0))                                                                          AS inventoryResults,
+                        ifnull(a.CheckTagCount - a.TagQuantity, 0)                                         AS correctionQuantity,
+                        a.CheckTime                                                                        AS checkTime,
+                        uu.RealName                                                                        AS OperUserName
                  FROM material m
                           LEFT JOIN stock_detail sd ON sd.MaterialCode = m.`code`
                           LEFT JOIN (