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

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+
+/**
+ * @Description : SAP生产计划
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/6 15:52
+ * @Modify:
+ **/
+public interface IMesEquipmentVariableCfgService extends IBaseMesService<MesEquipmentVariableCfg> {
+
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLoadingGroupDetail;
+
+/**
+ * @Description :装车组详情
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/14 14:50
+ * @Modify:
+ **/
+public interface IMesLoadingGroupDetailService extends IBaseMesService<MesLoadingGroupDetail> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.ext.mes.api.base;
+
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLoadingGroup;
+
+/**
+ * @Description :装车组
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/14 14:50
+ * @Modify:
+ **/
+public interface IMesLoadingGroupService extends IBaseMesService<MesLoadingGroup> {
+}

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

@@ -0,0 +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.MesEquipmentVariableCfg;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "设备变量属性")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesEquipmentVariableCfg")
+public class MesEquipmentVariableCfgController extends BaseMesController<MesEquipmentVariableCfg> {
+
+}

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

@@ -0,0 +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.MesLoadingGroup;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "装车组")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesLoadingGroup")
+public class MesLoadingGroupController extends BaseMesController<MesLoadingGroup> {
+}

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

@@ -0,0 +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.MesLoadingGroupDetail;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(description = "装车组详情")
+@RestController
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesLoadingGroupDetail")
+public class MesLoadingGroupDetailController extends BaseMesController<MesLoadingGroupDetail> {
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentVariableCfgService;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description :SAP生产计划
+ * @Reference :
+ * @Author : junsheng.li
+ * @CreateDate 2024/5/6 15:52
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesEquipmentVariableCfgService extends BaseMesService<MesEquipmentVariableCfg> implements IMesEquipmentVariableCfgService {
+
+
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingGroupDetailService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesLoadingGroupDetail;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 装车组详情
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/14 15:13
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesLoadingGroupDetailServiceImpl extends BaseMesService<MesLoadingGroupDetail> implements IMesLoadingGroupDetailService {
+
+    protected void setPackQueryBean(MesLoadingGroupDetail bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
+
+import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingGroupService;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesLoadingGroup;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 装车组
+ * @Reference :
+ * @Author : gsz
+ * @CreateDate 2024/5/14 15:13
+ * @Modify:
+ **/
+@Service
+@Slf4j
+public class MesLoadingGroupServiceImpl extends BaseMesService<MesLoadingGroup> implements IMesLoadingGroupService {
+
+    protected void setPackQueryBean(MesLoadingGroup bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getLoadingGroupNo(), "loadingGroupNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getLoadingGroupName(), "loadingGroupName", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+    }
+
+}