Merge remote-tracking branch 'origin/master'

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/StationUserController.java

@@ -539,7 +539,8 @@ public class StationUserController extends SuperController<StationUserService, L
         Order order = orderService.save(params);
         String start = model.containsKey("start") ? model.get("start").toString() : null;
         String goal = model.containsKey("goal") ? model.get("goal").toString() : null;
-        if (StringUtil.isEmpty(start) || StringUtil.isEmpty(goal)) return R.fail("传参有误");
+        String isErase = model.containsKey("isErase")?model.get("isErase").toString() : null;
+        if (StringUtil.isEmpty(start) || StringUtil.isEmpty(goal) || StringUtil.isEmpty(isErase)) return R.fail("传参有误");
 
         //原加工订单预处理（MQ消息和节点状态改完成）
         String[] startNameCondition = start.split("_");
@@ -554,8 +555,9 @@ public class StationUserController extends SuperController<StationUserService, L
         taskNodeService.update(null, updateWrapper);
 
         //isMachine=1 判断地轨功能事件
+        String confBatch = isErase.equals("1")? tWorkpiece.getCompleteBatchNo(): "";
         OrderTask orderTask = OrderTask.builder().orderId(order.getId()).isDelete(1)
-                .hasMaterial("0").isMachine("1").isXbk("1").start(model.get("start").toString()).goal(model.get("goal").toString()).confBatchNo(tWorkpiece.getCompleteBatchNo())
+                .hasMaterial("0").isMachine("1").isXbk("1").start(model.get("start").toString()).goal(model.get("goal").toString()).confBatchNo(confBatch)
                 .build();
         orderTaskService.save(orderTask);
         OrderUpdateDTO orderUpdateDTO = OrderUpdateDTO.builder().ids(Arrays.asList(order.getId())).auditStatus("1").build();