部分添加engChgLevel

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;

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);
 

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);
 }

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){
             // 如果库存存在，根据方向进行更新