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 { - @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 { * @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