Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentVariableCfgService.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+
+/**
+ * @Description : SAP生产计划
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/6 15:52
+ * @Modify:
+ **/
+public interface IMesEquipmentVariableCfgService extends IBaseMesService<MesEquipmentVariableCfg> {
+
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
+
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "设备变量属性")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentVariableCfg")
+public class MesEquipmentVariableCfgController extends BaseMesController<MesEquipmentVariableCfg> {
+
+}

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

@@ -23,6 +23,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -58,7 +59,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
     @Override
     public void insertMesCraftRouteDetailBatch(List<MesCraftRouteDetail> mesCraftRouteDetailList) {
         //校验数据
-        checkData(mesCraftRouteDetailList, true);
+        checkData(mesCraftRouteDetailList);
         //校验工艺
         checkCraft(mesCraftRouteDetailList, mesCraftRouteDetailList.iterator().next().getRouteCode());
         //保存数据
@@ -81,7 +82,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
             return;
         }
         //校验数据
-        checkData(mesCraftRouteDetailList, false);
+        checkData(mesCraftRouteDetailList);
         //校验工艺
         boolean isCheckCraft = false;
         String routeCode = null;
@@ -89,9 +90,6 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
         List<MesCraftRouteDetail> insertMesCraftRouteDetails = mesCraftRouteDetailList.stream().filter(t -> Objects.isNull(t.getId())).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(insertMesCraftRouteDetails)) {
             isCheckCraft = true;
-            insertMesCraftRouteDetails.forEach(t -> {
-                ConvertBean.serviceModelInitialize(t, userName);
-            });
             routeCode = insertMesCraftRouteDetails.iterator().next().getRouteCode();
         }
         //判断是否修改工艺代码
@@ -109,13 +107,26 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
         if (!CollectionUtils.isEmpty(insertMesCraftRouteDetails)) {
             insertBatch(insertMesCraftRouteDetails);
         }
+        //修改
+        Map<Long, MesCraftRouteDetail> routeDetailMap = mesCraftRouteDetailList.stream().filter(t -> !Objects.isNull(t.getId()))
+                .collect(Collectors.toMap(MesCraftRouteDetail::getId, t -> t));
         //修改或者删除
         for (MesCraftRouteDetail mesCraftRouteDetail : oldMesCraftRouteDetailList) {
             //判断是否删除数据
-            boolean exist = mesCraftRouteDetailList.stream().anyMatch(t -> mesCraftRouteDetail.getId().equals(t.getId()));
+            MesCraftRouteDetail newRouteDetail = routeDetailMap.get(mesCraftRouteDetail.getId());
-            if (!exist) {
+            if (Objects.isNull(newRouteDetail)) {
-                deleteWeaklyById(mesCraftRouteDetail.getId(), mesCraftRouteDetail.getModifyUser());
+                deleteWeaklyById(mesCraftRouteDetail.getId(), userName);
             } else {
+                //修改
+                mesCraftRouteDetail.setCraftCode(newRouteDetail.getCraftCode());
+                mesCraftRouteDetail.setCraftName(newRouteDetail.getCraftName());
+                mesCraftRouteDetail.setSeq(newRouteDetail.getSeq());
+                mesCraftRouteDetail.setIsChoose(newRouteDetail.getIsChoose());
+                mesCraftRouteDetail.setAtMostProcess(newRouteDetail.getAtMostProcess());
+                mesCraftRouteDetail.setIsBindNextCraft(newRouteDetail.getIsBindNextCraft());
+                mesCraftRouteDetail.setRepeatTimes(newRouteDetail.getRepeatTimes());
+                mesCraftRouteDetail.setDescription(newRouteDetail.getDescription());
+                ConvertBean.serviceModelUpdate(mesCraftRouteDetail, userName);
                 update(mesCraftRouteDetail);
             }
         }
@@ -151,7 +162,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
         }
     }
 
-    private void checkData(List<MesCraftRouteDetail> mesCraftRouteDetailList, boolean isInsert) {
+    private void checkData(List<MesCraftRouteDetail> mesCraftRouteDetailList) {
         List<Integer> seqList = new ArrayList<>();
         List<String> craftCodeList = new ArrayList<>();
         String userName = AuthUtilExt.getUserName();
@@ -178,12 +189,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
                 MesException.throwMesBusiException("已完成工序最大重复次数不能小于0");
             }
             mesCraftRouteDetail.setOrganizeCode(AuthUtilExt.getOrganizeCode());
-            if (isInsert) {
             ConvertBean.serviceModelInitialize(mesCraftRouteDetail, userName);
-            } else {
-                ConvertBean.serviceModelUpdate(mesCraftRouteDetail, userName);
-            }
-
         });
 
     }

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentVariableCfgService;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description :SAP生产计划
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/6 15:52
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesEquipmentVariableCfgService extends BaseMesService<MesEquipmentVariableCfg> implements IMesEquipmentVariableCfgService {
+
+
+}