Commit 97e3a1a87f8570f1a9a50e23bac8beaf33457ee3

Authored by 房远帅
1 parent d8c0b10d

订货单:获取历史生产工艺

@@ -887,6 +887,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -887,6 +887,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
887 if (CollectionUtils.isEmpty(orderLineList)) { 887 if (CollectionUtils.isEmpty(orderLineList)) {
888 throw new DefaultClientException("订货单物料行数据不存在!"); 888 throw new DefaultClientException("订货单物料行数据不存在!");
889 } 889 }
  890 + List<String> proProcessList = new ArrayList<>();
890 String orderingUnit = orderInfo.getOrderingUnit(); 891 String orderingUnit = orderInfo.getOrderingUnit();
891 String workshopId = orderInfo.getWorkshopId(); 892 String workshopId = orderInfo.getWorkshopId();
892 for (PurchaseOrderLine orderLine : orderLineList) { 893 for (PurchaseOrderLine orderLine : orderLineList) {
@@ -917,9 +918,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -917,9 +918,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
917 String proProcess = getBaseMapper().queryHisProProcess(params); 918 String proProcess = getBaseMapper().queryHisProProcess(params);
918 if (StringUtils.isNotBlank(proProcess)) { 919 if (StringUtils.isNotBlank(proProcess)) {
919 orderLine.setProductionProcess(proProcess); 920 orderLine.setProductionProcess(proProcess);
  921 + proProcessList.add(proProcess);
920 } 922 }
921 } 923 }
922 orderInfo.setPurchaseOrderLineList(orderLineList); 924 orderInfo.setPurchaseOrderLineList(orderLineList);
  925 + if (CollectionUtils.isNotEmpty(proProcessList)) {
  926 + orderInfo.setProductionProcess(String.join("\n\n", proProcessList));
  927 + }
923 928
924 return orderInfo; 929 return orderInfo;
925 } 930 }