Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/BtoController.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesBtoJobService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2024/6/21 11:46
+ * @Modify:
+ **/
+@RestController
+@Api(description = "bto生产")
+@RequestMapping( "/bto-data")
+public class BtoController {
+    @Autowired
+    private IMesBtoJobService btoJobService;
+
+    @PostMapping
+    public void create(@RequestParam String organizeCode,@RequestParam List<String> groupCodeList){
+        btoJobService.doCreateBto(organizeCode, groupCodeList);
+    }
+}

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/model/AssetInfo.java

@@ -12,11 +12,11 @@ import lombok.Data;
 @Data
 public class AssetInfo {
     private String ASSETNUM;
-    private String cur30;
-    private String description;
+    private String CUR30;
+    private String DESCRIPTION;
     private String FAILURECODE;
-    private String location;
-    private String locdesc;
-    private String siteid;
-    private String status;
+    private String LOCATION;
+    private String LOCDESC;
+    private String SITEID;
+    private String STATUS;
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesTimeRoundnessService.java

@@ -114,7 +114,7 @@ public class MesTimeRoundnessService implements IRoundnessStrategy {
                 //状态 --- 根据零件发运组看是自动发布
                 if (partProdGroup.getIsAutoRelease() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
                     mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue());
-                }{
+                }else {
                     mesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue());
                 }
                 //车型大类-空