From a8fcfbb5e5ed9a07b1a30ef2d7ef9d407e9b04dd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 02 四月 2025 21:44:54 +0800
Subject: [PATCH] 更新ASN实体
---
Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 506 ++++++++++++++++++++++----------------------------------
1 files changed, 199 insertions(+), 307 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
index 1bb9fa1..5c963a7 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -14,6 +14,12 @@
using System.Security.Policy;
using Tiger.Model.Entitys.MES.Position;
using MailKit.Search;
+using IronPython.Runtime.Operations;
+using static IronPython.Modules._ast;
+using System.Diagnostics;
+using Tiger.Model.Minsun;
+using static IronPython.Runtime.Profiler;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
namespace Tiger.Business.WMS.Transaction
{
@@ -25,8 +31,6 @@
public IPrint_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
{
base.Init(id, userCode, apiHost, orgCode);
- //鍔犺浇宸茬粡娓呯偣鏁版嵁
- //LoadData();
Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
return this;
}
@@ -36,17 +40,11 @@
private List<string> OrderList = new();
private BIZ_U9_ASN order = new();
private List<BIZ_U9_ASN_SN> CurSn = new();
+ List<string> SnList = new();
private List<BIZ_U9_ASN_SN> ScanList = new();
#endregion
#region Functions
- /// <summary>
- /// 鍒濆鍖栨竻鐐规暟鎹�
- /// </summary>
- private void LoadData()
- {
- OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == UserCode && SqlFunc.Subqueryable<BIZ_U9_ASN>().Where(s => s.ORDER_NO == q.ORDER_NO && s.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Any()).Select(q => q.ORDER_NO).ToList();
- }
/// <summary>
/// 鎵弿鍏ュ彛
/// </summary>
@@ -70,21 +68,17 @@
//濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
else if (input.Data == "1")
{
- action = await Submit(input);
+
}
else if (input.Data == "Submit")
{
-
- }
- else
- {
- action = await ScanItem(input);
+ action = await Submit(input);
}
}
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
//action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父");
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
@@ -102,7 +96,8 @@
try
{
order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
- if (order==null) {
+ if (order == null)
+ {
action.IsSuccessed = false;
action.LocaleMsg = Biz.L($"鏌ヤ笉鍒癆SN鍗昜{input.SN}]鐨勬暟鎹�");
return action;
@@ -112,115 +107,120 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
+ ResetTrans();
action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
}
/// <summary>
- /// 鎻愪氦鏁版嵁
+ /// 鎻愪氦鏁版嵁鐢熸垚SN骞舵竻鐐�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<ApiAction<ScanOutput>> Submit(BaseInput input)
{
- var action = new ApiAction<ScanOutput>($"鎴愬姛鎻愪氦ASN鍗昜{input.SN}]琛屾暟鎹紝骞跺畬鎴愭竻鐐癸紝璇风偣鍑绘墦鍗版寜閽墦鍗版爣绛�", new ScanOutput());
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
try
{
- var snlist = input.Options["Snlist"].ToString().JsonToObject<List<string>>();
- List<string> SnList = new();
+ var snlist = input.Options["Snlist"].ToString().JsonToObject<List<BIZ_U9_ASN_SN>>();
+ var reqType = input.Options["reqType"].ToString();
+ var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
+ action.LocaleMsg = Biz.L($"鎴愬姛鎻愪氦ASN鍗昜{dtl.ORDER_NO}]琛屾暟鎹紝骞跺畬鎴愭竻鐐癸紝璇风偣鍑绘墦鍗版寜閽墦鍗版爣绛�");
+
+ if (MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO && (q.STATUS == WMS_ITEM.STATUSs.Counted.GetValue() || q.STATUS == WMS_ITEM.STATUSs.Rejected.GetValue())).Sum(q => q.QTY) == dtl.QTY)
+ {
+ action.IsSuccessed = false;
+ action.LocaleMsg = Biz.L($"ASN鍗昜{dtl.ORDER_NO}]琛孾{dtl.LINE_NO}]鏁版嵁宸插叏閮ㄦ竻鐐瑰畬鎴愶紝濡傛灉鏈墦鍗版爣绛捐鐐瑰嚮鎵撳嵃鎸夐挳鎵撳嵃鏍囩");
+ return action;
+ }
+ List<BIZ_U9_ASN_SN> sns = new();
+ List<WMS_ITEM> items = new();
+ List<WMS_ITEM_HIS> hiss = new();
+ List<WMS_ITEM_EXT> itemExts = new();
+ List<WMS_ITEM_PKG> pkgs = new();
foreach (var sn in snlist)
{
- SnList.Add(DI.Resolve<ICodeRuleCache>()["InitialBarcode"]?.Generate($"{sn}").Data.ToString() ?? "");
- }
- action.Data.Data = SnList;
- }
- catch (Exception ex)
- {
- //鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
- action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
- }
- return SetOutPutMqttMsg(action, input.Locale);
- }
-
- /// <summary>
- /// 鎵弿鏉＄爜鍒嗘瀽绫诲瀷
- /// </summary>
- public async Task<ApiAction<ScanOutput>> ScanItem(BaseInput input)
- {
- var action = new ApiAction<ScanOutput>(new ScanOutput() { Command = Command });
- try
- {
- //瑙ｆ瀽鏉＄爜
- 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)
+ var metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
+ SnList.Add(metaSn);
+ var barcode = new Barcode(metaSn);
+ BIZ_U9_ASN_SN info = new()
{
- sn.META_SN = input.SN;
- }
+ AUTH_ORG = dtl.AUTH_ORG,
+ CREATE_TIME = DateTime.Now,
+ CREATE_USER = UserCode,
+ UPDATE_TIME = DateTime.Now,
+ UPDATE_USER = UserCode,
+ STATUS = WMS_ITEM.STATUSs.Counted.GetValue(),
+ ORDER_NO = dtl.ORDER_NO,
+ LINE_NO = dtl.LINE_NO,
+ SN = barcode.SN,
+ META_SN = metaSn,
+ ITEM_CODE = barcode.ItemCode,
+ QTY = sn.QTY,
+ LOTNO = barcode.LotNo,
+ CARTON_NO = barcode.SN,
+ RECEIVER = UserCode,
+ RECEIVE_DATE = DateTime.Now,
+ };
+ sns.Add(info);
+ var item = new WMS_ITEM()
+ {
+ SN = barcode.SN,
+ ITEM_CODE = barcode.ItemCode,
+ AUTH_ORG = dtl.AUTH_ORG,
+ STATUS = WMS_ITEM.STATUSs.Counted.GetValue(),
+ QTY = sn.QTY,
+ PROD_DATE = barcode.ProdDate ?? BarcodeAnalysis.GetDateTime(dtl.SUPP_LOTNO) ?? DateTime.Now,
+ UNIT = barcode.Unit,
+ TRANS_CODE = nameof(BIZ_U9_ASN),
+ TRANS_NO = info.ORDER_NO,
+ TRANS_LINE = info.LINE_NO,
+ SUPP_CODE = dtl.SUPP_CODE,
+ SUPP_LOTNO = dtl.SUPP_LOTNO,
+ };
+ items.Add(item);
+ hiss.Add(new WMS_ITEM_HIS(item, $"鏉＄爜[{barcode.SN}]瀵煎叆锛屾搷浣滃崟鎹甗{item.TRANS_NO}]"));
+ var ext = new WMS_ITEM_EXT()
+ {
+ SN = barcode.SN,
+ META_SN = metaSn,
+ QR_CODE = metaSn,
+ };
+ itemExts.Add(ext);
+ var pkg = new WMS_ITEM_PKG()
+ {
+ SN = barcode.SN,
+ ITEM_CODE = barcode.ItemCode,
+ AUTH_ORG = dtl.AUTH_ORG,
+ QTY = sn.QTY,
+ UNIT = barcode.Unit,
+ TRANS_CODE = nameof(BIZ_U9_ASN),
+ TRANS_NO = info.ORDER_NO,
+ TRANS_LINE = info.LINE_NO,
+ SUPP_CODE = dtl.SUPP_CODE,
+ SUPP_LOTNO = dtl.SUPP_LOTNO,
+ };
+ pkgs.Add(pkg);
}
- if (CurSn.IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("ASN鍗曚腑涓嶅瓨鍦ㄦ潯鐮乕{0}]");
- action.LocaleMsg = Biz.L("WMS.Print_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.Print_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); ;
- }
-
- //鎵ц娓呯偣鏁版嵁澶勭悊
- 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();
- AddCommitAction("Counted", () =>
+ AddCommitAction("CountedAndPrint", () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
- 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();
+ db.Updateable<BIZ_U9_ASN>(UserCode).SetColumns(q => q.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue()).Where(q => q.ORDER_NO == dtl.ORDER_NO).ExecuteCommand();
+ db.Storageable(sns, UserCode).ExecuteCommand();
+ var s = db.Storageable(items, UserCode).WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ s.AsInsertable.ExecuteCommand();
+ s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.STATUS, q.QTY, q.PROD_DATE, q.UNIT, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SUPP_CODE, q.SUPP_LOTNO, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ db.Insertable(hiss, UserCode).ExecuteCommand();
+ var o = db.Storageable(itemExts, UserCode).WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ o.AsInsertable.ExecuteCommand();
+ o.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.META_SN, q.QR_CODE, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
+ var y = db.Storageable(pkgs, UserCode).WhereColumns(t => new { t.SN, t.GHOST_ROW }).ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.ITEM_CODE, q.AUTH_ORG, q.QTY, q.UNIT, q.TRANS_CODE, q.TRANS_NO, q.TRANS_LINE, q.SUPP_CODE, q.SUPP_LOTNO, q.UPDATE_TIME, q.UPDATE_USER, }).ExecuteCommand();
});
//瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
@@ -229,189 +229,10 @@
catch (Exception ex)
{
//鍙栨秷褰撳墠鎿嶄綔
- ResetScan();
- //action.CatchExceptionWithLog(ex, $"鎵弿鏉＄爜[{0}]澶嶆牳寮傚父");
- action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
+ ResetTrans();
+ action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
}
return SetOutPutMqttMsg(action, input.Locale);
- }
-
- /// <summary>
- /// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
- /// </summary>
- /// <param name="action"></param>
- /// <returns></returns>
- public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
- {
- //淇濆瓨鏁版嵁搴�
- SaveCommitListToDB();
-
- if (!OrderList.Contains(CurSn.First().ORDER_NO))
- {
- OrderList.Add(CurSn.First().ORDER_NO);
- }
- ScanList.AddRange(CurSn);
-
- // 杩斿洖鏁版嵁
- action.Data.Data = ScanList;
-
- //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
-
- //閲嶇疆宸ュ簭
- ResetScan();
- return SetOutPutMqttMsg(action, locale); ;
- }
-
- /// <summary>
- /// 鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> DeleteScannedList()
- {
- var action = new ApiAction();
- try
- {
- foreach (var sn in ScanList)
- {
- sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
- sn.RECEIVER = null;
- sn.RECEIVE_DATE = DateTime.MinValue;
- }
-
- //浣跨敤缁熶竴鐨勪簨鍔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();
- });
- if (dbTran.IsSuccess)
- {
- ScanList.Clear();
- }
- else
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
- }
- catch (System.Exception ex)
- {
- //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎褰撳墠鎵�鏈夊凡娓呯偣璁板綍寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.DeleteScanListException"));
- }
- return action;
- }
-
- /// <summary>
- /// 鍒犻櫎褰撳墠鐢ㄦ埛鐨勫凡鎵崟涓褰�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> DeleteScannedSn(BaseInput input)
- {
- var action = new ApiAction();
- try
- {
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- var dbTran = db.UseTran(() =>
- {
- db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
- .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)
- {
- ScanList.RemoveAll(q => q.SN == input.SN);
- }
- else
- {
- Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
- }
- catch (System.Exception ex)
- {
- //return action.CatchExceptionWithLog(ex, Biz.L("鍒犻櫎宸叉竻鐐规潯鐮乕{0}]寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
- }
- return action;
- }
-
- /// <summary>
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
- {
- 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<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
- {
- 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 action.Data)
- {
- foreach (var dtl in order.Details)
- {
- 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 action;
- }
-
- /// <summary>
- /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
- /// </summary>
- /// <returns></returns>
- public async Task<ApiAction> SetGiftQty(BaseInput input)
- {
- var action = new ApiAction();
- try
- {
- var dtl = input?.Data?.JsonToObject<BIZ_U9_ASN_DTL>();
- if ((dtl?.ID ?? "").IsNullOrEmpty())
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L($"鎻愪氦鐨勬敹璐у崟鏄庣粏ID涓嶈兘涓虹┖");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
- return action;
- }
-
- //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
- var db = GetCommitDB();
- await db.Updateable(dtl, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.QTY_GIFT }).ExecuteCommandAsync();
- }
- catch (System.Exception ex)
- {
- //return action.CatchExceptionWithLog(ex, Biz.L("璁剧疆鏀惰揣鍗曟槑缁嗚禒鍝佹暟閲忎负寮傚父"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.SetGiftQtyException"));
- }
- return action;
}
/// <summary>
@@ -425,12 +246,13 @@
var orderNo = input.Data;
try
{
- var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
+ var reqType = input.Options["reqType"].ToString();
+ 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;
//action.LocaleMsg = Biz.L($"鎵句笉鍒伴�佽揣鍗昜{0}]鐨勫崟鎹俊鎭紝璇锋彁浜ゆ纭殑鍗曞彿");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
return action;
}
//楠岃瘉鏉＄爜鏄惁姝ｇ‘
@@ -438,7 +260,7 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("鐢熸垚鏀惰揣鍗曪細閫佽揣鍗曠姸鎬乕{0}]寮傚父");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
return action;
}
@@ -448,25 +270,70 @@
{
action.IsSuccessed = false;
//action.LocaleMsg = Biz.L("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
return action;
}
-
- var iInput = new CreateRcvBySrcASNInput
+ ApiAction<List<U9CReturnData2>> result = new();
+ //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
+ if (reqType == "1")
{
- userId = UserCode,
- IsLogin = true,
- CreateRcvBySrcASNParam = new()
+ var iInput = new CreateReceivementInput
{
- aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY } }).ToList(),
+ userId = UserCode,
+ IsLogin = true,
+ Supplier = "",
+ RcvDocType = "",
+ RcvLines = new()
+ {
+ new(){
+ ItemInfo = new(){m_itemCode="" },
+ Wh= new(){ m_code=""},
+ RcvLineLocations = new(){
+ new(){
+ Location = new(){ m_code="" },
+ LocationQtyTU = 0,
+ }
+ },
+ ArriveQtyTU = 0,
+ ArriveQtyPU = 0,
+ RcvQtyTU= 0,
+ RcvQtyPU= 0,
+ EyeballingQtyTU = 0,
+ RcvProcedure = 0,
+ StorageType = 0,
+ RcvLotCode = "",
+ InvLotCode = "",
+ },
+ }
+ };
+ result = await DI.Resolve<IWMS_U9C>().CreateReceivement(iInput);
+ if (!result.IsSuccessed)
+ {
+ throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
}
- };
- var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
- if (!result.IsSuccessed)
+ }
+ //濡傛灉鏄湭涓婇棬鎴�
+ else
{
- action.IsSuccessed = false;
- action.LocaleMsg = result.LocaleMsg;
- return action;
+ var iInput = new CreateRcvBySrcASNInput
+ {
+ userId = UserCode,
+ IsLogin = true,
+ CreateRcvBySrcASNParam = new()
+ {
+ 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(),
+ }
+ };
+ result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
+ if (!result.IsSuccessed)
+ {
+ throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
+ }
}
//鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
@@ -474,7 +341,7 @@
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 = U9Cdb.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code && x.SplitFlag != 1).ToList();
if (list != null && list.Count > 0)
{
@@ -585,7 +452,7 @@
if (dbTran.IsSuccess)
{
//action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗昜{1}]鎴愬姛");
- action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
}
else
{
@@ -597,19 +464,44 @@
catch (System.Exception ex)
{
//return action.CatchExceptionWithLog(ex, Biz.L("閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗曞紓甯�"));
- return action.CatchExceptionWithLog(ex, Biz.L("WMS.Print_BIZ_U9_ASN.GenerateReceiptException", orderNo));
+ return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
}
return action;
+ }
+ /// <summary>
+ /// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
+ /// </summary>
+ /// <param name="action"></param>
+ /// <param name="locale"></param>
+ /// <param name="doAfterSave"></param>
+ /// <returns></returns>
+ public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
+ {
+ //淇濆瓨鏁版嵁搴�
+ SaveCommitListToDB();
+
+ //淇濆瓨鏁版嵁鎴愬姛鍚庢墽琛�
+ doAfterSave?.Invoke();
+
+ // 杩斿洖鏁版嵁
+ action.Data.Data = SnList;
+
+ //action.LocaleMsg = Biz.L($"鏉＄爜[{0}]娓呯偣鎴愬姛锛�");
+ action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList));
+
+ //閲嶇疆宸ュ簭
+ ResetTrans();
+ return SetOutPutMqttMsg(action, locale); ;
}
#endregion
/// <summary>
- /// 閲嶇疆褰撳墠鎿嶄綔锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
+ /// 閲嶇疆浜嬪姟鏁版嵁锛屾湁闇�瑕佸垯閲嶅啓姝ゆ柟娉�
/// </summary>
- public override void ResetScan()
+ public override void ResetTrans()
{
- base.ResetScan();
+ base.ResetTrans();
Command = null;
CurInvItem = null;
CurScanShelf = null;
--
Gitblit v1.9.3