楚江ERP：补货单生成发货计划单

 package com.lframework.xingyun.sc.impl.purchase;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
@@ -20,12 +21,15 @@ import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
 import com.lframework.xingyun.sc.vo.purchase.CreateReplenishmentOrderLineVo;
 import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderLineVo;
 import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderLineVo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -131,6 +135,17 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
         OpLogUtil.setExtra(vo);
     }
 
+    @Override
+    public List<ReplenishmentOrderLine> listByShipmentDate(List<LocalDate> shipmentDateList) {
+        if (CollectionUtils.isEmpty(shipmentDateList)) {
+            return new ArrayList<>(0);
+        }
+
+        Wrapper<ReplenishmentOrderLine> wrappers = Wrappers.lambdaQuery(ReplenishmentOrderLine.class)
+                .in(ReplenishmentOrderLine::getConfirmedDeliveryDate, shipmentDateList);
+        return getBaseMapper().selectList(wrappers);
+    }
+
     @CacheEvict(value = ReplenishmentOrderLine.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -9,10 +9,7 @@ import com.lframework.starter.web.core.utils.*;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.vo.workshop.QueryWorkshopVo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
-import com.lframework.xingyun.sc.entity.ShipmentsPlan;
-import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
@@ -23,6 +20,8 @@ import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.mappers.ShipmentsPlanDetailMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
+import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
@@ -54,6 +53,10 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     private WorkshopService workshopService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private ReplenishmentOrderLineService replenishmentOrderLineService;
+    @Resource
+    private ReplenishmentOrderService replenishmentOrderService;
 
 
     @Override
@@ -147,7 +150,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
      * @param pageIndex 分页页码
      * @param pageSize  分页大小
      * @param vo        查询条件
-     * @return          PageResult<ShipmentsPlanDetail>
+     * @return PageResult<ShipmentsPlanDetail>
      */
     @Override
     public PageResult<ShipmentsPlanDetail> queryCanShipmentsData(Integer pageIndex, Integer pageSize, QueryShipmentsPlanDetailVo vo) {
@@ -170,7 +173,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     /**
      * 计划明细拆分
      *
-     * @param vo    条件
+     * @param vo 条件
      */
     @Override
     public void planDetailSplit(ShipmentsPlanDetailSplitVo vo) {
@@ -233,6 +236,18 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
             }
         }
+
+        // 获取补货单数据
+        List<ReplenishmentOrderLine> replenishmentOrderLineList = replenishmentOrderLineService.listByShipmentDate(dateList);
+        Map<String, ReplenishmentOrder> replenishmentOrderMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(replenishmentOrderLineList)) {
+            List<String> replenishmentOrderIdList = replenishmentOrderLineList.stream().map(ReplenishmentOrderLine::getReplenishmentOrderId).collect(Collectors.toList());
+            List<ReplenishmentOrder> replenishmentOrderList = replenishmentOrderService.listByIds(replenishmentOrderIdList);
+            if (CollectionUtils.isNotEmpty(replenishmentOrderList)) {
+                replenishmentOrderMap = replenishmentOrderList.stream().collect(Collectors.toMap(ReplenishmentOrder::getId, Function.identity()));
+            }
+        }
+
         for (Workshop workshop : workshopList) {
             // 生成发货计划
             ShipmentsPlan plan = new ShipmentsPlan();
@@ -244,8 +259,8 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
 
             shipmentsPlanService.getBaseMapper().insert(plan);
             // 生成发货计划明细
+            List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(orderLineList)) {
-                List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
                 for (PurchaseOrderLine line : orderLineList) {
                     ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
                     detail.setId(IdUtil.getId());
@@ -269,17 +284,45 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
 
                     planDetails.add(detail);
                 }
-                if (CollectionUtils.isNotEmpty(planDetails)) {
-                    getBaseMapper().batchAdd(planDetails);
+            }
+            // 补货单生成发货单明细
+            if (CollectionUtils.isNotEmpty(replenishmentOrderLineList)) {
+                for (ReplenishmentOrderLine replenishmentOrderLine : replenishmentOrderLineList) {
+                    ReplenishmentOrder replenishmentOrder = replenishmentOrderMap.get(replenishmentOrderLine.getReplenishmentOrderId());
+                    if (replenishmentOrder == null) {
+                        continue;
+                    }
+
+                    if (!workshop.getId().equals(replenishmentOrder.getWorkshopId())) {
+                        continue;
+                    }
+
+                    ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
+                    detail.setId(IdUtil.getId());
+                    detail.setPlanId(plan.getId());
+                    detail.setOrderId(replenishmentOrder.getId());
+                    detail.setOrderSpecId(replenishmentOrderLine.getId());
+                    detail.setShipmentsDate(replenishmentOrderLine.getConfirmedDeliveryDate());
+                    detail.setPreShipments(afTomorrow.equals(replenishmentOrderLine.getConfirmedDeliveryDate()));
+                    detail.setDelFlag(Boolean.FALSE);
+
+                    detail.setCreateById("1");
+                    detail.setUpdateById("1");
+
+                    planDetails.add(detail);
                 }
             }
+
+            if (CollectionUtils.isNotEmpty(planDetails)) {
+                getBaseMapper().batchAdd(planDetails);
+            }
         }
     }
 
     /**
      * 批量删除
      *
-     * @param ids   主键ID集合
+     * @param ids 主键ID集合
      */
     @Override
     public void batchDelete(List<String> ids) {
@@ -331,10 +374,10 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     /**
      * 封装发货计划明细数据
      *
-     * @param quantity  数量
-     * @param detail    原数据
-     * @param userId    人员ID
-     * @return          ShipmentsPlanDetail
+     * @param quantity 数量
+     * @param detail   原数据
+     * @param userId   人员ID
+     * @return ShipmentsPlanDetail
      */
     private static ShipmentsPlanDetail getShipmentsPlanDetail(BigDecimal quantity, ShipmentsPlanDetail detail, String userId) {
         ShipmentsPlanDetail data = new ShipmentsPlanDetail();

@@ -7,6 +7,7 @@ import com.lframework.xingyun.sc.vo.purchase.CreateReplenishmentOrderLineVo;
 import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderLineVo;
 import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderLineVo;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -52,4 +53,5 @@ public interface ReplenishmentOrderLineService extends BaseMpService<Replenishme
      */
     void update(UpdateReplenishmentOrderLineVo vo);
 
+    List<ReplenishmentOrderLine> listByShipmentDate(List<LocalDate> shipmentDateList);
 }