新购入库问题修改

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml

@@ -486,12 +486,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by status
     </select>
     <select id="isOperateAll" resultType="java.lang.Integer">
-        SELECT
-            count(*)
-        FROM
-            purchase_check_details
-        WHERE
-            task_id =  #{taskId} and (status = 1 or status=6)
+        SELECT count(*)
+        FROM (SELECT CASE
+
+                         WHEN
+                             pmi.ma_code IS NOT NULL THEN
+                             CASE
+
+                                 WHEN pmi.STATUS = 0 THEN
+                                     1
+                                 WHEN pmi.STATUS = 1 THEN
+                                     4
+                                 WHEN pmi.STATUS = 2 THEN
+                                     5
+                                 ELSE 1
+                                 END
+                         ELSE pcd.STATUS
+                         END AS STATUS
+              FROM purchase_check_details pcd
+                       LEFT JOIN purchase_macode_info pmi ON pmi.task_id = pcd.task_id
+                  AND pmi.type_id = pcd.type_id
+                       LEFT JOIN ma_machine mm ON pmi.ma_code = mm.ma_code
+              WHERE pcd.task_id = #{taskId}) aa
+        WHERE (STATUS = 1 OR STATUS = 6)
     </select>
     <select id="selectPurchaseCheckDetailsStatus" resultType="java.lang.Integer">
         SELECT