skyouc
2025-04-02 bdb2ae10053cd96900e6bf0900dc606a3daca55f
工作档入库
3个文件已修改
78 ■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Stock.java
@@ -2,6 +2,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
@@ -24,6 +26,7 @@
import java.util.Date;
@Data
@Accessors(chain = true)
@TableName("man_stock")
public class Stock implements Serializable {
@@ -40,25 +43,27 @@
     * ASN单据, 带出PO单
     */
    @ApiModelProperty(value= "ASN单据, 带出PO单")
    private String asnOrder;
    private Long asnId;
    @ApiModelProperty("订单编码")
    private String asnCode;
    /**
     * ERP凭证
     */
    @ApiModelProperty(value= "ERP凭证")
    private String erpToken;
    @ApiModelProperty(value= "plat凭证")
    private String platToken;
    /**
     * ERP单号
     * plat单号
     */
    @ApiModelProperty(value= "ERP单号")
    private String erpOrder;
    @ApiModelProperty(value= "plat单号")
    private String platOrderNo;
    /**
     * ERP库存地址
     * plat库存地址
     */
    @ApiModelProperty(value= "ERP库存地址")
    private String erpStkAdr;
    @ApiModelProperty(value= "plat库存地址")
    private String platStkAdr;
    /**
     * 合同标识
@@ -144,11 +149,11 @@
    public Stock() {}
    public Stock(String asnOrder,String erpToken,String erpOrder,String erpStkAdr,String contractId,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.asnOrder = asnOrder;
        this.erpToken = erpToken;
        this.erpOrder = erpOrder;
        this.erpStkAdr = erpStkAdr;
    public Stock(String asnOrder,String platToken,String platOrder,String platStkAdr,String contractId,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.platOrderNo = asnOrder;
        this.platToken = platToken;
        this.platOrderNo = platOrder;
        this.platStkAdr = platStkAdr;
        this.contractId = contractId;
        this.lockReason = lockReason;
        this.lockStatus = lockStatus;
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -3,15 +3,19 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.server.manager.entity.Task;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -27,6 +31,12 @@
    private TaskItemService taskItemService;
    @Autowired
    private StockItemService stockItemService;
    @Autowired
    private PurchaseService purchaseService;
    @Autowired
    private AsnOrderService asnOrderService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private StockService stockService;
    @Autowired
@@ -50,9 +60,33 @@
        if (taskItems.isEmpty()) {
            throw new CoolException("任务明细为空!!");
        }
        taskItems.forEach(item -> {
        //获取单据明细ID
        List<Long> ids = taskItems.stream().map(TaskItem::getOrderItemId).collect(Collectors.toList());
        List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, ids));
        if (items.isEmpty()) {
            throw new CoolException("数据错误:明细单据不存在");
        }
        /**获取订单*/
        List<Long> orders = items.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
        Map<Long, List<AsnOrderItem>> listMap = items.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
        listMap.keySet().forEach(key -> {
            AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, key));
            Stock stock = new Stock();
            if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
                Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
                stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
            }
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("当前业务:" + SerialRuleCode.SYS_STOCK_CODE + ",编码规则不存在!!");
            }
            stock.setAsnId(order.getId()).setAsnCode(order.getCode());
            if (!stockService.save(stock)) {
                throw new CoolException("库存保存失败!!");
            }
        });
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
@@ -48,4 +48,9 @@
     * 任务编码生成规则
     */
    public final static String SYS_TASK_CODE = "sys_task_code";
    /**
     * 仓库编码规则
     */
    public final static String SYS_STOCK_CODE = "sys_stock_code";
}