更新刀具变化记录数据

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/collection/DeviceCollectionTaskJob.java

@@ -8,6 +8,7 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.zuihou.business.centralToolMagazine.dto.ApplyChangeModeWithToolDto;
 import com.github.zuihou.business.centralToolMagazine.dto.ApplyChangeToolDetailDto;
 import com.github.zuihou.business.centralToolMagazine.dto.ApplyChangeToolDto;
@@ -17,7 +18,9 @@ import com.github.zuihou.business.centralToolMagazine.service.ResourceToolServic
 import com.github.zuihou.business.centralToolMagazine.service.ToolHandleService;
 import com.github.zuihou.business.centralToolMagazine.service.ToolManagementService;
 import com.github.zuihou.business.centralToolMagazine.service.ToolStorgeService;
+import com.github.zuihou.business.operationManagementCenter.entity.TWorkpiece;
 import com.github.zuihou.business.operationManagementCenter.service.ToolTaskNodeService;
+import com.github.zuihou.business.operationManagementCenter.service.WorkpieceService;
 import com.github.zuihou.business.productionReadyCenter.entity.*;
 import com.github.zuihou.business.productionReadyCenter.dao.DeviceCollectionDetailMapper;
 import com.github.zuihou.business.productionReadyCenter.dao.DeviceCollectionMapper;
@@ -25,7 +28,9 @@ import com.github.zuihou.business.productionReadyCenter.service.CuttingToolServi
 import com.github.zuihou.business.productionReadyCenter.service.CuttingToolSynRecordService;
 import com.github.zuihou.business.productionReadyCenter.service.DeviceStateRecordService;
 import com.github.zuihou.business.productionResourceCenter.entity.Productionresource;
+import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourceBizService;
+import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
@@ -93,6 +98,11 @@ public class DeviceCollectionTaskJob {
     @Autowired
     private CuttingToolSynRecordService cuttingToolSynRecordService;
 
+    @Autowired
+    private ProductionresourcePositionService productionresourcePositionService;
+
+    @Autowired
+    private WorkpieceService workpieceService;
 
     private static Snowflake snowflake = new Snowflake(1, 1, true);
     /**
@@ -210,6 +220,9 @@ public class DeviceCollectionTaskJob {
                  CuttingToolSynRecord cuttingToolSynRecord = cuttingToolSynRecordService.getOne(new LbqWrapper<CuttingToolSynRecord>().eq(CuttingToolSynRecord::getMachineId, deviceCollection.getDeviceId()).orderByDesc(CuttingToolSynRecord::getCreateTime).last("LIMIT 1"));
                  if(null == cuttingToolSynRecord || cuttingToolSynRecord.getCurrentToolNo()!= currentToolNo){
                      CuttingToolSynRecord instance = CuttingToolSynRecord.builder().machineId(deviceCollection.getDeviceId()).currentToolNo(currentToolNo).type(null == cuttingToolSynRecord? "新增":"更新").build();
+                     ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getFreeProductionresourcePositionByIds(new String[]{deviceCollection.getDeviceId().toString()}).get(0);
+                     TWorkpiece tWorkpiece = workpieceService.getOne(new LambdaQueryWrapper<TWorkpiece>().eq(TWorkpiece::getIsEnd, "0").eq(TWorkpiece::getStorgeId, productionresourcePosition.getStorgeId()));
+                     instance.setOrderName(tWorkpiece.getOrderName()).setOrderId(tWorkpiece.getOrderId()).setTaskNodeId(tWorkpiece.getTaskNodeId());
                      cuttingToolSynRecordService.save(instance);
                  }
              }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/CuttingToolSynRecord.java

@@ -71,8 +71,18 @@ public class CuttingToolSynRecord extends Entity<Long> {
     @Excel(name = "工件ID")
     private Long workpieceId;
 
+    @ApiModelProperty(value = "工件ID")
+    @TableField(value = "task_node_id", condition = LIKE)
+    @Excel(name = "节点ID")
+    private Long taskNodeId;
+
+    @ApiModelProperty(value = "订单名称")
+    @TableField(value = "order_name", condition = LIKE)
+    @Excel(name = "订单名称")
+    private String orderName;
+
     @Builder
-    public CuttingToolSynRecord(Long id, Long machineId, String cuttingToolName, String currentToolNo, String type, String content, Long orderId, Long workpieceId, Long createUser, LocalDateTime createTime, Long updateUser, LocalDateTime updateTime) {
+    public CuttingToolSynRecord(Long id, Long machineId, String cuttingToolName, String currentToolNo, String type, String content,Long taskNodeId, String orderName, Long orderId, Long workpieceId, Long createUser, LocalDateTime createTime, Long updateUser, LocalDateTime updateTime) {
         this.id = id;
         this.machineId = machineId;
         this.cuttingToolName = cuttingToolName;
@@ -85,5 +95,7 @@ public class CuttingToolSynRecord extends Entity<Long> {
         this.createTime = createTime;
         this.updateTime = updateTime;
         this.currentToolNo = currentToolNo;
+        this.taskNodeId = taskNodeId;
+        this.orderName = orderName;
     }
 }