模具腔组主数据(3个页面)

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupCfg;
+
+/**
+ * @Description : 腔组维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:07
+ * @Modify:
+ **/
+public interface IMesCavityGroupCfgService extends IBaseMesService<MesCavityGroupCfg> {
+
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg;
+
+/**
+ * @Description : 腔组明细维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:07
+ * @Modify:
+ **/
+public interface IMesCavityGroupDetailCfgService extends IBaseMesService<MesCavityGroupDetailCfg> {
+
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg;
+
+/**
+ * @Description : 设备加工参数维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:07
+ * @Modify:
+ **/
+public interface IMesEquipmentProdParamCfgService extends IBaseMesService<MesEquipmentProdParamCfg>{
+
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity;
+
+/**
+ * @Description : 一模多腔维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:07
+ * @Modify:
+ **/
+public interface IMesModelMultiCavityService extends IBaseMesService<MesModelMultiCavity> {
+
+
+}

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

@@ -0,0 +1,18 @@
+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.MesCavityGroupCfg;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 腔组维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:32
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCavityGroupCfg")
+public class MesCavityGroupCfgController extends BaseMesController<MesCavityGroupCfg> {
+}

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

@@ -0,0 +1,18 @@
+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.MesCavityGroupDetailCfg;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 腔组明细维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:32
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCavityGroupDetailCfg")
+public class MesCavityGroupDetailCfgController extends BaseMesController<MesCavityGroupDetailCfg> {
+}

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

@@ -0,0 +1,18 @@
+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.MesEquipmentProdParamCfg;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description : 设备加工参数维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:32
+ * @Modify:
+ **/
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentProdParamCfg")
+public class MesEquipmentProdParamCfgController extends BaseMesController<MesEquipmentProdParamCfg> {
+}

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

@@ -1,14 +1,17 @@
 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.MesArea;
 import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 一模多腔维护
+ * @Description : 一模多腔维护
- */
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:32
+ * @Modify:
+ **/
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesModelMultiCavity")
 public class MesModelMultiCavityController extends BaseMesController<MesModelMultiCavity> {

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCavityGroupCfgService;
+import cn.estsh.i3plus.ext.mes.apiservice.unit.exception.MesException;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupCfg;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 腔组维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:05
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesCavityGroupCfgServiceImpl extends BaseMesService<MesCavityGroupCfg> implements IMesCavityGroupCfgService {
+
+    protected void setPackQueryBean(MesCavityGroupCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringLikerPack(bean.getCavityCode(), "cavityCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipmentCode(), "equipmentCode", packBean);
+    }
+
+    protected void onInsertBean(MesCavityGroupCfg item) {
+        // 数据校验
+        ValidatorBean.checkNotNull(item.getCavityCode(), "腔组代码不能为空");
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCavityCode(), "cavityCode", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            MesException.throwMesBusiException("腔组代码【%s】已经存在，请检查数据", item.getCavityCode());
+        }
+    }
+
+    protected void onUpdateBean(MesCavityGroupCfg item) {
+        // 数据校验
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getCavityCode(), "cavityCode", packBean);
+
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
+        boolean flg = baseRDao.isExitByHql(packBean);
+        if (flg) {
+            MesException.throwMesBusiException("腔组代码【%s】已经存在，请检查数据", item.getCavityCode());
+        }
+    }
+
+
+}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesCavityGroupDetailCfgService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesCavityGroupDetailCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 腔组明细维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:05
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesCavityGroupDetailCfgServiceImpl extends BaseMesService<MesCavityGroupDetailCfg> implements IMesCavityGroupDetailCfgService {
+
+    protected void setPackQueryBean(MesCavityGroupDetailCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
+    }
+
+
+    protected void onInsertBean(MesCavityGroupDetailCfg item) {
+
+    }
+
+    protected void onUpdateBean(MesCavityGroupDetailCfg item) {
+    }
+}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentProdParamCfgService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 设备加工参数维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:05
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService<MesEquipmentProdParamCfg> implements IMesEquipmentProdParamCfgService {
+
+    protected void setPackQueryBean(MesEquipmentProdParamCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getSeq(),"seq",packBean);
+    }
+
+
+    protected void onInsertBean(MesEquipmentProdParamCfg item) {
+
+    }
+
+    protected void onUpdateBean(MesEquipmentProdParamCfg item) {
+    }
+
+}

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

@@ -1,12 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class MesModelMultiCavityService extends BaseMesService<MesModelMultiCavity> {
-
-}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesModelMultiCavityService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentProdParamCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesModelMultiCavity;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+/**
+ * @Description : 一模多腔维护
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/14 14:29
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesModelMultiCavityServiceImpl extends BaseMesService<MesModelMultiCavity> implements IMesModelMultiCavityService {
+    protected void setPackQueryBean(MesModelMultiCavity bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getModuleCode(),"moduleCode",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(),"partNo",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(),"equipmentCode",packBean);
+    }
+
+
+    protected void onInsertBean(MesModelMultiCavity item) {
+
+    }
+
+    protected void onUpdateBean(MesModelMultiCavity item) {
+    }
+}

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

@@ -83,7 +83,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             BeanUtils.copyProperties(bean, copyMesWorkOrder);
             copyMesWorkOrder.setProduceSeq(produceSeq + 1);
             copyMesWorkOrder.setQty(1D);
-            copyMesWorkOrder.setOrderNo(resultList.get(0));
+            copyMesWorkOrder.setOrderNo(resultList.get(0)+"_"+copyMesWorkOrder.getOrganizeCode());
             ConvertBean.serviceModelInitialize(copyMesWorkOrder, bean.getCreateUser());
 
             MesWorkOrderLog workOrderLog = new MesWorkOrderLog();
@@ -113,7 +113,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         }
         genSerialNoModel.setPartNo(bean.getPartNo());
         List<String> resultList = syncFuncService.syncSerialNo(genSerialNoModel, bean.getCreateUser(), bean.getOrganizeCode(), 1).getResultList();
-        bean.setOrderNo(resultList.get(0));
+        bean.setOrderNo(resultList.get(0)+"_"+bean.getOrganizeCode());
         bean.setQty(bean.getQty());
 
         ConvertBean.serviceModelInitialize(bean, bean.getCreateUser());
@@ -208,6 +208,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         DdlPreparedPack.getStringSmallerPack(bean.getStartTimeEnd(), "planStartTime", packBean);
         DdlPreparedPack.getStringBiggerPack(bean.getEndTimeStart(), "planEndTime", packBean);
         DdlPreparedPack.getStringSmallerPack(bean.getEndTimeEnd(), "planEndTime", packBean);
+        packBean.setOrderByStr(" order by createDatetime desc ");
     }
 
     protected void onInsertBean(MesWorkOrder item) {

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java

@@ -1996,4 +1996,44 @@ public class MesExtEnumUtil {
         }
     }
 
+    /**
+     * 设备加工参数维护-数据来源
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum DATA_SOURCE {
+        DATA_SOURCE10(10, "排序加工规则"),
+        DATA_SOURCE20(20, "非排序加工规则"),
+        DATA_SOURCE30(30, "腔组明细的ID");
+
+        private int value;
+        private String description;
+
+        private DATA_SOURCE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+
+            for (int i = 0; i < values().length; ++i) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+
+            return tmp;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
 }