bugFix 解决排程发布 报错的问题

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -162,6 +162,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     }
 
     @Override
+    @Transactional
     public R publish(List<String> blankIds) {
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
@@ -222,6 +223,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      * @return
      */
     @Override
+    @Transactional
     public R publishCancel(List<String> blankIds) {
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");

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

@@ -89,7 +89,7 @@
             <where>
                 DELETED='0'
                 AND MAINID IN
-                <foreach collection="productionOrderIds" open="(" close=")" item="id" separator=";">
+                <foreach collection="productionOrderIds" open="(" close=")" item="id" separator=",">
                     #{id}
                 </foreach>
             </where>
@@ -100,7 +100,7 @@
         update aps_product_detail set PRODUCTSTATUS =#{productStatus} where ID IN(
         SELECT distinct PRODUCTID from aps_process_output_product where DELETED='0' AND
         BLANKID IN
-        <foreach collection="blankIds" open="(" close=")" item="id" separator=";">
+        <foreach collection="blankIds" open="(" close=")" item="id" separator=",">
             #{id}
         </foreach>
         )

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

@@ -135,7 +135,7 @@
                     WHEN FIND_IN_SET('40',GROUP_CONCAT(DISTINCT apo.PROCESSSTATUS)) THEN '40'
                     WHEN FIND_IN_SET('30',GROUP_CONCAT(DISTINCT apo.PROCESSSTATUS)) THEN '30'
                     WHEN FIND_IN_SET('20',GROUP_CONCAT(DISTINCT apo.PROCESSSTATUS)) THEN '20'
-                    ELSE b.PRODUCTSTATUS END
+                    ELSE b.PRODUCTIONSTATUS END
                     FROM
                     aps_process_operation apo
                     LEFT JOIN aps_blank_order abo ON apo.BLANKID = abo.ID AND abo.DELETED='0'
@@ -168,7 +168,7 @@
                         WHEN FIND_IN_SET('40',GROUP_CONCAT(DISTINCT apo.PROCESSSTATUS)) THEN '40'
                         WHEN FIND_IN_SET('30',GROUP_CONCAT(DISTINCT apo.PROCESSSTATUS)) THEN '30'
                         WHEN FIND_IN_SET('20',GROUP_CONCAT(DISTINCT apo.PROCESSSTATUS)) THEN '20'
-                        ELSE b.PRODUCTSTATUS
+                        ELSE b.PRODUCTIONSTATUS
                     END
                     FROM
                     aps_process_operation apo