楚江ERP：补货单生成订货单

@@ -38,6 +38,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String contractId;
 
     /**
+     * 补货单ID
+     */
+    private String replenishmentOrderId;
+
+    /**
      * 合同类型
      */
     @TableField(exist = false)

@@ -14,7 +14,9 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+
 import java.io.Serializable;
+
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
@@ -136,6 +138,9 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!StringUtil.isBlank(vo.getContractId())) {
             data.setContractId(vo.getContractId());
         }
+        if (!StringUtils.isBlank(vo.getReplenishmentOrderId())) {
+            data.setReplenishmentOrderId(vo.getReplenishmentOrderId());
+        }
         if (!StringUtil.isBlank(vo.getOrderNo())) {
             data.setOrderNo(vo.getOrderNo());
         }
@@ -432,8 +437,8 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     /**
      * 更新规格变更状态
      *
-     * @param id        主键ID
-     * @param status    状态
+     * @param id     主键ID
+     * @param status 状态
      */
     @Override
     public void updateSpecChangeStatus(String id, String status) {

@@ -20,12 +20,16 @@ import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrderLine;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.mappers.ReplenishmentOrderMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderLineService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.purchase.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,6 +56,8 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
     @Override
     public PageResult<ReplenishmentOrder> query(Integer pageIndex, Integer pageSize, QueryReplenishmentOrderVo vo) {
@@ -254,6 +261,67 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
 
         OpLogUtil.setVariable("id", vo.getId());
         OpLogUtil.setExtra(data);
+
+        // 2025年11月28日14:07:43 逻辑调整，补货单填写完补货时间，生成订货单
+        createPurchaseOrder(vo.getId());
+    }
+
+    private void createPurchaseOrder(String id) {
+        ReplenishmentOrder data = getBaseMapper().selectById(id);
+        Wrapper<ReplenishmentOrderLine> lineWrapper = Wrappers.lambdaQuery(ReplenishmentOrderLine.class)
+                .eq(ReplenishmentOrderLine::getReplenishmentOrderId, id)
+                .orderByAsc(ReplenishmentOrderLine::getShowOrder);
+        List<ReplenishmentOrderLine> replenishmentOrderLineList = replenishmentOrderLineService.list(lineWrapper);
+        PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(data.getPurchaseOrderId());
+
+        CreatePurchaseOrderInfoVo vo = new CreatePurchaseOrderInfoVo();
+        vo.setContractId(purchaseOrderInfo.getContractId());
+        vo.setReplenishmentOrderId(id);
+        vo.setOrderNo(purchaseOrderInfo.getOrderNo());
+        vo.setOrderDate(purchaseOrderInfo.getOrderDate());
+        vo.setSupplyUnit(purchaseOrderInfo.getSupplyUnit());
+        vo.setSettlementTerms(purchaseOrderInfo.getSettlementTerms());
+        vo.setDeliveryMethod(purchaseOrderInfo.getDeliveryMethod());
+        vo.setContractCreateById(purchaseOrderInfo.getContractCreateById());
+        vo.setDeptId(purchaseOrderInfo.getDeptId());
+        vo.setWorkshopId(purchaseOrderInfo.getWorkshopId());
+        vo.setExecutionStandard(purchaseOrderInfo.getExecutionStandard());
+        vo.setExecutionStandardRemarks(purchaseOrderInfo.getExecutionStandardRemarks());
+        vo.setPieceWeightHeader(purchaseOrderInfo.getPieceWeightHeader());
+        vo.setTolerance(purchaseOrderInfo.getTolerance());
+        vo.setPerformance(purchaseOrderInfo.getPerformance());
+        vo.setElement(purchaseOrderInfo.getElement());
+        vo.setPackaging(purchaseOrderInfo.getPackaging());
+        vo.setRemarks(purchaseOrderInfo.getRemarks());
+        vo.setType("PRODUCTION");
+        vo.setExamineStatus("AUDIT");
+
+        List<CreatePurchaseOrderLineVo> lineVoList = new ArrayList<>(replenishmentOrderLineList.size());
+        BigDecimal totalQuantity = new BigDecimal(0);
+        for (ReplenishmentOrderLine replenishmentOrderLine : replenishmentOrderLineList) {
+            CreatePurchaseOrderLineVo createPurchaseOrderLineVo = new CreatePurchaseOrderLineVo();
+            createPurchaseOrderLineVo.setBrand(replenishmentOrderLine.getBrand());
+            createPurchaseOrderLineVo.setThickness(replenishmentOrderLine.getThickness());
+            createPurchaseOrderLineVo.setThicknessTolPos(replenishmentOrderLine.getThicknessTolPos());
+            createPurchaseOrderLineVo.setThicknessTolNeg(replenishmentOrderLine.getThicknessTolNeg());
+            createPurchaseOrderLineVo.setWidth(replenishmentOrderLine.getWidth());
+            createPurchaseOrderLineVo.setWidthTolPos(replenishmentOrderLine.getWidthTolPos());
+            createPurchaseOrderLineVo.setWidthTolNeg(replenishmentOrderLine.getWidthTolNeg());
+            createPurchaseOrderLineVo.setLength(replenishmentOrderLine.getLength());
+            createPurchaseOrderLineVo.setLengthTolPos(replenishmentOrderLine.getLengthTolPos());
+            createPurchaseOrderLineVo.setLengthTolNeg(replenishmentOrderLine.getLengthTolNeg());
+            createPurchaseOrderLineVo.setStatus(replenishmentOrderLine.getStatus());
+            createPurchaseOrderLineVo.setQuantity(replenishmentOrderLine.getSupplementaryQuantity());
+            createPurchaseOrderLineVo.setDeliveryDate(replenishmentOrderLine.getConfirmedDeliveryDate());
+            createPurchaseOrderLineVo.setShowOrder(replenishmentOrderLine.getShowOrder());
+            lineVoList.add(createPurchaseOrderLineVo);
+
+            totalQuantity = totalQuantity.add(replenishmentOrderLine.getSupplementaryQuantity());
+        }
+
+        vo.setTotalQuantity(totalQuantity);
+        vo.setCreatePurchaseOrderLineVoList(lineVoList);
+        purchaseOrderInfoService.create(vo);
     }
 
     @Override

@@ -20,8 +20,6 @@ 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;
@@ -53,10 +51,6 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
     private WorkshopService workshopService;
     @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
-    @Resource
-    private ReplenishmentOrderLineService replenishmentOrderLineService;
-    @Resource
-    private ReplenishmentOrderService replenishmentOrderService;
 
 
     @Override

@@ -23,6 +23,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private String contractId;
 
     /**
+     * 补货单ID
+     */
+    @ApiModelProperty("补货单ID")
+    private String replenishmentOrderId;
+
+    /**
      * 订单编号
      */
     @ApiModelProperty("订单编号")

@@ -5,6 +5,7 @@
     <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
         <id column="id" property="id"/>
         <result column="contract_id" property="contractId"/>
+        <result column="replenishment_order_id" property="replenishmentOrderId"/>
         <result column="order_no" property="orderNo"/>
         <result column="supply_unit" property="supplyUnit"/>
         <result column="ordering_unit" property="orderingUnit"/>
@@ -52,6 +53,7 @@
         SELECT
             tb.id,
             tb.contract_id,
+            tb.replenishment_order_id,
             tb.order_no,
             tb.supply_unit,
             tb.ordering_unit,