From 36754ef7bbcf7e07a8ccb9dc65013c29bdc255bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jun 2026 10:11:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(material):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0=E6=97=B6ID=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在更新物料信息时重新生成雪花ID确保唯一性 - 避免因ID冲突导致的数据更新异常 - 保持版本号不变以维护数据一致性 --- .../com/nflg/wms/admin/service/MaterialControllerService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java index 4e59542e..cd2b2b48 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java @@ -114,6 +114,7 @@ public class MaterialControllerService { WmsMaterial old = materialService.getById(request.getId()); VUtil.trueThrowBusinessError(Objects.isNull(old)).throwMessage("数据不存在！"); WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request); + wmsMaterial.setId(IdUtil.getSnowflakeNextId()); wmsMaterial.setVersion(old.getVersion()); wmsMaterial.setCreateBy(UserUtil.getUserName()); wmsMaterial.setCreateTime(LocalDateTime.now()); From b237e333c8c30744aed639756bc54835e02a5cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Jun 2026 10:28:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(inventory):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=85=A5=E5=BA=93=E8=AE=A2=E5=8D=95=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将默认序号值从100调整为1000000 - 添加StrUtil工具类导入用于字符串处理 - 实现getOrder方法支持从批次号解析序号 - 修复getKey方法中序号获取逻辑确保一致性 --- .../controller/InProduceOrderSurplusController.java | 2 +- .../com/nflg/wms/common/pojo/dto/InventoryInDTO.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java index 1a8aa048..d3354aad 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderSurplusController.java @@ -339,7 +339,7 @@ public class InProduceOrderSurplusController extends BaseController { .stream() .map(list -> new InventoryInDTO() .setMaterialNo(list.get(0).getMaterialNo()) - .setOrder(100) + .setOrder(1000000) .setBatchNo(list.get(0).getBatchNo()) .setSerialNo(list.get(0).getSerialNo()) .setFactoryNo(list.get(0).getFactoryNo()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java index aa90ec76..1df0237c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.dto; +import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.experimental.Accessors; @@ -62,10 +63,17 @@ public class InventoryInDTO { */ private Integer order; + public Integer getOrder() { + if (Objects.isNull(order) && StrUtil.isNotBlank(getBatchNo())) { + return Integer.parseInt(getBatchNo().substring(4)); + } + return order; + } + private String key; public String getKey() { return getMaterialNo() + "|" + getFactoryNo() + "|" + getWarehouseNo() + "|" + getBatchNo() + "|" - + getSerialNo() + "|" + order + "|" + getBinLocation(); + + getSerialNo() + "|" + getOrder() + "|" + getBinLocation(); } }