From f72802ff8037bb5dc8f0671d5e26a6523aa79c0c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期六, 29 三月 2025 10:01:08 +0800 Subject: [PATCH] #修改 1. 添加批次编码自动生成 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 6 +++++- rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java | 5 +++++ rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 5 +++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java index 4de9ef0..ff094e5 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java @@ -120,6 +120,11 @@ private Double purQty; /** + * 搴撳瓨鎵规 + */ + @ApiModelProperty("搴撳瓨鎵规") + private String batch; + /** * 閲囪喘鍗曚綅 */ @ApiModelProperty(value= "閲囪喘鍗曚綅") diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java index f96b59c..9d468c4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java @@ -105,9 +105,13 @@ public boolean fieldsSave(Map<String, Object> params) { AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class); if (StringUtils.isBlank(asnOrderItem.getTrackCode())) { - String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, params); + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem); asnOrderItem.setTrackCode(ruleCode); } + if (StringUtils.isBlank(asnOrderItem.getBatch())) { + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_BATCH_CODE, asnOrderItem); + asnOrderItem.setBatch(ruleCode); + } if (!this.saveOrUpdate(asnOrderItem)) { throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�"); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java index 98c6e4e..12e3852 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/SerialRuleCode.java @@ -44,4 +44,9 @@ */ public final static String SYS_WAIT_PAKIN_CODE = "sys_wait_pakin_code"; + /** + * 搴撳瓨鎵规缂栫爜瑙勫垯 + */ + public final static String SYS_STOCK_BATCH_CODE = "sys_stock_batch_code"; + } -- Gitblit v1.9.1