工位与Bin位关系维护

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerDock;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
 
 /**
@@ -7,7 +8,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesCustomerRoad;
  * @CreateDate 2024/04/16
  * @Author mingliang.li
  */
-public interface IMesCustomerRoadService extends IBaseMesService<MesCustomerRoad> {
+public interface IMesCustomerDockService extends IBaseMesService<MesCustomerDock> {
 
 
 }

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

@@ -1,7 +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.MesCustomerRoad;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerDock;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -10,5 +10,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerRoad")
 
-public class MesCustomerRoadController extends BaseMesController<MesCustomerRoad> {
+public class MesCustomerDockController extends BaseMesController<MesCustomerDock> {
 }

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

@@ -1,11 +1,11 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerRoadService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesCustomerDockService;
 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.MesCustomerRoad;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerDock;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
@@ -13,49 +13,49 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesCustomerRoadService extends BaseMesService<MesCustomerRoad> implements IMesCustomerRoadService {
+public class MesCustomerDockService extends BaseMesService<MesCustomerDock> implements IMesCustomerDockService {
 
 
-    protected void onInsertBean(MesCustomerRoad item) {
+    protected void onInsertBean(MesCustomerDock item) {
         // 数据校验
-        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getRoadCode(), "roadCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustDockCode(), "custDockCode", roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】客户代码【%s】道口代码已经存在，请检查数据", item.getCustomerCode(), item.getRoadCode())
+                    .setErrorDetail("【%s】客户代码【%s】道口代码已经存在，请检查数据", item.getCustCode(), item.getCustDockCode())
                     .build();
         }
 
     }
 
-    protected void onUpdateBean(MesCustomerRoad item) {
+    protected void onUpdateBean(MesCustomerDock item) {
         // 数据校验
-        ValidatorBean.checkNotNull(item.getCustomerCode(), "客户代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getRoadCode(), "roadCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustDockCode(), "custDockCode", roadPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】客户代码【%s】道口代码已经存在，请检查数据", item.getCustomerCode(), item.getRoadCode())
+                    .setErrorDetail("【%s】客户代码【%s】道口代码已经存在，请检查数据", item.getCustCode(), item.getCustDockCode())
                     .build();
         }
     }
 
-    protected void setPackQueryBean(MesCustomerRoad bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getRoadCode(), "roadCode", packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getType(), "type", packBean);
+    protected void setPackQueryBean(MesCustomerDock bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustDockCode(), "custDockCode", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getCustDockType(), "custDockType", packBean);
     }
 
 }

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

@@ -21,7 +21,7 @@ public class MesMaximoAssetMainDataServiceImpl extends BaseMesService<MesMaximoA
 
     protected void setPackQueryBean(MesMaximoAssetMainData bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getAssetNum(), "assetNum", packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getDescription(), "description", packBean);
+//        DdlPreparedPack.getNumEqualPack(bean.getDescription(), "description", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getStatus(), "status", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getFailureCode(), "failureCode", packBean);
     }

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

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesWorkCellBinService extends BaseMesService<MesWorkCellBinCfg> implements IMesWorkCellBinCfgService {
+public class MesWorkCellBinCfgService extends BaseMesService<MesWorkCellBinCfg> implements IMesWorkCellBinCfgService {
 
     protected void onInsertBean(MesWorkCellBinCfg item) {
         // 数据校验