Merge remote-tracking branch 'origin/dev' into dev

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

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

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

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

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesShiftGroupCenterCfgController.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.MesCenterShiftGroup;
-import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg;
 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 + "/mesCenterShiftGroup")
-public class MesCenterShiftGroupController extends BaseMesController<MesCenterShiftGroup>{
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShiftGroupCenterCfg")
+public class MesShiftGroupCenterCfgController extends BaseMesController<MesShiftGroupCenterCfg> {
 }

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

@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
-
-import cn.estsh.i3plus.ext.mes.api.base.IMesCenterShiftGroupService;
-import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupService;
-import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesCenterShiftGroup;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
-import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class MesCenterShiftGroupService extends BaseMesService<MesCenterShiftGroup> implements IMesCenterShiftGroupService {
-
-    protected void setPackQueryBean(MesPart bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getPartName(), "partName", packBean);
-
-    }
-
-}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesShiftGroupCenterCfgService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroupCenterCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class MesShiftGroupCenterCfgService extends BaseMesService<MesShiftGroupCenterCfg> implements IMesShiftGroupCenterCfgService {
+
+    protected void setPackQueryBean(MesShiftGroupCenterCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getShiftGroup(), "shiftGroup", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getShiftGroupName(), "shiftGroupName", packBean);
+
+    }
+
+}