From 1d61b45846ac2e5cb0a8366365613c44c1319289 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 26 三月 2025 18:06:17 +0800
Subject: [PATCH] 优化收货单上架行数量判断
---
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 421 +++++++++++++++++++---------------------------------
1 files changed, 156 insertions(+), 265 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..d86bf1c 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -31,7 +31,7 @@
#region Propertys & Variables
//private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
private List<string> OrderList = new();
- private BIZ_U9_ASN_SN CurSn = new();
+ private List<BIZ_U9_ASN_SN> CurSn = new();
private List<BIZ_U9_ASN_SN> ScanList = new();
#endregion
@@ -82,216 +82,73 @@
var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
try
{
- if (CurInvItem.IsNullOrEmpty())
+ //瑙ｆ瀽鏉＄爜
+ Barcode barcode = new Barcode(input.SN);
+ if (barcode.IsException)
{
- //瑙ｆ瀽鏉＄爜
- Barcode barcode = new Barcode(input.SN);
- if (barcode.IsException)
+ throw barcode.AnalyseException;
+ }
+ //闈炴硶鏉＄爜
+ else if (!barcode.IsRegular)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鏉＄爜涓洪潪娉曟潯鐮�");
+ action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
+ return SetOutPutMqttMsg(action, input.Locale); ;
+ }
+
+ if (barcode.Type == Barcode.Types.OuterPackage)
+ {
+ CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.CARTON_NO == barcode.SN).ToList();
+ }
+ else
+ {
+ CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).ToList();
+ foreach (var sn in CurSn)
{
- throw barcode.AnalyseException;
- }
- //闈炴硶鏉＄爜
- else if (!barcode.IsRegular)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鏉＄爜涓洪潪娉曟潯鐮�");
- action.LocaleMsg = Biz.L("WMS.WmsItem.Barcode.IllegalFailure", input.SN);
- return action;
- }
- CurSn = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == barcode.SN).First();
-
- if (CurSn.IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.SnNotExists", input.SN);
- return action;
- }
- if (CurSn.AUTH_ORG != input.AuthOption.CurOrg)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"鏉＄爜鎵�灞炵粍缁嘯{0}]涓庡綋鍓嶇櫥褰曠粍缁嘯{1}]涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨缁勭粐");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.OrgNotCorrect", CurSn.AUTH_ORG, input.AuthOption.CurOrg);
- return action;
- }
- //楠岃瘉鏉＄爜鏄惁姝ｇ‘
- if (CurSn.STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
- return action;
- }
- CurSn.META_SN = input.SN;
-
- Result<IInventory> result = WMS_ITEM_Biz.WmsItem.Get(barcode.SN, input.AuthOption, true);
- if (!result.IsSuccessed)
- {
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return action;
- }
- var inv = result.Data as Inventory;
-
- //鐗╂枡楠岃瘉
- if (inv.ItemInfo.IsNullOrEmpty() || inv.ItemInfo.IS_ACTIVE == "N")
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鐗╂枡缂栫爜[{0}]涓嶅瓨鍦ㄦ垨鑰呰鐗╂枡鏈惎鐢�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", (inv.ItemInfo?.ITEM_CODE).IsNullOrEmpty(inv.Barcode.ItemCode));
- return action;
- }
-
- if (inv.Items.Count == 0)
- {
- WMS_ITEM Item;
- WMS_ITEM_PKG ItemPkgs;
-
- Item = new()
- {
- SN = inv.Barcode.SN,
- ITEM_CODE = inv.Barcode.ItemCode,
- AUTH_ORG = input.AuthOption.CurOrg,
- STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
- QTY = inv.Barcode.Qty.ToDouble(),
- PROD_DATE = (inv.Barcode.DateCode?? DateTime.Now.ToString("yyyy-MM-dd")).ToDateTime(),
- UNIT = inv.Barcode.Unit,
- };
-
- ItemPkgs = new()
- {
- SN = inv.Barcode.SN,
- AUTH_ORG = input.AuthOption.CurOrg,
- ITEM_CODE = inv.Barcode.ItemCode,
- QTY = inv.Barcode.Qty.ToDouble(),
- UNIT = inv.Barcode.Unit,
- };
-
- var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
- //鎵╁睍琛ㄤ笉瀛樺湪鏃舵柊寤�
- foreach (var item in noExt)
- {
- inv.ItemsExt.Add(new()
- {
- SN = item.SN,
- META_SN = inv.Barcode.MetaSn,
- QR_CODE = inv.Barcode.MetaSn
- });
- }
-
- inv.Items.Add(Item);
- inv.Packages.Add(ItemPkgs);
- }
- //闆呰揪涓嶄粠鏉＄爜涓婃洿鏂版暟閲�
- //else if (inv.Items.Count == 1)
- //{
- // inv.Items.First().QTY = inv.Barcode.Qty.ToDouble();
- // inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
- // inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;
-
- // inv.Packages.First().QTY = inv.Barcode.Qty.ToDouble();
- // inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
- // inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
- //}
- //濡傛灉鎵弿澶栫鐨勪笉鑳芥洿鏂版暟閲�
- else
- {
- foreach (var item in inv.Items)
- {
- item.ERP_WH = "";
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- foreach (var item in inv.Packages)
- {
- item.ERP_WH = "";
- item.AUTH_ORG = input.AuthOption.CurOrg;
- }
- }
- CurInvItem = inv;
-
- //妫�鏌ョ墿鏂欐暟閲忥紝濡傛灉娌℃湁鍒欐煡璇㈤泤杈炬潯鐮佷富妗ｏ紝鎶婃暟閲忚繑鍥炲墠绔‘璁�
- if (CurInvItem.Items.Any(q => q.QTY <= 0))
- {
- var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
- foreach (var qty in qtyList)
- {
- var item = CurInvItem.Items.First(q => q.SN == qty.Code);
- item.QTY = qty.WhQty;
- item.SUPP_LOTNO = qty.Segment7; //渚涘簲鍟嗘壒娆″彿
- }
- action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
- action.Data.Command = Command = "ComfirmQty";
- //action.LocaleMsg = Biz.L("璇风‘璁ゆ潯鐮乕{0}]鐨勬暟閲忔槸鍚︽纭�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
- return action;
+ sn.META_SN = input.SN;
}
}
- //鏇存柊宸茬‘璁ょ墿鏂欐暟閲�
- if (Command == "ComfirmQty")
+ if (CurSn.IsNullOrEmpty())
{
- var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
- if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
- {
- action.IsSuccessed = false;
- action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
- action.Data.Command = Command = "ComfirmQty";
- //action.LocaleMsg = Biz.L("鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紝璇烽噸鏂扮‘璁ゆ潯鐮乕{0}]鐨勬暟閲�");
- action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN);
- return action;
- }
- else
- {
- foreach (var qty in qtyList)
- {
- var item = CurInvItem.Items.First(q => q.SN == qty.SN);
- item.QTY = qty.QTY;
- var pkg = CurInvItem.Packages.First(q => q.SN == qty.SN);
- pkg.QTY = qty.QTY;
- }
- CurInvItem.UpdatePkgQty();
-
- Command = "Normal";
- }
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.SnNotExists", input.SN);
+ return SetOutPutMqttMsg(action, input.Locale); ;
+ }
+ if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L($"鏉＄爜鎵�灞炵粍缁嘯{0}]涓庡綋鍓嶇櫥褰曠粍缁嘯{1}]涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨缁勭粐");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.OrgNotCorrect", CurSn.First().AUTH_ORG, input.AuthOption.CurOrg);
+ return SetOutPutMqttMsg(action, input.Locale); ;
+ }
+ //楠岃瘉鏉＄爜鏄惁姝ｇ‘
+ if (CurSn.First().STATUS > WMS_ITEM.STATUSs.Incoming.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鐘舵�乕{0}]寮傚父锛岃閲嶆柊鎵弿");
+ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.StatusException", CurSn.First().STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
+ return SetOutPutMqttMsg(action, input.Locale); ;
}
//鎵ц娓呯偣鏁版嵁澶勭悊
- CurSn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
- CurSn.QTY = CurInvItem.Items.Sum(q => q.QTY);
- foreach (var item in CurInvItem.Items)
- {
- item.AUTH_ORG = CurSn.AUTH_ORG;
- item.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
- item.SOURCE_CODE = item.TRANS_CODE;
- item.SOURCE_ORDER = item.TRANS_NO;
- item.SOURCE_LINE = item.TRANS_LINE;
- item.TRANS_CODE = nameof(BIZ_U9_ASN);
- item.TRANS_NO = CurSn.ORDER_NO;
- item.TRANS_LINE = CurSn.LINE_NO;
- CurInvItem.History.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{CurInvItem.SN}]娓呯偣瀹屾垚锛屾搷浣滃崟鎹甗{item.TRANS_NO}]"));
- }
+ foreach (var sn in CurSn)
+ {
+ sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
+ sn.RECEIVER = UserCode;
+ sn.RECEIVE_DATE = DateTime.Now;
+ }
- //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
- var _CurSn = CurSn.Clone();
- var _Items = CurInvItem.Items.Clone();
- var _Packages = CurInvItem.Packages.Clone();
- var _History = CurInvItem.History.Clone();
- var _ItemsExt = CurInvItem.ItemsExt.Clone();
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _CurSn = CurSn.Clone();
AddCommitAction("Counted", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
- var t = db.Storageable(_Items, UserCode).ToStorage();
- t.AsInsertable.ExecuteCommand();
- t.AsUpdateable.UpdateColumns(q => new { q.QTY, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- var p = db.Storageable(_Packages, UserCode).ToStorage();
- p.AsInsertable.ExecuteCommand();
- p.AsUpdateable.UpdateColumns(q => new { q.QTY, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
- db.Storageable(_Packages, UserCode).ToStorage().AsInsertable.ExecuteCommand();
- db.Insertable(_History, UserCode).ExecuteCommand();
- var e = db.Storageable(_ItemsExt, UserCode).ToStorage().AsInsertable.ExecuteCommand();//涓嶅瓨鍦ㄦ彃鍏�
- db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == _CurSn.First().ORDER_NO).ExecuteCommand();
db.Storageable(_CurSn, UserCode).ExecuteCommand();
});
@@ -305,7 +162,7 @@
//action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{0}]澶嶆牳寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
}
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
/// <summary>
@@ -318,21 +175,21 @@
//淇濆瓨鏁版嵁搴�
SaveCommitListToDB();
- if (!OrderList.Contains(CurSn.ORDER_NO))
+ if (!OrderList.Contains(CurSn.First().ORDER_NO))
{
- OrderList.Add(CurSn.ORDER_NO);
+ OrderList.Add(CurSn.First().ORDER_NO);
}
- ScanList.Add(CurSn);
+ ScanList.AddRange(CurSn);
// 杩斿洖鏁版嵁
action.Data.Data = ScanList;
//action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurInvItem.SN);
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
//閲嶇疆宸ュ簭
ResetScan();
- return action;
+ return SetOutPutMqttMsg(action, locale); ;
}
/// <summary>
@@ -347,30 +204,32 @@
foreach (var sn in ScanList)
{
sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ sn.RECEIVER = null;
+ sn.RECEIVE_DATE = DateTime.MinValue;
}
- var historys = new List<WMS_ITEM_HIS>();
- var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
- foreach (var item in items)
- {
- var order = item.TRANS_CODE;
- item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- item.SOURCE_CODE = "";
- item.SOURCE_ORDER = "";
- item.SOURCE_LINE = "";
- item.TRANS_CODE = item.SOURCE_CODE;
- item.TRANS_NO = item.SOURCE_ORDER;
- item.TRANS_LINE = item.SOURCE_LINE;
- historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
- }
+ //var historys = new List<WMS_ITEM_HIS>();
+ //var items = await Biz.Db.Queryable<WMS_ITEM>().Where(q => ScanList.Select(s => s.SN).Contains(q.SN)).ToListAsync();
+ //foreach (var item in items)
+ //{
+ // var order = item.TRANS_CODE;
+ // item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ // item.SOURCE_CODE = "";
+ // item.SOURCE_ORDER = "";
+ // item.SOURCE_LINE = "";
+ // item.TRANS_CODE = item.SOURCE_CODE;
+ // item.TRANS_NO = item.SOURCE_ORDER;
+ // item.TRANS_LINE = item.SOURCE_LINE;
+ // historys.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"));
+ //}
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
var dbTran = db.UseTran(() =>
{
db.Updateable(ScanList, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommandAsync();
- db.Updateable(items, UserCode).ExecuteCommand();
- db.Insertable(historys, UserCode).ExecuteCommand();
+ //db.Updateable(items, UserCode).ExecuteCommand();
+ //db.Insertable(historys, UserCode).ExecuteCommand();
});
if (dbTran.IsSuccess)
{
@@ -400,24 +259,26 @@
var action = new ApiAction();
try
{
- var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
- var order = item.TRANS_CODE;
- item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- item.SOURCE_CODE = "";
- item.SOURCE_ORDER = "";
- item.SOURCE_LINE = "";
- item.TRANS_CODE = item.SOURCE_CODE;
- item.TRANS_NO = item.SOURCE_ORDER;
- item.TRANS_LINE = item.SOURCE_LINE;
+ //var item = await Biz.Db.Queryable<WMS_ITEM>().Where(q => q.SN == input.SN).FirstAsync();
+ //var order = item.TRANS_CODE;
+ //item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
+ //item.SOURCE_CODE = "";
+ //item.SOURCE_ORDER = "";
+ //item.SOURCE_LINE = "";
+ //item.TRANS_CODE = item.SOURCE_CODE;
+ //item.TRANS_NO = item.SOURCE_ORDER;
+ //item.TRANS_LINE = item.SOURCE_LINE;
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
var dbTran = db.UseTran(() =>
{
db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
- .Where(q => q.SN == input.SN).ExecuteCommand();
- db.Updateable(item, UserCode).ExecuteCommand();
- db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
+ .SetColumns(q => q.RECEIVER == null)
+ .SetColumns(q => q.RECEIVE_DATE == DateTime.MinValue)
+ .Where(q => q.SN == input.SN).ExecuteCommand();
+ //db.Updateable(item, UserCode).ExecuteCommand();
+ //db.Insertable(new WMS_ITEM_HIS(item, $"鏉＄爜[{item.SN}]鍙栨秷娓呯偣锛屾搷浣滃崟鎹甗{order}]"), UserCode).ExecuteCommand();
});
if (dbTran.IsSuccess)
{
@@ -442,34 +303,39 @@
/// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
/// </summary>
/// <returns></returns>
- public async Task<PageAble<BIZ_U9_ASN_SN>> GetScannedList()
+ public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
{
- return await Task.FromResult(new PageAble<BIZ_U9_ASN_SN>()
- {
- data = ScanList,
- totals = ScanList.Count(),
- });
- }
+ var action = new ApiAction<PageAble<BIZ_U9_ASN_SN>>();
+ action.Data = new PageAble<BIZ_U9_ASN_SN>();
+ action.Data.pageSize = input.pageSize;
+ action.Data.pageIndex = input.pageIndex;
+ action.Data.totals = ScanList.Count;
+ action.Data.data = ScanList.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
+ //action.Data = query;
+ return action;
+ }
- /// <summary>
- /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
- /// </summary>
- /// <returns></returns>
- public async Task<List<BIZ_U9_ASN>> GetOrderList()
+ /// <summary>
+ /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
{
- var Orders = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
- if (!Orders.IsNullOrEmpty())
+ var action = new ApiAction<List<BIZ_U9_ASN>>();
+ action.Data = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
+ if (!action.Data.IsNullOrEmpty())
{
- foreach (var order in Orders)
+ foreach (var order in action.Data)
{
foreach (var dtl in order.Details)
{
- dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).ToList();
- dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue()).Sum(q => q.QTY);
+ dtl.SnList = order.SnList.Where(q => q.LINE_NO == dtl.LINE_NO).OrderByDescending(q => q.STATUS).ToList();
+ dtl.QTY_COUNTED = dtl.SnList.Where(q => q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue()).Sum(q => q.QTY);
}
- }
+ order.IsFinished = !order.Details.Where(q => q.QTY != q.QTY_COUNTED).Any();
+ }
}
- return Orders;
+ return action;
}
/// <summary>
@@ -513,7 +379,7 @@
var orderNo = input.Data;
try
{
- var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
+ var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
if (order.IsNullOrEmpty())
{
action.IsSuccessed = false;
@@ -531,12 +397,12 @@
}
//鏌ヨ鏄惁娓呯偣瀹屾垚
- var noFinish = order.Details.Where(q => q.QTY != order.SnList.Sum(s => s.QTY));
+ var noFinish = order.Details.Where(q => q.QTY != order.SnList.Where(s => s.LINE_NO == q.LINE_NO && (s.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(s => s.QTY));
if (noFinish.Any())
{
action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("娓呯偣鏁伴噺涓嶅");// Biz.L("WMS.InReceipt.ScanItem.CheckingDataToSubmit"); //$"娓呯偣鏁伴噺涓嶅";
- action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚");
+ //action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
return action;
}
@@ -546,7 +412,12 @@
IsLogin = true,
CreateRcvBySrcASNParam = new ()
{
- aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY + q.QTY_GIFT } }).ToList(),
+ aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO
+ {
+ ASNLineKey = q.ID,
+ TransQty = new() { m_amount1 = q.QTY },
+ BinInfoList = new() { new() { Bin = new () { m_code = q.ItemInfo.DEFAULT_LOCATION }, LocationQtySU = q.QTY, LocationQtyTU = q.QTY } },
+ }).ToList(),
}
};
var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
@@ -561,12 +432,12 @@
var receipt = new BIZ_U9_RECEIPT();
receipt.Details = new();
receipt.SnList = new();
- DbClient U9Cdb = Biz.DataSource["YadaU9C"].Client;
- var list = U9Cdb.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code).ToList();
+ var list = Biz.DataSource["YadaU9C"].Client.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code).ToList();
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,12 +455,13 @@
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,
LINE_NO = item.DocLineNo.ToString(),
ITEM_CODE = item.ItemCode,
- QTY = item.RtnFillQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+ QTY = item.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
QTY_GIFT = asnDtl.QTY_GIFT,
ASN_ID = item.SrcASNDocId.ToString(),
ASN_NO =asnDtl.ORDER_NO,
@@ -626,10 +498,11 @@
//鏇存柊搴撳瓨琛ㄤ俊鎭�
var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
- var historys = new List<WMS_ITEM_HIS>();
+ var historys = new List<WMS_ITEM_HIS>();
foreach (var item in items)
{
- item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
item.SOURCE_CODE = item.TRANS_CODE;
item.SOURCE_ORDER = item.TRANS_NO;
item.SOURCE_LINE = item.TRANS_LINE;
@@ -638,14 +511,32 @@
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}]锛屽緟妫�楠屽畬鎴愬悗鍙叆搴�"));
}
+ var pkgs = MainDB.Queryable<WMS_ITEM_PKG>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
+ foreach (var item in pkgs)
+ {
+ item.AUTH_ORG = receipt.AUTH_ORG;
+ item.SOURCE_CODE = item.TRANS_CODE;
+ item.SOURCE_ORDER = item.TRANS_NO;
+ item.SOURCE_LINE = item.TRANS_LINE;
+ item.TRANS_CODE = nameof(BIZ_U9_RECEIPT);
+ item.TRANS_NO = receipt.ORDER_NO;
+ item.TRANS_LINE = receipt.SnList.First(q => q.SN == item.SN).LINE_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.Insertable(historys, UserCode).ExecuteCommand();
- db.Insertable(receipt, UserCode).ExecuteCommand();
+ db.Updateable(items, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, q.STATUS, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SOURCE_CODE, q.SOURCE_ORDER, q.SOURCE_LINE }).ExecuteCommand();
+ db.Updateable(pkgs, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG, 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.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();
});
--
Gitblit v1.9.3