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/IMesWorkCellBinCfgService.java

@@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellBinCfg;
  * @CreateDate 2024/04/16
  * @Author mingliang.li
  */
-public interface IMesWorkCellBinService extends IBaseMesService<MesWorkCellBinCfg> {
+public interface IMesWorkCellBinCfgService extends IBaseMesService<MesWorkCellBinCfg> {
 
 
 }

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

@@ -6,9 +6,9 @@ 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 + "/mesWorkCellBinCfg")
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesWorkCellBin")
 
-public class MesWorkCellBinController extends BaseMesController<MesWorkCellBinCfg> {
+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,11 +1,10 @@
 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.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -14,7 +13,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
-public class MesWorkCellBinService extends BaseMesService<MesWorkCellBinCfg> implements IMesWorkCellBinService {
+public class MesWorkCellBinService extends BaseMesService<MesWorkCellBinCfg> implements IMesWorkCellBinCfgService {
 
     protected void onInsertBean(MesWorkCellBinCfg item) {
         // 数据校验
@@ -63,7 +62,7 @@ public class MesWorkCellBinService extends BaseMesService<MesWorkCellBinCfg> imp
         }
 
         cellBinPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getBinCode(), "locateNo", cellBinPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getBinCode(), "binCode", cellBinPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", cellBinPackBean);
         boolean flg1 = baseRDao.isExitByHql(cellBinPackBean);
         if (flg1) {