排序推单

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

@@ -1,7 +0,0 @@
-package cn.estsh.i3plus.ext.mes.api.base;
-
-import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderCellPushCfg;
-
-public interface IMesQueueOrderCellPushCfgService extends IBaseMesService<MesQueueOrderCellPushCfg> {
-
-}

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

@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg;
+
+public interface IMesQueueOrderPushCellCfgService extends IBaseMesService<MesQueueOrderPushCellCfg> {
+
+}

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

@@ -1,13 +1,13 @@
 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.MesQueueOrderCellPushCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("生产队列工位推送配置信息")
+@Api("生产队列推送工位配置信息")
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesQueueOrderCellPushCfg")
-public class MesQueueOrderCellPushCfgController extends BaseMesController<MesQueueOrderCellPushCfg>{
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesQueueOrderPushCellCfg")
+public class MesQueueOrderPushCellCfgController extends BaseMesController<MesQueueOrderPushCellCfg>{
 }

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

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderCellPushCfgService;
+import cn.estsh.i3plus.ext.mes.api.base.IMesQueueOrderPushCellCfgService;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 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.MesQueueOrderCellPushCfg;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderPushCellCfg;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -17,10 +17,10 @@ import java.util.List;
 
 @Service
 @Slf4j
-public class MesQueueOrderCellPushCfgService extends BaseMesService<MesQueueOrderCellPushCfg> implements IMesQueueOrderCellPushCfgService {
+public class MesQueueOrderPushCellCfgService extends BaseMesService<MesQueueOrderPushCellCfg> implements IMesQueueOrderPushCellCfgService {
 
     @Override
-    protected void setPackQueryBean(MesQueueOrderCellPushCfg bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesQueueOrderPushCellCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getPushSourceCode(), MesExtConstWords.PUSH_SOURCE_CODE, packBean);
         DdlPreparedPack.getNumEqualPack(bean.getPushType(), MesExtConstWords.PUSH_TYPE, packBean);
         DdlPreparedPack.getStringEqualPack(bean.getAreaCode(), MesExtConstWords.AREA_CODE, packBean);
@@ -29,7 +29,7 @@ public class MesQueueOrderCellPushCfgService extends BaseMesService<MesQueueOrde
     }
 
     @Override
-    protected void onInsertBean(MesQueueOrderCellPushCfg item) {
+    protected void onInsertBean(MesQueueOrderPushCellCfg item) {
         ValidatorBean.checkNotNull(item.getAreaCode(), "区域代码不能为空");
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "生产线代码不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位代码不能为空");
@@ -53,7 +53,7 @@ public class MesQueueOrderCellPushCfgService extends BaseMesService<MesQueueOrde
     }
 
     @Override
-    protected void onUpdateBean(MesQueueOrderCellPushCfg item) {
+    protected void onUpdateBean(MesQueueOrderPushCellCfg item) {
         ValidatorBean.checkNotNull(item.getAreaCode(), "区域代码不能为空");
         ValidatorBean.checkNotNull(item.getWorkCenterCode(), "生产线代码不能为空");
         ValidatorBean.checkNotNull(item.getWorkCellCode(), "工位代码不能为空");
@@ -78,8 +78,8 @@ public class MesQueueOrderCellPushCfgService extends BaseMesService<MesQueueOrde
     }
 
     @Override
-    public List<MesQueueOrderCellPushCfg> validateReturnImport(List<MesQueueOrderCellPushCfg> beanList) {
-        for (MesQueueOrderCellPushCfg item : beanList) {
+    public List<MesQueueOrderPushCellCfg> validateReturnImport(List<MesQueueOrderPushCellCfg> beanList) {
+        for (MesQueueOrderPushCellCfg item : beanList) {
             onInsertBean(item);
         }
         return  beanList;