Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java

@@ -83,6 +83,7 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt
 
             MesSortShippingPrintForCqLxModel result = new MesSortShippingPrintForCqLxModel();
             BeanUtils.copyProperties(sheetJis.get(0), result);
+            result.setTitleName(shippingOrderManagement.getShippingGroupName());
             result.setShippingCode(shippingOrderManagement.getShippingCode());
             if (shippingOrderManagement.getShippingCode().length() >= 4) {
                 result.setCarsNo(shippingOrderManagement.getShippingCode().substring(shippingOrderManagement.getShippingCode().length() - 4));

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProdCraftRouteCheckNosortStepService.java

@@ -238,11 +238,11 @@ public class MesProdCraftRouteCheckNosortStepService extends MesProdCraftRouteCh
     }
 
     private Map<String, List<MesProductionRecord>> productionRecordMap2Craft(List<MesProductionRecord> productionRecordList) {
-        return CollectionUtils.isEmpty(productionRecordList) ? null : productionRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesProductionRecord::getCraftCode));
+        return CollectionUtils.isEmpty(productionRecordList) ? null : productionRecordList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getCraftCode()))).collect(Collectors.groupingBy(MesProductionRecord::getCraftCode));
     }
 
     private Map<String, List<MesProductionRecord>> productionRecordMap2Process(List<MesProductionRecord> productionRecordList) {
-        return CollectionUtils.isEmpty(productionRecordList) ? null : productionRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesProductionRecord::getProcessCode));
+        return CollectionUtils.isEmpty(productionRecordList) ? null : productionRecordList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getProcessCode()))).collect(Collectors.groupingBy(MesProductionRecord::getProcessCode));
     }
 
     private Boolean isExistProductionRecord(Map<String, List<MesProductionRecord>> prMapByCraft, String craftCode) {

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesSortShippingPrintForCqLxModel.java

@@ -17,6 +17,9 @@ public class MesSortShippingPrintForCqLxModel implements Serializable {
 
     private static final long serialVersionUID = -4576439891171509409L;
 
+    @ApiParam("打印单据的头部标题")
+    private String titleName;
+
     @ApiParam("是否重打印")
     private String isRePrint = MesPcnExtConstWords.EMPTY;