verou
2025-03-28 e85d317a7ab0a4cc397f4b235b17f6223ec0840e
Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
2个文件已修改
10 ■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -9,6 +9,7 @@
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;
@@ -99,6 +100,10 @@
                    throw new CoolException("数据错误:当前物料不存在!!");
                }
//                //TODO barcode生成策略
                String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
                if (StringUtils.isBlank(trackCode)) {
                    throw new CoolException("单据跟踪码生成失败:请检查「sys_asn_mantr_label」是否配置完成!!");
                }
//                String barcode = code + matnr.getCode();
                orderItem.setAnfme(item.getAnfme())
                        .setAsnId(order.getId())
@@ -108,6 +113,7 @@
                        .setSplrCode(item.getSplrCode())
                        .setPoDetlId(item.getId())
                        .setPlatItemId(item.getPlatItemId())
                        .setTrackCode(trackCode)
//                        .setBarcode(barcode)
                        .setPoCode(purchase.getCode())
                        .setPurQty(item.getAnfme())
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java
@@ -25,9 +25,9 @@
    public final static String SYS_RECEIPT_BATCH = "sys_receipt_batch";
    /**
     * ASN标签生成规则
     * ASN物料标签生成规则
     */
    public final static String SYS_LABEL_CODE = "sys_label_code";
    public final static String SYS_LABEL_CODE = "sys_asn_mantr_label";
    /**
     * 质检单业务类型