From 7fa560e3e013ad43a06f116d87f712f32d16b040 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Wed, 19 Nov 2025 14:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B7=BB=E5=8A=A0engChgLevel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/trans/service/impl/TransHeaderServiceImpl.java   | 2 +-
 .../gaotao/modules/warehouse/dao/InventoryStockMapper.java   | 5 +++--
 .../modules/warehouse/service/InventoryStockService.java     | 2 +-
 .../warehouse/service/impl/InventoryStockServiceImpl.java    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java
index e75d430..0a47dfa 100644
--- a/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/trans/service/impl/TransHeaderServiceImpl.java
@@ -176,7 +176,7 @@ public class TransHeaderServiceImpl extends ServiceImpl<TransHeaderMapper, Trans
         for(TransDetail detail:detailList){
             // 变更库存
             inventoryStockService.changeInventoryStock(detail.getSite(),detail.getOrderRef4(),detail.getPartNo(),
-                    detail.getBatchNo(), detail.getLocationId(), detail.getTransQty(),detail.getWdrNo(),fangxiang);
+                    detail.getBatchNo(), detail.getLocationId(), detail.getTransQty(),detail.getWdrNo(),detail.getEngChgLevel(),fangxiang);
         }
 
         return detailList;
diff --git a/src/main/java/com/gaotao/modules/warehouse/dao/InventoryStockMapper.java b/src/main/java/com/gaotao/modules/warehouse/dao/InventoryStockMapper.java
index e87027a..e550169 100644
--- a/src/main/java/com/gaotao/modules/warehouse/dao/InventoryStockMapper.java
+++ b/src/main/java/com/gaotao/modules/warehouse/dao/InventoryStockMapper.java
@@ -11,13 +11,14 @@ import java.math.BigDecimal;
 
 @Mapper
 public interface InventoryStockMapper extends BaseMapper<InventoryStock> {
-    @Select("SELECT * FROM inventory_stock WITH (UPDLOCK, ROWLOCK) WHERE site = #{site} AND warehouse_id = #{warehouseId} AND part_no = #{partNo} AND batch_no = #{batchNo} AND location_id = #{locationId} and wdr=#{wdr}")
+    @Select("SELECT * FROM inventory_stock WITH (UPDLOCK, ROWLOCK) WHERE site = #{site} AND warehouse_id = #{warehouseId} AND part_no = #{partNo} AND batch_no = #{batchNo} AND location_id = #{locationId} and wdr=#{wdr} and eng_chg_level=#{engChgLevel}")
     InventoryStock selectForUpdate(@Param("site") String site,
                                    @Param("warehouseId") String warehouseId,
                                    @Param("partNo") String partNo,
                                    @Param("batchNo") String batchNo,
                                    @Param("locationId") String locationId,
-                                   @Param("wdr") String wdr);
+                                   @Param("wdr") String wdr,
+                                   @Param("engChgLevel") String engChgLevel);
 
     int getLocationCount(Location data);
 
diff --git a/src/main/java/com/gaotao/modules/warehouse/service/InventoryStockService.java b/src/main/java/com/gaotao/modules/warehouse/service/InventoryStockService.java
index c918684..e62b677 100644
--- a/src/main/java/com/gaotao/modules/warehouse/service/InventoryStockService.java
+++ b/src/main/java/com/gaotao/modules/warehouse/service/InventoryStockService.java
@@ -57,5 +57,5 @@ public interface InventoryStockService extends IService<InventoryStock> {
      * @return 创建的库存记录
      */
     void changeInventoryStock(String site, String warehouseId, String partNo,
-                              String batchNo, String locationId, BigDecimal transQty,String wdr,String fangxiang);
+                              String batchNo, String locationId, BigDecimal transQty,String wdr,String engChgLevel,String fangxiang);
 }
diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/InventoryStockServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/InventoryStockServiceImpl.java
index 2e8e24b..d5ad367 100644
--- a/src/main/java/com/gaotao/modules/warehouse/service/impl/InventoryStockServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/InventoryStockServiceImpl.java
@@ -120,9 +120,9 @@ public class InventoryStockServiceImpl extends ServiceImpl<InventoryStockMapper,
     @Override
     @Transactional
     public void changeInventoryStock(String site, String warehouseId, String partNo,
-                                              String batchNo, String locationId, BigDecimal transQty,String wdr,String fangxiang) {
+                                              String batchNo, String locationId, BigDecimal transQty,String wdr,String engChgLevel,String fangxiang) {
         //查询当前库存,库存应该是唯一的
-        InventoryStock existingStock = this.baseMapper.selectForUpdate(site, warehouseId, partNo, batchNo, locationId,wdr);
+        InventoryStock existingStock = this.baseMapper.selectForUpdate(site, warehouseId, partNo, batchNo, locationId,wdr,engChgLevel);
 
         if(existingStock != null){
             // 如果库存存在，根据方向进行更新