基础主数据bug

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

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Api(description = "客户道口")
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerRoad")
+@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesCustomerDock")
 
 public class MesCustomerDockController extends BaseMesController<MesCustomerDock> {
 }

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

@@ -40,7 +40,7 @@ public class MesShippingOrderManagementController extends BaseMesController<MesS
 
             List<String> orderNoList =
                     beanList.stream().filter(k -> k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() &&
-                            k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()).map(k -> k.getShippingOrderNo()).collect(Collectors.toList());
+                            k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()).map(k -> k.getShippingCode()).collect(Collectors.toList());
 
             if (!CollectionUtils.isEmpty(orderNoList)) {
                 throw ImppExceptionBuilder.newInstance()

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

@@ -14,4 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesTimeEfficientCfg")
 public class MesTimeEfficientCfgController extends BaseMesController<MesTimeEfficientCfg>{
+
+
+
 }

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

@@ -48,7 +48,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         query.setParameter("organizeCode", detail.getOrganizeCode());
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
-        query.setParameter("shippingOrderNo", detail.getShippingOrderNo());
+        query.setParameter("shippingCode", detail.getShippingCode());
 
         List list = query.getResultList();
 
@@ -77,7 +77,7 @@ public class MesShippingOrderManagementDetailDaoImpl implements IMesShippingOrde
         query.setParameter("organizeCode", detail.getOrganizeCode());
         query.setParameter("isValid", CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         query.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
-        query.setParameter("shippingOrderNo", detail.getShippingOrderNo());
+        query.setParameter("shippingCode", detail.getShippingCode());
 
 
         query.setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize());

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesAssemblyPartNosortCfgService;
 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.MesAssemblyPartNosortCfg;
 import cn.estsh.i3plus.pojo.mes.bean.MesTimeEfficientCfg;
 import lombok.extern.slf4j.Slf4j;
@@ -11,4 +13,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesAssemblyPartNosortCfgService extends BaseMesService<MesAssemblyPartNosortCfg> implements IMesAssemblyPartNosortCfgService {
 
+    protected void setPackQueryBean(MesAssemblyPartNosortCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getPid(), "pid", packBean);
+    }
 }

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

@@ -21,7 +21,8 @@ public class MesEquipmentProdParamCfgServiceImpl extends BaseMesService<MesEquip
 
     protected void setPackQueryBean(MesEquipmentProdParamCfg bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"cavityCode",packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getSeq(),"seq",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCavityCode(),"pid",packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getPid(),"pid",packBean);
     }
 
 

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

@@ -21,8 +21,8 @@ public class MesLoadingGroupServiceImpl extends BaseMesService<MesLoadingGroup>
     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.getCusCode(), "custCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
     }
 
 }

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

@@ -108,7 +108,7 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         bean.getShippingOrderNoList().forEach(k -> {
             MesLoadingVehiclesOrderDetail detail = new MesLoadingVehiclesOrderDetail();
 
-            orderNoList.add(k.getShippingOrderNo());
+            orderNoList.add(k.getShippingCode());
             BeanUtils.copyProperties(k, detail, "id");
             detail.setLoadingOrderNo(finalBean.getLoadingOrderNo());
             detail.setWeatherCondition(finalBean.getWeatherCondition());
@@ -122,8 +122,8 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         orderManagementList.forEach(k -> k.setLoadingOrderNo(finalBean.getLoadingOrderNo()));
 
         String customerCode = bean.getShippingOrderNoList().get(0).getCustCode();
-        String customerName = bean.getShippingOrderNoList().get(0).getCustomerName();
+        String customerName = bean.getShippingOrderNoList().get(0).getCustName();
-        String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustPlantCode();
+        String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustOrganizeCode();
         String customerOrganizeName = bean.getShippingOrderNoList().get(0).getCustomerOrganizeName();
         bean.setSeq(bean.getLoadingOrderNo());
         bean.setStatus(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue());
@@ -219,7 +219,7 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         ValidatorBean.checkNotNull(item.getShippingOrderNoList(), "发运单不能为空");
         item.getShippingOrderNoList().forEach(k -> {
             if (k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() && k.getStatus() != MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
-                shippingOrderNoList.add(k.getShippingOrderNo());
+                shippingOrderNoList.add(k.getShippingCode());
             }
         });
 

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

@@ -17,7 +17,7 @@ public class MesPartShippingGroupService extends BaseMesService<MesPartShippingG
 
 
     protected void setPackQueryBean(MesPartShippingGroup bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringLikerPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getShippingGroupCode(), "shippingGroupCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getShippingGroupName(), "shippingGroupName", packBean);
     }
 
@@ -32,17 +32,17 @@ public class MesPartShippingGroupService extends BaseMesService<MesPartShippingG
 
     protected void onInsertBean(MesPartShippingGroup item) {
         // 数据校验
-        ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
+        ValidatorBean.checkNotNull(item.getShippingGroupCode(), "发运组代码不能为空");
 
 
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getShippingGroupNo(), "shippingGroupNo", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShippingGroupCode(), "shippingGroupCode", seriesPackBean);
         boolean flg = baseRDao.isExitByHql(seriesPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】发运组代码已经存在，请检查数据", item.getShippingGroupNo(), item.getCustomerCode())
+                    .setErrorDetail("【%s】发运组代码已经存在，请检查数据", item.getShippingGroupCode(), item.getShippingGroupCode())
                     .build();
         }
 
@@ -50,17 +50,17 @@ public class MesPartShippingGroupService extends BaseMesService<MesPartShippingG
 
     protected void onUpdateBean(MesPartShippingGroup item) {
         // 数据校验
-        ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
+        ValidatorBean.checkNotNull(item.getShippingGroupCode(), "发运组代码不能为空");
 
         DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getShippingGroupNo(), "shippingGroupNo", seriesPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShippingGroupCode(), "shippingGroupNo", seriesPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
         boolean flg = baseRDao.isExitByHql(seriesPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】发运组代码已经存在，请检查数据", item.getShippingGroupNo(), item.getCustomerCode())
+                    .setErrorDetail("【%s】发运组代码已经存在，请检查数据", item.getShippingGroupCode(), item.getCustCode())
                     .build();
         }
     }

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

@@ -23,7 +23,7 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
     private IMesShippingOrderManagementDetailDao shippingOrderManagementDetailDao;
 
     protected void setPackQueryBean(MesShippingOrderManagementDetail bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getShippingOrderNo(), "shippingOrderNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", packBean);
     }
 
     public ListPager<MesShippingOrderManagementDetailModel> queryDetailGroupByPartNo(MesShippingOrderManagementDetail bean, Pager pager) {

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

@@ -57,7 +57,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getCustPlantCode(), "custPlantCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
         if (!StringUtils.isEmpty(bean.getReleaseTimeStart()) || !StringUtils.isEmpty(bean.getReleaseTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getReleaseTimeStart(), bean.getReleaseTimeEnd(), "releaseTime", packBean, false);
@@ -128,10 +128,10 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             BeanUtils.copyProperties(k, detail, "id");
             MesPart part = partService.getPartByPartNo(k.getPartNo(), k.getOrganizeCode());
             detail.setPartName(part.getPartName());
-            detail.setCustPartNo(k.getCustomerPartNo());
+            detail.setCustPartNo(k.getCustPartNo());
             detail.setPlanQty(1);
 //            detail.setActualQty(1);
-            detail.setShippingOrderNo(finalBean.getShippingOrderNo());
+            detail.setShippingCode(finalBean.getShippingCode());
             detail.setOrganizeCode(k.getOrganizeCode());
             detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue());
 
@@ -162,7 +162,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         if (!bean.getShippingGroupNo().equals(originBean.getShippingGroupNo())) {
 
             DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(bean.getShippingOrderNo(), "shippingOrderNo", detailPackBean);
+            DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingCode", detailPackBean);
             List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
             detailDeleteList.forEach(k -> {
                 k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
@@ -211,7 +211,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             MesShippingOrderManagement bean = baseRDao.getById(id);
             if (StringUtils.isEmpty(bean)) continue;
             DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-            DdlPreparedPack.getStringEqualPack(bean.getShippingOrderNo(), "shippingGroupNo", detailPackBean);
+            DdlPreparedPack.getStringEqualPack(bean.getShippingCode(), "shippingGroupNo", detailPackBean);
             List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
             detailDeleteList.forEach(k -> {
                 k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
@@ -228,21 +228,21 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     protected void onInsertBean(MesShippingOrderManagement item) {
 
         // 数据校验
-        ValidatorBean.checkNotNull(item.getShippingOrderNo(), "发运单不能为空");
+        ValidatorBean.checkNotNull(item.getShippingCode(), "发运单不能为空");
         ValidatorBean.checkNotNull(item.getSeq(), "顺序号不能为空");
         ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
-        ValidatorBean.checkNotNull(item.getCustPlantCode(), "客户工厂代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustCode(), "客户工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
         ValidatorBean.checkNotNull(item.getStatus(), "状态不能为空");
 
         DdlPackBean shipGroupPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getShippingOrderNo(), "shippingOrderNo", shipGroupPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getShippingCode(), "shippingCode", shipGroupPackBean);
         boolean flg = baseRDao.isExitByHql(shipGroupPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】发运单已经存在，请检查数据", item.getShippingOrderNo())
+                    .setErrorDetail("【%s】发运单已经存在，请检查数据", item.getShippingCode())
                     .build();
         }
 
@@ -252,10 +252,10 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     protected void onUpdateBean(MesShippingOrderManagement item) {
 
         // 数据校验
-        ValidatorBean.checkNotNull(item.getShippingOrderNo(), "发运单不能为空");
+        ValidatorBean.checkNotNull(item.getShippingCode(), "发运单不能为空");
         ValidatorBean.checkNotNull(item.getSeq(), "顺序号不能为空");
         ValidatorBean.checkNotNull(item.getCustCode(), "客户代码不能为空");
-        ValidatorBean.checkNotNull(item.getCustPlantCode(), "客户工厂代码不能为空");
+        ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "客户工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getShippingGroupNo(), "发运组代码不能为空");
         ValidatorBean.checkNotNull(item.getStatus(), "状态不能为空");
     }
@@ -267,7 +267,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         MesShippingOrderManagement originBean = baseRDao.getById(bean.getId());
 
         DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(originBean.getShippingOrderNo(), "shippingOrderNo", detailPackBean);
+        DdlPreparedPack.getStringEqualPack(originBean.getShippingCode(), "shippingCode", detailPackBean);
         List<MesShippingOrderManagementDetail> detailDeleteList = detailService.findAll(detailPackBean);
 
         Map<String, List<MesShippingOrderManagementDetail>> detailMap = detailDeleteList.stream().collect(Collectors.groupingBy(k -> k.getPartNo()));
@@ -292,7 +292,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             jisShipping.setCustOrderNo(v.get(0).getCustOrderNo());
             jisShipping.setSerialNumber(v.get(0).getBarcode());
             jisShipping.setQuantityPerCar(v.size());
-            jisShipping.setShippingOrderCode(originBean.getShippingOrderNo());
+            jisShipping.setShippingOrderCode(originBean.getShippingCode());
             jisShipping.setVin(v.get(0).getVin());
             jisShipping.setCarNo(v.get(0).getVin());
             if (!StringUtils.isEmpty(part)) {

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

@@ -5,12 +5,18 @@ 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
 public class MesTimeEfficientCfgService extends BaseMesService<MesTimeEfficientCfg> implements IMesTimeEfficientCfgService {
 
+
+    protected void setPackQueryBean(MesTimeEfficientCfg bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getSourceId(), "sourceId", packBean);
+    }
 }