feature

1.报工检验不在更新工序作业状态相关内容

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -61,7 +61,16 @@
             <!--  OUTPUTQUALIFIEDNUM = IFNULL(OUTPUTQUALIFIEDNUM,0)+ #{qualifiedQuantity},
              OUTPUTUNQUALIFIEDNUM = IFNULL(OUTPUTUNQUALIFIEDNUM,0) +#{unqualifiedQuantity},-->
             apope.CHECKOUTROLL = IFNULL(CHECKOUTROLL,0) +#{currentCheckNum},
-            apope.UNFINISHROLL = PLANPROCESSRALL -#{currentCheckNum},
+            apope.UNFINISHROLL = PLANPROCESSRALL -#{currentCheckNum}
+#             apope.WORKSTATUS= CASE
+#             WHEN (apope.PLANPROCESSRALL -#{currentCheckNum}) = 0 THEN '已完工'
+#             WHEN (apope.PLANPROCESSRALL -#{currentCheckNum}) > 0 THEN '已完工'
+#             ELSE apope.WORKSTATUS
+#             END,
+#             apope.ACTUALFINISHDATE = CASE
+#             WHEN (apope.PLANPROCESSRALL - #{currentCheckNum}) = 0 THEN NOW()
+#             ELSE apope.ACTUALFINISHDATE
+#             END
             <choose>
                 <when test="previousprocessid == null and previousprocessid == ''">
                     <!-- 不存在上一个工序 未完工卷数等于0时 更新 为已完工  -->
@@ -71,15 +80,9 @@
 #                     ELSE '未完工'
 #                     END,
                     <!--  作业状态-->
-                    apope.WORKSTATUS= CASE
-                    WHEN (apope.PLANPROCESSRALL -#{currentCheckNum}) = 0 THEN '已完工'
-                    ELSE apope.WORKSTATUS
-                    END,
+
                     <!--实际完工时间-->
-                    apope.ACTUALFINISHDATE = CASE
-                    WHEN (apope.PLANPROCESSRALL - #{currentCheckNum}) = 0 THEN NOW()
-                    ELSE apope.ACTUALFINISHDATE
-                    END
+
                 </when>
                 <otherwise>
                     <!-- 存在上一个工序 上道工序作业已完工 当前工序作业明细的已开工卷数=已检验卷数-->
@@ -96,23 +99,23 @@
 <!--                        ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual )THEN '已完工'-->
 <!--                        ELSE '未完工'-->
 <!--                    END,-->
-                    apope.WORKSTATUS =
-                    CASE
-                        WHEN  (select (select apo.CLOSESTATUS='已完工' from aps_process_operation apo where apo.ID =#{previousprocessid} )
-                    <!--并且作业明细待加工料卷批次号数量-工序作业已取消卷数<=0-->
-                    and (select IFNULL(LENGTH(apope.BACHMATERIALPROCESS) - LENGTH(REPLACE(apope.BACHMATERIALPROCESS, ',',
-                    '')) + 1 ,0)-IFNULL(apo.CANCELROLL,0)&lt;=0 from aps_process_operation apo where apo.ID =#{processOperationId}
-                    ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual) THEN '已完工'
-                        ELSE apope.WORKSTATUS
-                    END,
-                    apope.ACTUALFINISHDATE =  CASE
-                    WHEN  (select (select apo.CLOSESTATUS='已完工' from aps_process_operation apo where apo.ID =#{previousprocessid} )
-                    <!--并且作业明细待加工料卷批次号数量-工序作业已取消卷数<=0-->
-                    and (select IFNULL(LENGTH(apope.BACHMATERIALPROCESS) - LENGTH(REPLACE(apope.BACHMATERIALPROCESS, ',',
-                    '')) + 1 ,0)-IFNULL(apo.CANCELROLL,0)&lt;=0 from aps_process_operation apo where apo.ID =#{processOperationId}
-                    ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual) THEN NOW()
-                    ELSE apope.ACTUALFINISHDATE
-                    END
+<!--                    apope.WORKSTATUS =-->
+<!--                    CASE-->
+<!--                        WHEN  (select (select apo.CLOSESTATUS='已完工' from aps_process_operation apo where apo.ID =#{previousprocessid} )-->
+<!--                    &lt;!&ndash;并且作业明细待加工料卷批次号数量-工序作业已取消卷数<=0&ndash;&gt;-->
+<!--                    and (select IFNULL(LENGTH(apope.BACHMATERIALPROCESS) - LENGTH(REPLACE(apope.BACHMATERIALPROCESS, ',',-->
+<!--                    '')) + 1 ,0)-IFNULL(apo.CANCELROLL,0)&lt;=0 from aps_process_operation apo where apo.ID =#{processOperationId}-->
+<!--                    ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual) THEN '已完工'-->
+<!--                        ELSE apope.WORKSTATUS-->
+<!--                    END,-->
+<!--                    apope.ACTUALFINISHDATE =  CASE-->
+<!--                    WHEN  (select (select apo.CLOSESTATUS='已完工' from aps_process_operation apo where apo.ID =#{previousprocessid} )-->
+<!--                    &lt;!&ndash;并且作业明细待加工料卷批次号数量-工序作业已取消卷数<=0&ndash;&gt;-->
+<!--                    and (select IFNULL(LENGTH(apope.BACHMATERIALPROCESS) - LENGTH(REPLACE(apope.BACHMATERIALPROCESS, ',',-->
+<!--                    '')) + 1 ,0)-IFNULL(apo.CANCELROLL,0)&lt;=0 from aps_process_operation apo where apo.ID =#{processOperationId}-->
+<!--                    ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual) THEN NOW()-->
+<!--                    ELSE apope.ACTUALFINISHDATE-->
+<!--                    END-->
                 </otherwise>
             </choose>