工序设备字段新增

src/main/java/com/aps/common/util/R.java

@@ -35,7 +35,7 @@ public class R<T> implements Serializable {
     @Getter
     @Setter
     @Schema(description = "接口返回时间，默认带有毫秒数值,用于数据排查问题")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss SSS")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
     private LocalDateTime timestamp = LocalDateTime.now();
 
     public static <T> R<T> ok() {

src/main/java/com/aps/entity/ProdEquipment.java

@@ -13,6 +13,7 @@ public class ProdEquipment implements Serializable {
     private String sceneId;
     private Long equipId;
     private String equipCode;
+    private String equipName;
     private Long resourceId;
     private String resourceCode;
     private String execId;

src/main/java/com/aps/entity/basic/Entry.java

@@ -142,5 +142,7 @@ public class Entry {
     private double changeLineTime;//换模时间
     private BigDecimal setupTime;
     private int constTime;
+    private String equipCode;//设备编码
+    private String equipName;//设备编码
 
 }

src/main/java/com/aps/entity/basic/MachineOption.java

@@ -19,4 +19,5 @@ public class MachineOption {
     private int teardownTime; // 收尾时间（后处理时间）
     private int contantTime; // 常数时间
     private int preTime; // 前处理时间
+    private String equipName;
 }
\ No newline at end of file

src/main/java/com/aps/service/Algorithm/GeneticDecoder.java

@@ -377,7 +377,8 @@ if(finishedOrder==null||finishedOrder.size()==0)
                 .findFirst().orElse(null);
 
         operation.setSelectMachineID(machine.getId());
-
+        operation.setEquipCode(machine.getCode());
+        operation.setEquipName(machine.getName());
 
         int teardownTime = machineOption.getTeardownTime();
         int preTime = machineOption.getPreTime();

src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java

@@ -72,7 +72,8 @@ public class MaterialRequirementService {
 
     @Autowired
     RoutingDataService _routingDataService;
-
+    @Autowired
+    private EquipinfoService equipinfoService;
     @Autowired
     private RoutingDiscreteParamService _routingDiscreteParamService;
 
@@ -328,8 +329,8 @@ if(routingIds.size()==0)
         List<ProdProcessExec> processExecList = RoutingDetails.stream()
                 .map(detail -> lanuchService.createProcessExec(prodOrderMain, detail, sceneId, finalRoutingDetailEquips))
                 .collect(Collectors.toList());
-
-        List<ProdEquipment> ProdEquipmentList=  lanuchService.batchInsertEquipMent(routingDetailEquips, sceneId,processExecList,false);
+        List<Equipinfo> equipinfoList = equipinfoService.lambdaQuery().eq(Equipinfo::getIsdeleted, 0).list();
+        List<ProdEquipment> ProdEquipmentList=  lanuchService.batchInsertEquipMent(routingDetailEquips, sceneId,processExecList,false,equipinfoList);
 
 
 

src/main/java/com/aps/service/Algorithm/RoutingDataService.java

@@ -258,6 +258,7 @@ public class RoutingDataService {
                             mo.setRuntime(e.getRuntime());
                             mo.setSingleOut(e.getSingleOut());
                             mo.setEquipCode(e.getEquipCode());
+                            mo.setEquipName(e.getEquipName());
                             mo.setResourceCode(e.getResourceCode());
                             mo.setProcessingTime(e.getSpeed());
                             mo.setContantTime(op.getConstTime());

src/main/java/com/aps/service/LanuchService.java

@@ -44,7 +44,7 @@ public interface LanuchService {
 
     List<ProdEquipment> batchInsertEquipMent(
             List<RoutingDetailEquip> routingDetailEquips,
-            String sceneId,List<ProdProcessExec> processExecList,Boolean isSave);
+            String sceneId,List<ProdProcessExec> processExecList,Boolean isSave,List<Equipinfo> equipinfo);
 
     List<ProdOrderProcess> createProcessRelations(ProdLaunchOrder prodOrderMain, String sceneId, Map<String, String> routingDetailIdToExecIdMap);
 

src/main/java/com/aps/service/common/ChromosomeDataService.java

@@ -479,13 +479,13 @@ public class ChromosomeDataService {
             List<?> pagedData = dataList.subList(fromIndex, toIndex);
 
             result.put("records", pagedData);
-            result.put("total", total);
-            result.put("current", page);
+            result.put("totalCount", total);
+            result.put("pageIndex", page);
             result.put("size", size);
         } else {
             result.put("records", data);
-            result.put("total", 1);
-            result.put("current", 1);
+            result.put("totalCount", 1);
+            result.put("pageIndex", 1);
             result.put("size", 1);
         }
 

src/main/java/com/aps/service/common/DatabaseQueryService.java

@@ -91,8 +91,8 @@ public class DatabaseQueryService {
 
         Map<String, Object> result = new HashMap<>();
         result.put("records", records);
-        result.put("total", total != null ? total : 0);
-        result.put("current", page);
+        result.put("totalCount", total != null ? total : 0);
+        result.put("pageIndex", page);
         result.put("size", size);
 
         return result;