楚江erp：查询可以撤销/补货/变更列表增加实发数据

@@ -24,6 +24,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService;
 import com.lframework.xingyun.sc.service.paytype.OrderPayTypeService;
 import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService;
 import com.lframework.xingyun.sc.service.purchase.PurchaseOrderService;
 import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService;
 import com.lframework.xingyun.sc.service.purchase.ReceiveSheetService;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustReasonService;
 import com.lframework.xingyun.sc.service.stock.adjust.StockAdjustReasonService;
 import com.lframework.xingyun.sc.service.stock.take.PreTakeStockSheetService;
 import com.lframework.xingyun.sc.service.stock.take.PreTakeStockSheetService;
 import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService;
 import com.lframework.xingyun.sc.service.stock.take.TakeStockPlanService;
@@ -36,6 +37,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 
 
 import java.util.*;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.Valid;
@@ -87,6 +89,8 @@ public class ScSelectorController extends DefaultBaseController {
   private SysUserDeptService sysUserDeptService;
   private SysUserDeptService sysUserDeptService;
   @Resource
   @Resource
   private SysDeptService sysDeptService;
   private SysDeptService sysDeptService;
+  @Resource
+  private ShipmentsPlanDetailService shipmentsPlanDetailService;
 
 
 
 
   /**
   /**
@@ -321,17 +325,36 @@ public class ScSelectorController extends DefaultBaseController {
         if (CollectionUtils.isEmpty(orderLineList)) {
         if (CollectionUtils.isEmpty(orderLineList)) {
             return InvokeResultBuilder.success(result);
             return InvokeResultBuilder.success(result);
         }
         }
+        List<String> orderSpecIds = new ArrayList<>();
         Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
         Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
         for (PurchaseOrderLine orderLine : orderLineList) {
         for (PurchaseOrderLine orderLine : orderLineList) {
             String orderId = orderLine.getPurchaseOrderId();
             String orderId = orderLine.getPurchaseOrderId();
             List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
             List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
             list.add(orderLine);
             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) {
         for (GetPurchaseOrderInfoBo orderInfoBo : result) {
             String orderId = orderInfoBo.getId();
             String orderId = orderInfoBo.getId();
             List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
             List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
             //生产人员不展示价格
             //生产人员不展示价格
             processPrice(lineList);
             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);
             orderInfoBo.setPurchaseOrderLineList(lineList);
         }
         }
         return InvokeResultBuilder.success(result);
         return InvokeResultBuilder.success(result);

@@ -105,6 +105,12 @@ public class PurchaseOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal quantity;
     private BigDecimal quantity;
 
 
     /**
     /**
+     * 实发数
+     */
+    @TableField(exist = false)
+    private Double actualShipmentQuantity;
+
+    /**
      * 销售价格
      * 销售价格
      */
      */
     private BigDecimal salesPrice;
     private BigDecimal salesPrice;

@@ -345,6 +345,19 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         }
     }
     }
 
 
+    @Override
+    public List<ShipmentsPlanDetail> listBySpecIds(List<String> specIds) {
+        if (CollectionUtils.isEmpty(specIds)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.in(ShipmentsPlanDetail::getOrderSpecId, specIds)
+                .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                .eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE);
+
+        return getBaseMapper().selectList(queryWrapper);
+    }
+
 
 
     /**
     /**
      * 封装发货计划明细数据
      * 封装发货计划明细数据

@@ -113,4 +113,12 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @param planId    计划ID
      * @param planId    计划ID
      */
      */
     void completed(String planId);
     void completed(String planId);
+
+    /**
+     * 根据订货单规格ID批量查询
+     *
+     * @param specIds   规格ID集合
+     * @return          List<ShipmentsPlanDetail>
+     */
+    List<ShipmentsPlanDetail> listBySpecIds(List<String> specIds);
 }
 }