Merge branch 'master_chujiang_0819' into master_plan

@@ -926,7 +926,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isEmpty(orderLineList)) {
             throw new DefaultClientException("订货单物料行数据不存在！");
         }
-        List<String> formattedProProcessList = new ArrayList<>();
+        Map<String, List<String>> processIndexMap = new LinkedHashMap<>();
         String orderingUnit = orderInfo.getOrderingUnit();
         String workshopId = orderInfo.getWorkshopId();
         for (int i = 0; i < orderLineList.size(); i++) {
@@ -958,11 +958,17 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             String proProcess = getBaseMapper().queryHisProProcess(params);
             if (StringUtils.isNotBlank(proProcess)) {
                 orderLine.setProductionProcess(proProcess);
-                formattedProProcessList.add(formatProcessIndex(i + 1) + proProcess);
+                String circledIndex = formatProcessIndex(i + 1);
+                processIndexMap.computeIfAbsent(proProcess, k -> new ArrayList<>()).add(circledIndex);
             }
         }
         orderInfo.setPurchaseOrderLineList(orderLineList);
-        if (CollectionUtils.isNotEmpty(formattedProProcessList)) {
+        if (!processIndexMap.isEmpty()) {
+            List<String> formattedProProcessList = new ArrayList<>();
+            for (Map.Entry<String, List<String>> entry : processIndexMap.entrySet()) {
+                String indexes = String.join("、", entry.getValue());
+                formattedProProcessList.add(indexes + entry.getKey());
+            }
             orderInfo.setProductionProcess(String.join("；", formattedProProcessList) + "；");
         }