Merge remote-tracking branch 'origin/master'

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

@@ -1653,6 +1653,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //逻辑删除坯料计划工序作业-可选设备
         apsProcessOperationEquService.remove(new QueryWrapper<ApsProcessOperationEquDo>().lambda().eq(ApsProcessOperationEquDo::getBlankid, req.getId()));
 
+        //逻辑删除坯料计划工序作业-作业明细
+        apsProcessOperationProcessEquService.remove(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getBlankid, req.getId()));
+
         //逻辑删除坯料计划的工艺路线
         this.baseMapper.removeMindMappingByBlankId(req.getId());
     }

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

@@ -93,7 +93,7 @@
         <if test="productionOrderIds != null and productionOrderIds.size() >0">
             UPDATE aps_blank_order b
             <set>
-                PRODUCTSTATUS= PRODUCTSTATUS=(select
+                PRODUCTSTATUS=(select
                 CASE
                 WHEN GROUP_CONCAT(DISTINCT a.PROCESSSTATUS) = '10' THEN '10'
                 WHEN GROUP_CONCAT(DISTINCT a.PROCESSSTATUS) = '20' THEN '20'
@@ -106,7 +106,7 @@
                 WHEN FIND_IN_SET('20',GROUP_CONCAT(DISTINCT a.PROCESSSTATUS)) THEN '20'
                 ELSE b.PRODUCTSTATUS END
                 from aps_process_operation a where a.BLANKID = b.ID and deleted='0'
-                ),),
+                ),
                 SCHEDULINGSTATUS= "20"
             </set>
             <where>