发运

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

@@ -109,6 +109,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
 
         //查询最近需要扫描的装车单号
         DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(org);
+        DdlPreparedPack.getStringEqualPack(shippingGroupNo, "partShippingGroupCode", orderPackBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue(), "status", orderPackBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"seq"}, orderPackBean);
         MesLoadingList loadingList = vehiclesOrderRepository.getByProperty(orderPackBean);

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

@@ -113,6 +113,11 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         DdlPreparedPack.getNumEqualPack(orderManagement.getId(), "pid", orderDetailPackBean);
         List<MesShippingOrderManagementDetail> detailList = shippingOrderManagementDetailRepository.findByHqlWhere(orderDetailPackBean);
 
+        detailList.forEach(k -> {
+            if(!StringUtils.isEmpty(k.getBarcode())){
+                k.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
+            }
+        });
 
         //查询最近扫描完成的装车单号
         DdlPackBean recentlyOrderPackBean = DdlPackBean.getDdlPackBean(shippingOrderManagement.organizeCode);