NC 处理修改字段

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java

@@ -5,7 +5,6 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesShippingLoadingCheckService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingLoadingCheckModel;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.platform.common.util.MesPcnConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -16,13 +15,11 @@ import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
-import cn.estsh.impp.framework.boot.util.ImppRedis;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
 
@@ -61,8 +58,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         MesLoadingList loadingListResult = checkLoadingList(loadingList.getOrderCode(), loadingList.getOrganizeCode());
 
 
+        //若生成装车单，则一定有装车单明细
         DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(loadingList.organizeCode);
-        DdlPreparedPack.getStringEqualPack(loadingList.getOrderCode(), "orderCode", orderDetailPackBean);
+        DdlPreparedPack.getNumEqualPack(loadingListResult.getId(), "pid", orderDetailPackBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"seq"}, orderDetailPackBean);
         List<MesLoadingListDetail> detailList = vehiclesOrderDetailRepository.findByHqlWhere(orderDetailPackBean);
 
@@ -100,7 +98,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
     public MesLoadingList queryLoadingOrderNoByAutoPushOrder(String shippingGroupNo, String org) {
 
 
-        //查询最近扫描完成的装车单号
+        //查询最近需要扫描的装车单号
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue(), "status", orderPackBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"seq"}, orderPackBean);
@@ -117,6 +115,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
 
         //校验发运单是否存在
         DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(org);
+        DdlPreparedPack.getNumEqualPack(model.getShippingCode(), "shippingCode", orderDetailPackBean);
         DdlPreparedPack.getStringEqualPack(model.getShippingCode(), "shippingCode", orderDetailPackBean);
         MesLoadingListDetail vehiclesOrderDetail = vehiclesOrderDetailRepository.getByProperty(orderDetailPackBean);
         if (StringUtils.isEmpty(vehiclesOrderDetail)) {
@@ -195,7 +194,8 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
      * @param org
      */
     public MesLoadingList checkLoadingList(String orderCode, String org) {
-//校验装车单是否存在
+
+        //校验装车单是否存在
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(org);
         DdlPreparedPack.getStringEqualPack(orderCode, "loadingOrderNo", orderPackBean);
         MesLoadingList loadingList = vehiclesOrderRepository.getByProperty(orderPackBean);
@@ -210,4 +210,5 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
         }
         return loadingList;
     }
+
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java

@@ -105,7 +105,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
 
         DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(shippingOrderManagement.organizeCode);
-        DdlPreparedPack.getStringEqualPack(shippingOrderManagement.getShippingCode(), "shippingCode", orderDetailPackBean);
+        DdlPreparedPack.getNumEqualPack(shippingOrderManagement.getId(), "shippingId", orderDetailPackBean);
         List<MesShippingOrderManagementDetail> detailList = shippingOrderManagementDetailRepository.findByHqlWhere(orderDetailPackBean);