From e163a27328c805ffec7c894259430f76f0881d00 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期四, 03 四月 2025 23:12:23 +0800 Subject: [PATCH] 更新收货单提交按行提交已完成清点的行,上架增加IQC审核的判断 --- Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 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 7bc4711..9ba2272 100644 --- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs +++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs @@ -78,7 +78,7 @@ catch (Exception ex) { //鍙栨秷褰撳墠鎿嶄綔 - ResetScan(); + ResetTrans(); //action.CatchExceptionWithLog(ex, $"鎵弿[{input.SN}]寮傚父"); action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN)); } @@ -107,7 +107,7 @@ catch (Exception ex) { //鍙栨秷褰撳墠鎿嶄綔 - ResetScan(); + ResetTrans(); action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN)); } return SetOutPutMqttMsg(action, input.Locale); @@ -141,8 +141,7 @@ List<WMS_ITEM_PKG> pkgs = new(); foreach (var sn in snlist) { - var _sn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"/NoSourceBarcode/").Data.ToString() ?? ""; - var metaSn = _sn.replace("/NoSourceBarcode/", sn.SN); + 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() @@ -230,7 +229,7 @@ catch (Exception ex) { //鍙栨秷褰撳墠鎿嶄綔 - ResetScan(); + ResetTrans(); action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN)); } return SetOutPutMqttMsg(action, input.Locale); @@ -378,6 +377,8 @@ ASN_LINE_ID = item.SrcASNDocLineId.ToString(), ASN_LINE = asnDtl.LINE_NO, ERP_CODE = item.ItemCode1, + ERP_STATUS_CODE = item.Status.ToString(), + ERP_STATUS_NAME = item.StatusName, }; receipt.Details.Add(receiptDt); } @@ -488,21 +489,21 @@ action.Data.Data = SnList; //action.LocaleMsg = Biz.L($"鏉$爜[{0}]娓呯偣鎴愬姛锛�"); - action.LocaleMsg = Biz.L("WMS.Print_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList)); + action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", string.Join(",", SnList)); //閲嶇疆宸ュ簭 - ResetScan(); + 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