工位与Bin位关系维护

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

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

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

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

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

@@ -1,14 +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.MesWorkCellBin;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("工位与Bin位关系")
+@Api("工位与Bin位关系维护")
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellBin")
 
-public class MesWorkCellBinController extends BaseMesController<MesWorkCellBin> {
+public class MesWorkCellBinCfgController extends BaseMesController<MesWorkCellBinCfg> {
 }

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

@@ -1,12 +1,11 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellBinService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesWorkCellBinCfgService;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg;
-import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBin;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -14,9 +13,9 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesWorkCellBinService extends BaseMesService<MesWorkCellBin> implements IMesWorkCellBinService {
+public class MesWorkCellBinService extends BaseMesService<MesWorkCellBinCfg> implements IMesWorkCellBinCfgService {
 
-    protected void onInsertBean(MesWorkCellBin item) {
+    protected void onInsertBean(MesWorkCellBinCfg item) {
         // 数据校验
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位不能为空");
@@ -33,18 +32,18 @@ public class MesWorkCellBinService extends BaseMesService<MesWorkCellBin> implem
         }
 
         cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getLocateNo(), "locateNo", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean);
         boolean flg1 = baseRDao.isExitByHql(cellBinPackBean);
         if (flg1) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getLocateNo())
+                    .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getBinCode())
                     .build();
         }
     }
 
-    protected void onUpdateBean(MesWorkCellBin item) {
+    protected void onUpdateBean(MesWorkCellBinCfg item) {
 
         // 数据校验
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "产线不能为空");
@@ -63,14 +62,14 @@ public class MesWorkCellBinService extends BaseMesService<MesWorkCellBin> implem
         }
 
         cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getLocateNo(), "locateNo", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean);
         boolean flg1 = baseRDao.isExitByHql(cellBinPackBean);
         if (flg1) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getLocateNo())
+                    .setErrorDetail("【%s】bin位已经存在，请检查数据", item.getBinCode())
                     .build();
         }
     }