From 64496f4d312593f91ea038d44a425851ab926c07 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 21 Aug 2025 15:49:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E4=BC=98=E5=8C=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsAllocateOrder 和 WmsAllocateOrderDetail 类中，为 @TableId 注解添加 value属性
- 修复 WmsInstockOrderServiceImpl 中保存入库单逻辑的问题
- 优化入库单明细列表中入库单 ID 的设置方式
---
 .../main/java/org/dromara/wms/domain/WmsAllocateOrder.java  | 2 +-
 .../java/org/dromara/wms/domain/WmsAllocateOrderDetail.java | 4 +---
 .../wms/service/impl/WmsInstockOrderServiceImpl.java        | 6 +++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrder.java
index 92c8101..dc9b141 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrder.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrder.java
@@ -22,7 +22,7 @@ public class WmsAllocateOrder{
     /**
      * 表主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.AUTO, value = "ao_id")
     private Long aoId;
 
     /**
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrderDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrderDetail.java
index 12afbe8..0427d53 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrderDetail.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsAllocateOrderDetail.java
@@ -1,9 +1,7 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -25,7 +23,7 @@ public class WmsAllocateOrderDetail {
     /**
      * 调拨子表主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.AUTO, value = "ao_d_id")
     private Long aoDId;
 
     /**
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
index 5cd4109..35e4602 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
@@ -7,6 +7,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -205,6 +206,9 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
         if (flag) {
             bo.setInstockId(add.getInstockId());
         }
+        if (ObjectUtils.isEmpty(bo.getInstockId())) {
+            throw new ServiceException("入库单保存失败");
+        }
         MPJLambdaWrapper<WmsInstockOrder> addOne = buildQueryWrapper(bo);
         WmsInstockOrderVo orderVo = baseMapper.selectVoOne(addOne);
 //        // 设置生成的主键ID
@@ -214,7 +218,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
         if (bo.getDetailListBo() != null && !bo.getDetailListBo().isEmpty()) {
             // 为每个明细设置入库单信息
             for (WmsInstockDetailBo detail : bo.getDetailListBo()) {
-                detail.setInstockId(detail.getInstockId());
+                detail.setInstockId(bo.getInstockId());
                 detail.setInstockCode(inStockOrder);
             }