mes

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg;
+
+/**
+ * @Description:
+ * @CreateDate 2024/04/16
+ * @Author zxw
+ */
+public interface IMesAssemblyNosortCfgService extends IBaseMesService<MesAssemblyNosortCfg> {
+
+
+}

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

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.ext.mes.api.base;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyPartNosortCfg;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
-
-/**
- * @Description:
- * @CreateDate 2024/04/16
- * @Author zxw
- */
-public interface IMesAssemblyPartNosortCfgService extends IBaseMesService<MesAssemblyPartNosortCfg> {
-
-
-}

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

@@ -1,8 +1,7 @@
 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.MesAssemblyPartNosortCfg;
-import cn.estsh.i3plus.pojo.mes.bean.MesProdRuleNosortCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,6 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api("非排序装配件维护表")
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesAssemblyPartNosortCfg")
-public class MesAssemblyPartNosortCfgController extends BaseMesController<MesAssemblyPartNosortCfg>{
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesAssemblyNosortCfg")
+public class MesAssemblyNosortCfgController extends BaseMesController<MesAssemblyNosortCfg>{
 }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesAssemblyNosortCfgService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyNosortCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesAssemblyNosortCfgService extends BaseMesService<MesAssemblyNosortCfg> implements IMesAssemblyNosortCfgService {
+
+    protected void setPackQueryBean(MesAssemblyNosortCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
+    }
+}

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

@@ -1,19 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
-
-import cn.estsh.i3plus.ext.mes.api.base.IMesAssemblyPartNosortCfgService;
-import cn.estsh.i3plus.ext.mes.api.base.IMesTimeEfficientCfgService;
-import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesAssemblyPartNosortCfg;
-import cn.estsh.i3plus.pojo.mes.bean.MesTimeEfficientCfg;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class MesAssemblyPartNosortCfgService extends BaseMesService<MesAssemblyPartNosortCfg> implements IMesAssemblyPartNosortCfgService {
-
-    protected void setPackQueryBean(MesAssemblyPartNosortCfg bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPid(), "pid", packBean);
-    }
-}

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

@@ -149,7 +149,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
         String organizeCode = craftRouteDetailFist.getOrganizeCode();
         MesCraftRoute mesCraftRoute = mesCraftRouteService.getMesCraftRouteByCode(craftRouteDetailFist.getCraftRouteCode(), organizeCode);
         //排序
-        if (MesExtEnumUtil.LINE_TYPE.LINE_TYPE_10.getValue() == mesCraftRoute.getCraftRouteType()) {
+        if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == mesCraftRoute.getCraftRouteType()) {
             //根据路线代码查询可选的工艺信息
             List<String> craftCodeList = findMesCraftCode(organizeCode, routeCode);
             //判断工艺是否属于同一流程
@@ -159,7 +159,7 @@ public class MesCraftRouteDetailServiceImpl extends BaseMesService<MesCraftRoute
                 }
             });
             //非排序
-        } else if (MesExtEnumUtil.LINE_TYPE.LINE_TYPE_20.getValue() != mesCraftRoute.getCraftRouteType()) {
+        } else if (MesExtEnumUtil.WORK_CENTER_TYPE.NOSORT.getValue() != mesCraftRoute.getCraftRouteType()) {
             MesException.throwMesBusiException("工艺路线类型不存在");
         }
     }