Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2024-11-04 13:54:47 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -539,7 +539,7 @@ namespace Tnb.WarehouseMgr
}
InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, Size = items_pretask.Count, Region_id = WmsWareHouseConst.REGION_CPOutstock_ID };
List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput, _db);
int instockLocIndex = 0;
foreach (Tuple<string, WmsCarryH, WmsCarryCode, BasLocation> item in items_pretask)

View File

@@ -489,7 +489,7 @@ namespace Tnb.WarehouseMgr
code_batch = r.Key.code_batch,
material_specification = item.material_specification,
container_no = item.container_no,
warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID,
warehouse_id = WmsWareHouseConst.WAREHOUSE_YCL_ID,
print_qty = qty,
scan_qty = qty,
print_id = "",