增加查询条件

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

@@ -3,10 +3,7 @@ package cn.estsh.i3plus.ext.mes.api.base;
 import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
-
-import java.util.List;
 
 /**
  * @Description:

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingList;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList;
 
 /**
  * @Description:

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

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.ext.mes.api.base;
 import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 
 /**
  * @Description:

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

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import io.swagger.annotations.ApiOperation;
 
 /**

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.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.MesLoadingList;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;

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

@@ -1,29 +1,11 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementService;
-import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesLocationConfig;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
-import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
-import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Api(description = "图片位置配置页面")
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesLocationConfig")

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

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;

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

@@ -4,7 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesShippingOrderManagementDetailService
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesLoadingListDetailDao.java

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.dao;
 
 import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dao/IMesShippingOrderManagementDetailDao.java

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.dao;
 
 import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 
 import java.util.List;
 

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java

@@ -4,7 +4,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesLoadingListDetailDao;
 import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesShippingOrderManagementDetailDaoImpl.java

@@ -4,7 +4,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.dao.IMesShippingOrderManagementDetailD
 import cn.estsh.i3plus.ext.mes.pojo.model.MesShippingOrderManagementDetailModel;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.ext.mes.pojo.model.MesLoadingListDetailModel;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -8,10 +8,10 @@ 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.MesLoadingList;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingListDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingListDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
 import cn.estsh.i3plus.pojo.mes.repository.MesLoadingListDetailRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
@@ -55,7 +55,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
         onInsertBean(bean);
 
         MesShippingOrderManagement shippingOrderManagement = bean.getShippingOrderNoList().get(0);
-        MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getById(shippingOrderManagement.getPartShippingId());
+        MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getById(shippingOrderManagement.getPartShippingGroupId());
 
         if (StringUtils.isEmpty(partShippingGroup)) {
             throw ImppExceptionBuilder.newInstance()
@@ -114,7 +114,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
         bean.setOrderCode(resultList.get(0));
         bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
         bean.setIsEnableMemory(partShippingGroup.getIsEnableMemory());
-        bean.setSeq(bean.getOrderCode());
+//        bean.setSeq(bean.getOrderCode());
         bean.setStatus(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue());
         String customerCode = bean.getShippingOrderNoList().get(0).getCustCode();
         String customerName = bean.getShippingOrderNoList().get(0).getCustName();

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

@@ -8,7 +8,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -10,6 +10,8 @@ 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.*;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@@ -124,7 +126,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         }
 
         bean.setCustDockCode(customerDock.getCustDockCode());
-        bean.setPartShippingId(partShippingGroup.getId());
+        bean.setPartShippingGroupId(partShippingGroup.getId());
         bean.setShippingType(MesExtEnumUtil.SHIPPING_ORDER_TYPE.SORT_SHIPPING.getValue());
         bean.setIsLoading(partShippingGroup.getIsLoading());
         bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
@@ -156,7 +158,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             detail.setUnit(part.getUnit());
             detail.setCustPartNo(k.getCustPartNo());
             detail.setPlanQty(1);
-            detail.setShippingId(finalBean.getId());
+            detail.setPid(finalBean.getId());
 //            detail.setActualQty(1);
             detail.setShippingCode(finalBean.getShippingCode());
             detail.setOrganizeCode(k.getOrganizeCode());
@@ -235,7 +237,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             }
 
             bean.setCustDockCode(customerDock.getCustDockCode());
-            bean.setPartShippingId(partShippingGroup.getId());
+            bean.setPartShippingGroupId(partShippingGroup.getId());
             bean.setShippingType(MesExtEnumUtil.SHIPPING_ORDER_TYPE.SORT_SHIPPING.getValue());
             bean.setIsLoading(partShippingGroup.getIsLoading());
             bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
@@ -270,7 +272,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                 detail.setUnit(part.getUnit());
                 detail.setCustPartNo(k.getCustPartNo());
                 detail.setPlanQty(1);
-                detail.setShippingId(originBean.getId());
+                detail.setPid(originBean.getId());
                 detail.setShippingCode(originBean.getShippingCode());
                 detail.setOrganizeCode(k.getOrganizeCode());
                 detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
@@ -333,7 +335,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         }
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getSeq(), "seq", packBean);
+        DdlPreparedPack.getNumEqualPack(item.getSeq(), "seq", packBean);
         boolean flg1 = baseRDao.isExitByHql(packBean);
         if (flg1) {
             throw ImppExceptionBuilder.newInstance()
@@ -369,7 +371,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         }
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getSeq(), "seq", packBean);
+        DdlPreparedPack.getNumEqualPack(item.getSeq(), "seq", packBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
         boolean flg1 = baseRDao.isExitByHql(packBean);
         if (flg1) {

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

@@ -1,15 +1,11 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
-import cn.estsh.i3plus.ext.mes.api.base.IMesPartTypeService;
 import cn.estsh.i3plus.ext.mes.api.base.IMesTimeEfficientCfgService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartType;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.MesTimeEfficientCfg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 @Service
 @Slf4j