Merge branch 'dev-wuhan' into dev-wuhan-temp

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java

@@ -153,7 +153,7 @@ public class MesProduceSnPrintController {
             ValidatorBean.checkNotNull(printQueue.getModifyUser(), "操作人不能为空");
 
             return ResultBean.success("查询成功")
-                    .setMsg("裁片工单查询成功!!!")
+                    .setMsg("打印队列查询成功!!!")
                     .setResultList(mesProduceSnPrintService.findMesPrintQueueList(printQueue));
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);

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

@@ -21,10 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -92,6 +89,8 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt
                 continue;
             }
 
+            printQueue.setWorkOrderTypeName(MesExtEnumUtil.ORDER_TYPE.valueOfDescription(mesWorkOrder.getWorkOrderType()));
+
             MesPartProdGroup mesPartProdGroup = partProdGroupMap.get(printQueue.getPartProdGroupCode());
 
             String printTemplate = mesPartProdGroup.getPrintTemplate();
@@ -149,12 +148,15 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt
             printQueue.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue());
             printQueue.setPrintTime(TimeTool.getNowTime(true));
             ConvertBean.serviceModelUpdate(printQueue, model.getModifyUser());
-            printQueueRepository.save(printQueue);
             printQueue.setPrintContent(snPrintModel.getPrintContextList());
+            printQueue.setSystemSyncStatus(CommonEnumUtil.FALSE);
+
             showPrintQueueList.add(printQueue);
 
         }
 
+        printQueueRepository.saveAll(printQueueList);
+
         return showPrintQueueList;
     }
 
@@ -201,7 +203,8 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt
         pager.setCurrentPage(1);
         pager.setPageSize(30);
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(model.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getInPackList(Arrays.asList(model.getWorkCenterCodeQuery().split(MesPcnExtConstWords.COMMA)), MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getInPackList(Arrays.asList(model.getPartProdGroupCodeQuery().split(MesPcnExtConstWords.COMMA)), MesPcnExtConstWords.PART_PROD_GROUP_CODE, packBean);
         DdlPreparedPack.getIsNull(MesPcnExtConstWords.REMARK, packBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRINT_QUEUE_TYPE.WORK_ORDER_ASSEMBLY.getValue(), MesPcnExtConstWords.PRINT_QUEUE_TYPE, packBean);
         return printQueueRepository.findByHqlWherePage(packBean, pager);

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

@@ -50,7 +50,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         MesCustomerCarModel customerCarModel = modelMap.containsKey("mesCustomerCarModel") ? (MesCustomerCarModel) modelMap.get("mesCustomerCarModel") : null;
         // 工单装配件信息
         List<MesWorkOrderAssembly> workOrderAssemblyList = modelMap.containsKey("mesWorkOrderAssemblyList") ? (List<MesWorkOrderAssembly>) modelMap.get("mesWorkOrderAssemblyList") : null;
-        if (!CollectionUtils.isEmpty(workOrderAssemblyList)) workOrderAssemblyList.sort(Comparator.comparing(MesWorkOrderAssembly::getRouteSeq));
+        if (!CollectionUtils.isEmpty(workOrderAssemblyList)) workOrderAssemblyList.sort(Comparator.comparing(MesWorkOrderAssembly::getDisplaySeq));
         // 返回的结果集合
         List<Map<String, Object>> printDataMapList = new ArrayList<>();
         // 单个标签参数值
@@ -83,7 +83,9 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         // 为空时显示内容
         String isNullViewContent = StringUtils.isEmpty(partProdGroup.getIsNullViewContent()) ? "" : partProdGroup.getIsNullViewContent();
         for (Integer index = 0; index < totalCount; index++) {
-            resultMap.put(MesPcnExtConstWords.ASSEMBLY_PARAM + (index+1), workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(0));
+            String displayValue =  workOrderAssemblyList.size() -1 < index ? isNullViewContent : workOrderAssemblyList.get(0).getDisplayValue();
+
+            resultMap.put(MesPcnExtConstWords.ASSEMBLY_PARAM + (index+1), StringUtils.isEmpty(displayValue) ? "" : displayValue);
         }
 
         printDataMapList.add(resultMap);