订货单：历史生产工艺

@@ -888,10 +888,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (CollectionUtils.isEmpty(orderLineList)) {
         if (CollectionUtils.isEmpty(orderLineList)) {
             throw new DefaultClientException("订货单物料行数据不存在！");
             throw new DefaultClientException("订货单物料行数据不存在！");
         }
         }
-        List<String> proProcessList = new ArrayList<>();
+        List<String> formattedProProcessList = new ArrayList<>();
         String orderingUnit = orderInfo.getOrderingUnit();
         String orderingUnit = orderInfo.getOrderingUnit();
         String workshopId = orderInfo.getWorkshopId();
         String workshopId = orderInfo.getWorkshopId();
-        for (PurchaseOrderLine orderLine : orderLineList) {
+        for (int i = 0; i < orderLineList.size(); i++) {
+            PurchaseOrderLine orderLine = orderLineList.get(i);
             String industry = orderLine.getIndustry();
             String industry = orderLine.getIndustry();
             String brand = orderLine.getBrand();
             String brand = orderLine.getBrand();
             String status = orderLine.getStatus();
             String status = orderLine.getStatus();
@@ -919,12 +920,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
             String proProcess = getBaseMapper().queryHisProProcess(params);
             String proProcess = getBaseMapper().queryHisProProcess(params);
             if (StringUtils.isNotBlank(proProcess)) {
             if (StringUtils.isNotBlank(proProcess)) {
                 orderLine.setProductionProcess(proProcess);
                 orderLine.setProductionProcess(proProcess);
-                proProcessList.add(proProcess);
+                formattedProProcessList.add(formatProcessIndex(i + 1) + proProcess);
             }
             }
         }
         }
         orderInfo.setPurchaseOrderLineList(orderLineList);
         orderInfo.setPurchaseOrderLineList(orderLineList);
-        if (CollectionUtils.isNotEmpty(proProcessList)) {
-            orderInfo.setProductionProcess(String.join("\n", proProcessList));
+        if (CollectionUtils.isNotEmpty(formattedProProcessList)) {
+            orderInfo.setProductionProcess(String.join("；", formattedProProcessList) + "；");
         }
         }
 
 
         return orderInfo;
         return orderInfo;
@@ -950,6 +951,16 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         return list.stream().anyMatch(item -> item.compareTo(value) == 0);
         return list.stream().anyMatch(item -> item.compareTo(value) == 0);
     }
     }
 
 
+    private String formatProcessIndex(int index) {
+        String[] circledNumbers = {
+                "①", "②", "③", "④", "⑤", "⑥", "⑦", "⑧"
+        };
+        if (index > 0 && index <= circledNumbers.length) {
+            return circledNumbers[index - 1];
+        }
+        return "(" + index + ")";
+    }
+
 
 
     @Override
     @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {