tasknode 添加procedureId 字段

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -238,6 +238,15 @@ public class TaskWorkNode {
                 BBom bom = bBomMapper.selectById(tTask.getBomId());
                 ZZone bomzZone = zoneService.getById(bom.getId());
                 queryMap.put("bomzZone", bomzZone);
+
+                //设置workpiece表当前执行的工序
+                List<TWorkpiece>list = workpieceMapper.selectList(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getCompleteBatchNo,taskNode.getCompleteBatchNo()));
+                if(CollectionUtil.isNotEmpty(list)){
+                    TWorkpiece workpiece = list.get(0);
+                    workpiece.setProcedureId(tTask.getProcedureId());
+                    workpieceMapper.updateById(workpiece);
+                }
+
                 //运行条件验证
                 Map conMap = checkCon(taskNode, tTask, queryMap);
                 if (null == conMap) {

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -356,7 +356,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                         taskNode.setTaskId(t.getId()).setOrderId(t.getOrderId())
                                 .setTaskNodeNo(codeRuleService.getBillCode(CodeRuleModule.CODE_RULE_TASK_NODE));
                         taskNode.setAutoNode(autoCode).setNodeNo(autoCode.getNo()).setCompleteBatchNo(t.getCompleteBatchNo())
-                                .setExeStatus("1").setPrority(autoCode.getWeight()).setNodeName(autoCode.getName());
+                                .setExeStatus("1").setPrority(autoCode.getWeight()).setNodeName(autoCode.getName()).setProcedureId(t.getProcedureId());
 //                    if (autoNode.getInterfaceType() != null) {
 //                        taskNode.setInterfaceType(autoNode.getInterfaceType().getKey());
 //                    }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TaskNode.java

@@ -212,6 +212,15 @@ public class TaskNode extends Entity<Long> {
     private String completeBatchNo;
 
 
+    /**
+     * 工序ID
+     */
+    @ApiModelProperty(value = "工序ID")
+    @TableField("procedure_id")
+    @Excel(name = "工序ID")
+    private Long procedureId;
+
+
     @ApiModelProperty(value = "工序名称")
     @TableField(exist = false)
     private String procedureName;