Merge branch 'refs/heads/master' into mode-min-unit

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

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

@@ -62,15 +62,6 @@
              OUTPUTUNQUALIFIEDNUM = IFNULL(OUTPUTUNQUALIFIEDNUM,0) +#{unqualifiedQuantity},-->
             apope.CHECKOUTROLL = IFNULL(CHECKOUTROLL,0) +#{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时 更新 为已完工  -->
@@ -80,9 +71,15 @@
 #                     ELSE '未完工'
 #                     END,
                     <!--  作业状态-->
-
-                    <!--实际完工时间-->
-
+<!--                    apope.WORKSTATUS= CASE-->
+<!--                    WHEN (apope.PLANPROCESSRALL -#{currentCheckNum}) = 0 THEN '已完工'-->
+<!--                    ELSE apope.WORKSTATUS-->
+<!--                    END,-->
+<!--                    &lt;!&ndash;实际完工时间&ndash;&gt;-->
+<!--                    apope.ACTUALFINISHDATE = CASE-->
+<!--                    WHEN (apope.PLANPROCESSRALL - #{currentCheckNum}) = 0 THEN NOW()-->
+<!--                    ELSE apope.ACTUALFINISHDATE-->
+<!--                    END-->
                 </when>
                 <otherwise>
                     <!-- 存在上一个工序 上道工序作业已完工 当前工序作业明细的已开工卷数=已检验卷数-->