feature 代码提交

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

@@ -63,7 +63,7 @@
             apope.CHECKOUTROLL = IFNULL(CHECKOUTROLL,0) +#{currentCheckNum},
             apope.UNFINISHROLL = PLANPROCESSRALL -#{currentCheckNum},
             <choose>
-                <when test="previousprocessid != null and previousprocessid != ''">
+                <when test="previousprocessid == null and previousprocessid == ''">
                     <!-- 不存在上一个工序 未完工卷数等于0时 更新 为已完工  -->
                     <!-- 完工状态-->
                     apope.CLOSESTATUS= CASE
@@ -87,30 +87,30 @@
                     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 '已完工'
+                        ) 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} )
+                        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 '已完工'
+                    ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual) THEN '已完工'
                         ELSE apope.WORKSTATUS
                     END,
-                    apope.ACTUALFINISHDATE = CASE
-                    WHEN  CASE
-                    WHEN  select (select apo.CLOSESTATUS='已完工' from aps_process_operation apo where apo.ID =#{previousprocessid} )
+                    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()
+                    ) and apope.STARTINGROLL = apope.CHECKOUTROLL+#{currentCheckNum}  from dual) THEN NOW()
                     ELSE apope.ACTUALFINISHDATE
                     END
                 </otherwise>