From 8e47218fc2098d6fda1c7e258164b73a0d67fbed Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 05 三月 2025 10:27:48 +0800
Subject: [PATCH] 1.其他出库优化 2.委外退料单新增dabid 3.其他入库新增dabid
---
service/Warehouse/MesItemQtManager.cs | 2 +-
service/Wom/WwGdManager.cs | 15 ++++++++-------
entity/MesInvItemInCItems.cs | 6 ++++++
Controllers/Wom/WwGdController.cs | 14 ++++++++++++--
service/Warehouse/MesItemQtrkManager.cs | 3 ++-
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/Controllers/Wom/WwGdController.cs b/Controllers/Wom/WwGdController.cs
index fc2baf2..8ec8e60 100644
--- a/Controllers/Wom/WwGdController.cs
+++ b/Controllers/Wom/WwGdController.cs
@@ -149,9 +149,19 @@
{
try
{
- // 璋冪敤WwGdManager鐨刉wblScanBarcode鏂规硶鑾峰彇鐗╂枡淇℃伅
dynamic resultInfos = new ExpandoObject();
- resultInfos.materialInfo = m.WwblScanBarcode(query);
+ var (success, pendingList) = m.WwblScanBarcode(query);
+ resultInfos.success = success;
+ resultInfos.pendingList = pendingList;
+ if (success.status == 2)
+ {
+ return new ResponseResult
+ {
+ status = Convert.ToInt32(success.status),
+ message = success.message,
+ data = resultInfos.success
+ };
+ }
return new ResponseResult
{
status = 0,
diff --git a/entity/MesInvItemInCItems.cs b/entity/MesInvItemInCItems.cs
index 50b649f..156c51b 100644
--- a/entity/MesInvItemInCItems.cs
+++ b/entity/MesInvItemInCItems.cs
@@ -170,5 +170,11 @@
[SugarColumn(ColumnName = "depot_id")]
public string? DepotId { get; set; }
+ /// <summary>
+ /// 浠撳簱id
+ /// </summary>
+ [SugarColumn(ColumnName = "item_dabid")]
+ public string? itemDabid { get; set; }
+
[SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; }
}
\ No newline at end of file
diff --git a/service/Warehouse/MesItemQtManager.cs b/service/Warehouse/MesItemQtManager.cs
index a67d156..fbac799 100644
--- a/service/Warehouse/MesItemQtManager.cs
+++ b/service/Warehouse/MesItemQtManager.cs
@@ -216,7 +216,7 @@
{
// 鍒涘缓鏂扮殑鍑哄簱鍗�
outId = Guid.NewGuid();
- outNo = BillNo.GetBillNo("QTCK(鍏朵粬鍑哄簱鍗�)");
+ outNo = BillNo.GetBillNo("QTCK(鍏朵粬鍑哄簱)");
var mesItemQt = Db.Queryable<MesItemQt>()
.Where(it => it.Qtck == p_bill_no)
diff --git a/service/Warehouse/MesItemQtrkManager.cs b/service/Warehouse/MesItemQtrkManager.cs
index f91fcf3..73d3026 100644
--- a/service/Warehouse/MesItemQtrkManager.cs
+++ b/service/Warehouse/MesItemQtrkManager.cs
@@ -284,7 +284,8 @@
EbelnK3id = barcode.EbelnK3id,
LineK3id = barcode.LineK3id,
ItemId = barcode.ItemId,
- DepotId = c_depot_id.ToString()
+ DepotId = c_depot_id.ToString(),
+ itemDabid = barcode.AboutGuid.ToString(),
}).IgnoreColumns(true).ExecuteCommand();
else
// 瀛樺湪鍒欐洿鏂版暟閲�
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index 7dafa9b..f04b3ea 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -450,7 +450,8 @@
LineK3id = c_mes_inv_item_barcodes.LineK3id,
ItemId = c_mes_inv_item_barcodes.ItemId,
DepotCode = c_mes_depots.DepotCode,
- DepotId = c_depot_code.ToString()
+ DepotId = c_depot_code.ToString(),
+ itemDabid = c_mes_inv_item_barcodes.AboutGuid.ToString()
}).IgnoreColumns(true).ExecuteCommand();
else
// 瀛樺湪鏃舵洿鏂版暟閲�
@@ -621,9 +622,9 @@
(int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
})
.Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
- && it.Tld009 == c_mes_inv_item_barcodes.ItemId
- && it.Tld010 ==
- c_mes_inv_item_barcodes.WorkLine)
+ && it.Tld009 == c_mes_inv_item_barcodes.ItemId)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
// 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
@@ -655,9 +656,9 @@
(int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
})
.Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
- && it.Tld009 == c_mes_inv_item_barcodes.ItemId
- && it.Tld010 ==
- c_mes_inv_item_barcodes.WorkLine)
+ && it.Tld009 == c_mes_inv_item_barcodes.ItemId)
+ //&& it.Tld010 ==
+ //c_mes_inv_item_barcodes.WorkLine)
.ExecuteCommand();
}
--
Gitblit v1.9.3