feature 发布和取消发布的时候更新订单的状态

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

@@ -35,6 +35,7 @@ public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
     void blankApsCancel(List<String> apsBlankIds);
 
     R publish(List<String> blankIds);
+
     R publishCancel(List<String> blankIds);
 
     R insertOrder(Map<String, Object> params) throws Exception;

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

@@ -229,6 +229,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         List<String> collect = apsBlankOrderDos.stream().map(ApsBlankOrderDo::getProductionorderid).distinct().collect(Collectors.toList());
         // 更新工序作业的状态
         apsProcessOperationDao.publish(collect);
+        // 更新订单表的生产状态
+        blankIds.forEach(blankId->{
+            processOperationProcessEquService.updateOrder(blankId);
+        });
         // 根据坯料ID 删除 备份数据
         ApsUtils.clearBackup(null);
         return R.ok();
@@ -282,6 +286,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         // 更新工序作业的状态
         apsProcessOperationDao.publishCancel(collect);
         // 根据坯料ID 删除 备份数据
+        // 更新订单表的生产状态
+        blankIds.forEach(blankId->{
+            processOperationProcessEquService.updateOrder(blankId);
+        });
         ApsUtils.clearBackup(null);
         return R.ok();
     }

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

@@ -131,7 +131,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         return R.ok();
     }
 
-    private void updateProcess(String processOperationEquId) {
+    public void updateProcess(String processOperationEquId) {
         String processOperationId = updateProcessByProcessEquId(processOperationEquId);
 
         if (ObjectUtil.isEmpty(processOperationId)) {
@@ -525,7 +525,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         return R.ok();
     }
 
-    private void updateBlank(String processOperationId) {
+    public void updateBlank(String processOperationId) {
         //查询此工序的所属订单ID
         String orderId = this.baseMapper.selectOrderIdByProcessOperationId(processOperationId);
 
@@ -619,7 +619,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     }
 
 
-    private void updateOrder(String blankId) {
+    public void updateOrder(String blankId) {
         //查询此坯料计划的所属订单的最小生产状态和订单ID
         CommonUpdateProductionStatusReq three = this.baseMapper.selectBlankMinAndMaxStatus(blankId);
         if (ObjectUtil.isEmpty(three)) {
@@ -642,7 +642,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         updateProductDetail(orderId);
     }
 
-    private void updateProductDetail(String orderId) {
+    public void updateProductDetail(String orderId) {
         List<ApsProductDetailDo> list = apsProductDetailService.list(new QueryWrapper<ApsProductDetailDo>().lambda().eq(ApsProductDetailDo::getMainid, orderId));
         if (list.size() > 0) {
             List<String> productIdList = list.stream().map(ApsProductDetailDo::getId).collect(Collectors.toList());