From ed903443d28d390401904427bd1c1befaade33bb Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 18 三月 2025 10:16:46 +0800
Subject: [PATCH] 优化清点逻辑again
---
Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs | 2 +-
Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs | 2 +-
Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs | 10 ++--------
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 24 +++++++++++++++++-------
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index f00575a..513b9e3 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -258,7 +258,9 @@
//鎵ц娓呯偣鏁版嵁澶勭悊
CurSn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
CurSn.QTY = CurInvItem.Items.Sum(q => q.QTY);
- foreach (var item in CurInvItem.Items)
+ CurSn.RECEIVER = UserCode;
+ CurSn.RECEIVE_DATE = DateTime.Now;
+ foreach (var item in CurInvItem.Items)
{
item.AUTH_ORG = CurSn.AUTH_ORG;
item.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
@@ -439,7 +441,7 @@
}
/// <summary>
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
/// </summary>
/// <returns></returns>
public async Task<PageAble<BIZ_U9_ASN_SN>> GetScannedList()
@@ -566,7 +568,8 @@
if (list != null && list.Count > 0)
{
- receipt.AUTH_ORG = order.AUTH_ORG;
+ receipt.ID = list.First().RcvId.ToString();
+ receipt.AUTH_ORG = order.AUTH_ORG;
receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue();
receipt.ORDER_NO = list.First().DocNo;
receipt.SUPP_CODE = list.First().SupplierCode;
@@ -584,6 +587,7 @@
var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
BIZ_U9_RECEIPT_DTL receiptDt = new()
{
+ ID = item.RcvLineId.ToString(),
AUTH_ORG = receipt.AUTH_ORG,
STATUS = BIZ_U9_RECEIPT.STATUSs.InQC.GetValue(),
ORDER_NO = item.DocNo,
@@ -638,14 +642,20 @@
item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_NO;
historys.Add(new WMS_ITEM_HIS(item, $"閫佽揣鍗昜{order.ORDER_NO}]鐨勬潯鐮乕{item.SN}]鐢熸垚鏀惰揣鍗昜{receipt.ORDER_NO}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
}
+ order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
+ order.RECEIVER_ID = receipt.ID;
+ order.RECEIVER_NO = receipt.ORDER_NO;
+ order.RECEIVER = UserCode;
+ order.RECEIVE_DATE = DateTime.Now;
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
var dbTran = db.UseTran(() =>
{
- db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommandAsync();
+ db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
db.Insertable(historys, UserCode).ExecuteCommand();
- db.Insertable(receipt, UserCode).ExecuteCommand();
+ db.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO }).ExecuteCommand();
+ db.Insertable(receipt, UserCode).ExecuteCommand();
db.Insertable(receipt.Details, UserCode).ExecuteCommand();
db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
});
diff --git a/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs
index 88d4b60..11da87d 100644
--- a/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs
@@ -232,7 +232,7 @@
/// <summary>
/// GetScannedList(ApiAction)
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
diff --git a/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs b/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs
index 97291d2..1e21693 100644
--- a/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs
+++ b/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs
@@ -37,7 +37,7 @@
public Task<ApiAction> DeleteScannedSn(BaseInput input);
/// <summary>
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
/// </summary>
/// <returns></returns>
public Task<PageAble<BIZ_U9_ASN_SN>> GetScannedList();
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs
index 88ec62d..c14dca7 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs
@@ -165,16 +165,10 @@
Arrived = 2,
[Description("娓呯偣涓�")]
Counting = 3,
- [Description("妫�楠屼腑")]
- InQC = 4,
- [Description("涓婃灦涓�")]
- Storing = 5,
- [Description("寰呭鏍�")]
- Review = 6,
[Description("宸插畬鎴�")]
- Finished = 7,
+ Finished = 4,
[Description("宸蹭綔搴�")]
- Cancel = 8,
+ Cancel = 5,
}
#endregion
--
Gitblit v1.9.3