aps-订单暂存，重新计算订单的生产状态

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

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.*;
@@ -55,6 +56,7 @@ import static com.rongwei.safecommon.utils.SaveConstans.DatePattern.DATE_PATTERN
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
+import static com.rongwei.safecommon.utils.SaveConstans.ProductionStatus.TO_BE_SCHEDULED;
 
 /**
  *
@@ -1176,6 +1178,22 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = apsProductionMergeOrderService.list(new LambdaQueryWrapper<ApsProductionMergeOrderDo>().eq(ApsProductionMergeOrderDo::getMainid, id));
             setBlankColumn(oldOrder, apsBlankOrderDoList, apsProductDetailVoList, apsProductionMergeOrderDoList);
 
+            //更新订单的生产状态
+            if (!apsBlankOrderDoList.isEmpty()) {
+                CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();
+                commonUpdateProductionStatusReq.setBlankId(apsBlankOrderDoList.get(0).getId());
+                apsProcessOperationProcessEquService.updateProductionStatus(commonUpdateProductionStatusReq);
+            } else {
+                //更新订单生产状态为“待排程10”
+                this.update(new LambdaUpdateWrapper<ApsProductionOrderDo>()
+                        .eq(ApsProductionOrderDo::getId, id)
+                        .set(ApsProductionOrderDo::getProductionstatus, TO_BE_SCHEDULED));
+                //更新订单的产品明细的生产状态为“待排程10”
+                apsProductDetailService.update(new LambdaUpdateWrapper<ApsProductDetailDo>()
+                        .eq(ApsProductDetailDo::getMainid, id)
+                        .set(ApsProductDetailDo::getProductstatus, TO_BE_SCHEDULED));
+            }
+
             //提交流程
             if (req.getIsSubmitWf()) {
                 String processinstid = nowApsProductionOrderDo.getProcessinstid();