Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

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

@@ -66,7 +66,7 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
     }
 
     @PostMapping(value = "/print")
-    @ApiOperation(value = "裁片工单打印", notes = "裁片工单发布")
+    @ApiOperation(value = "裁片工单打印", notes = "裁片工单打印")
     public ResultBean print(String[] cutWorkOrderNos) {
         try {
 

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

@@ -74,7 +74,7 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
 
         List<MesCutSchemeEquipmentDetail> cutSchemeEquipmentDetailList = getMesCutSchemeEquipmentDetails(model, cutSchemeEquipmentList);
 
-        Map<Long, List<MesCutSchemeEquipmentDetail>> cutSchemeEquipmentDetailMapByPid = cutSchemeEquipmentDetailList.stream().collect(Collectors.groupingBy(MesCutSchemeEquipmentDetail::getPid));
+        Map<Long, List<MesCutSchemeEquipmentDetail>> cutSchemeEquipmentDetailMapByPid = CollectionUtils.isEmpty(cutSchemeEquipmentDetailList) ? null : cutSchemeEquipmentDetailList.stream().collect(Collectors.groupingBy(MesCutSchemeEquipmentDetail::getPid));
 
         for (MesWorkOrderCut workOrderCut : workOrderCutList) {
 
@@ -117,7 +117,7 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
 
             List<String> equipParamNameList = new ArrayList<>();
             List<String> equipParamValueList = new ArrayList<>();
-            List<MesCutSchemeEquipmentDetail> cutSchemeEquipmentDetails = mesCutSchemeEquipment == null ? new ArrayList<>() : cutSchemeEquipmentDetailMapByPid.get(mesCutSchemeEquipment.getId());
+            List<MesCutSchemeEquipmentDetail> cutSchemeEquipmentDetails = mesCutSchemeEquipment == null || CollectionUtils.isEmpty(cutSchemeEquipmentDetailMapByPid) ? new ArrayList<>() : cutSchemeEquipmentDetailMapByPid.get(mesCutSchemeEquipment.getId());
 
             for (int i = 0; i < EQUIP_NUM; i++) {
                 //设备参数值标题
@@ -169,7 +169,7 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
         if (!CollectionUtils.isEmpty(cutSchemeEquipmentList)) {
             List<Long> idList = cutSchemeEquipmentList.stream().map(MesCutSchemeEquipment::getId).collect(Collectors.toList());
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
-            DdlPreparedPack.getInPackList(idList, MesExtConstWords.ID, packBean);
+            DdlPreparedPack.getInPackList(idList, MesExtConstWords.PID, packBean);
             return cutSchemeEquipmentDetailRepository.findByHqlWhere(packBean);
         }
         return null;