From aa9e526bdcab9e817dbc2b112126aa0328e91a2b Mon Sep 17 00:00:00 2001 From: 南骏 池 <chiffly@163.com> Date: 星期五, 21 三月 2025 17:34:39 +0800 Subject: [PATCH] 1.删除特征值.2.image_delete3.entity --- service/Warehouse/TransferOutManager.cs | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/service/Warehouse/TransferOutManager.cs b/service/Warehouse/TransferOutManager.cs index 5c3a896..d30ddd0 100644 --- a/service/Warehouse/TransferOutManager.cs +++ b/service/Warehouse/TransferOutManager.cs @@ -52,7 +52,7 @@ /// </summary> /// <param name="query">鏌ヨ鍙傛暟,鍖呭惈鍗曟嵁鍙�</param> /// <returns>寰呭鐞嗙殑璋冩嫧鍑哄簱鏄庣粏鍒楄〃</returns> - public List<TransferOutDetailModel> GetTransferOutDetailListByBillNo( + public List<ItemDetailModel> GetTransferOutDetailListByBillNo( WarehouseQuery query) { var p_bill_no = query.billNo; @@ -69,7 +69,7 @@ && a.FBillNo == p_bill_no // 鍖归厤鍗曟嵁鍙� && a.FApproveStatus == 1) // 鍗曟嵁宸插鏍� .OrderBy((b, a, s) => s.ItemNo) - .Select((b, a, s) => new TransferOutDetailModel + .Select((b, a, s) => new ItemDetailModel { ItemNo = s.ItemNo, ItemName = s.ItemName, @@ -89,7 +89,7 @@ return result; } - public List<TransferOutDetailModel> GetDBCKDetal( + public List<ItemDetailModel> GetDBCKDetal( WarehouseQuery query) { var p_bill_no = query.billNo; @@ -106,13 +106,14 @@ && a.FBillNo == p_bill_no // 鍖归厤鍗曟嵁鍙� && a.FApproveStatus == 1) // 鍗曟嵁宸插鏍� .OrderBy((b, a, s) => s.ItemNo) - .Select((b, a, s) => new TransferOutDetailModel + .Select((b, a, s) => new ItemDetailModel { ItemNo = s.ItemNo, ItemName = s.ItemName, ItemModel = s.ItemModel, FQty = b.FQty, // 鐢宠鏁伴噺 SQty = b.SQty, // 宸叉壂鏁伴噺 + RQty = b.RQty, // 淇濈暀鍏朵粬蹇呰瀛楁... Pid = b.Pid.ToString(), FMaterialId = b.FMaterialId, @@ -128,7 +129,7 @@ /// </summary> /// <param name="query">鍖呭惈鍗曟嵁鍙枫�佺敤鎴峰悕鍜屾潯鐮佷俊鎭殑鏌ヨ鍙傛暟</param> /// <returns>澶勭悊鍚庣殑琛ㄥ崟鍜屽緟澶勭悊鏄庣粏鍒楄〃</returns> - public (WarehouseQuery form, List<TransferOutDetailModel> items) + public (WarehouseQuery form, List<ItemDetailModel> items) ScanMoveBarcode(WarehouseQuery query) { var p_bill_no = query.billNo; @@ -217,7 +218,7 @@ /// </summary> /// <param name="query">鍖呭惈鍗曟嵁鍙枫�佺敤鎴峰悕鍜屾潯鐮佷俊鎭殑鏌ヨ鍙傛暟</param> /// <returns>澶勭悊鍚庣殑琛ㄥ崟鍜屽緟澶勭悊鏄庣粏鍒楄〃</returns> - public (WarehouseQuery form, List<TransferOutDetailModel> items) + public (WarehouseQuery form, List<ItemDetailModel> items) ScanReceiveBarcode(WarehouseQuery query) { var p_bill_no = query.billNo; -- Gitblit v1.9.3