Merge branch 'master_after20' into master_cj_zq

@@ -360,6 +360,67 @@ public class ScSelectorController extends DefaultBaseController {
         return InvokeResultBuilder.success(result);
     }
 
+    /**
+     * 根据ID加载订货单数据(补货单专用)
+     */
+    @ApiOperation("根据ID加载订货单数据")
+    @PostMapping("/replenishment/order/load")
+    public InvokeResult<List<GetPurchaseOrderInfoBo>> loadReplenishmentOrderInfo(@RequestBody(required = false) List<String> ids) {
+        if (CollectionUtil.isEmpty(ids)) {
+            return InvokeResultBuilder.success(CollectionUtil.emptyList());
+        }
+        List<PurchaseOrderInfo> orderInfoList = orderInfoService.findById(ids);
+        if (CollectionUtils.isEmpty(orderInfoList)) {
+            return new InvokeResult<>();
+        }
+        List<GetPurchaseOrderInfoBo> result = new ArrayList<>();
+        List<String> orderIds = new ArrayList<>();
+        for (PurchaseOrderInfo orderInfo : orderInfoList) {
+            GetPurchaseOrderInfoBo orderInfoBo = new GetPurchaseOrderInfoBo(orderInfo);
+            result.add(orderInfoBo);
+
+            orderIds.add(orderInfo.getId());
+        }
+        // 获取物料行数据
+        List<PurchaseOrderLine> orderLineList = orderLineService.listByOrderIds(orderIds, true);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return InvokeResultBuilder.success(result);
+        }
+        List<String> orderSpecIds = new ArrayList<>();
+        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
+        for (PurchaseOrderLine orderLine : orderLineList) {
+            String orderId = orderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(orderLine);
+
+            orderSpecIds.add(orderLine.getId());
+        }
+        // 获取发货明细数据
+        Map<String, ShipmentsPlanDetail> shipmentsDetailMap = new HashMap<>();
+        List<ShipmentsPlanDetail> shipmentsDetails = shipmentsPlanDetailService.listBySpecIds(orderSpecIds);
+        if (CollectionUtils.isNotEmpty(shipmentsDetails)) {
+            shipmentsDetailMap = shipmentsDetails.stream().collect(Collectors.toMap(ShipmentsPlanDetail::getOrderSpecId
+                    , Function.identity(), (v1, v2) -> v1));
+        }
+        for (GetPurchaseOrderInfoBo orderInfoBo : result) {
+            String orderId = orderInfoBo.getId();
+            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
+            //生产人员不展示价格
+            processPrice(lineList);
+            // 实发数
+            if (CollectionUtils.isNotEmpty(lineList)) {
+                for (PurchaseOrderLine orderLine : lineList) {
+                    ShipmentsPlanDetail detail = shipmentsDetailMap.get(orderLine.getId());
+                    if (detail != null) {
+                        orderLine.setActualShipmentQuantity(detail.getActualShipmentQuantity());
+                    }
+                }
+            }
+            orderInfoBo.setPurchaseOrderLineList(lineList);
+        }
+        return InvokeResultBuilder.success(result);
+    }
+
   //生产人员不展示价格,根据部门判断（生产管理科、精轧一车间、精轧车间、品质管理科）,需要生产的控制价格
   public void processPrice(List<PurchaseOrderLine> purchaseOrderLineList) {
     if (CollectionUtils.isEmpty(purchaseOrderLineList)) {