From e05f0fb09b78e6de1dd4ad808fdbe1e044ebbbdd Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 28 三月 2025 11:46:33 +0800
Subject: [PATCH] 添加生成收货单功能及相关接口

---
 Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs |  375 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 211 insertions(+), 164 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 77f2bf3..7bc4711 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs
@@ -223,20 +223,68 @@
                     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();
                 });
-                //娓呯偣瀹屾垚璋冪敤鎺ュ彛鐢熸垚鏃犳潵婧愭敹璐у崟
-                Action generatedAction = () =>
+
+                //瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
+                action = DoIfFinish(action, input.Locale);
+            }
+            catch (Exception ex)
+            {
+                //鍙栨秷褰撳墠鎿嶄綔
+                ResetScan();
+                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
+            }
+            return SetOutPutMqttMsg(action, input.Locale);
+        }
+
+        /// <summary>
+        /// 鐢熸垚鏀惰揣鍗曪細璋冪敤U9鏂板鏀惰揣鍗曟帴鍙�
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public async Task<ApiAction> GenerateReceipt(BaseInput input)
+        {
+            var action = new ApiAction();
+            var orderNo = input.Data;
+            try
+            {
+                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())
                 {
-                    ApiAction<List<U9CReturnData2>> result = new ApiAction<List<U9CReturnData2>>();
-                    //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
-                    if (reqType == "1")
+                    action.IsSuccessed = false;
+                    //action.LocaleMsg = Biz.L($"鎵句笉鍒伴�佽揣鍗昜{0}]鐨勫崟鎹俊鎭紝璇锋彁浜ゆ纭殑鍗曞彿");
+                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
+                    return action;
+                }
+                //楠岃瘉鏉$爜鏄惁姝g‘
+                if (order.STATUS != BIZ_U9_ASN.STATUSs.Counting.GetValue())
+                {
+                    action.IsSuccessed = false;
+                    //action.LocaleMsg = Biz.L("鐢熸垚鏀惰揣鍗曪細閫佽揣鍗曠姸鎬乕{0}]寮傚父");
+                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.StatusException", order.STATUS.GetEnumDesc<BIZ_U9_ASN.STATUSs>());
+                    return action;
+                }
+
+                //鏌ヨ鏄惁娓呯偣瀹屾垚
+                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("閫佽揣鍗昜{0}]鏈竻鐐瑰畬鎴愶紝璇峰厛娓呯偣瀹屾垚锛屾湭瀹屾垚娓呯偣鐨勮鍙峰涓嬶細{1}");
+                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.NoFinishCounting", orderNo, string.Join("锛�", noFinish.Select(q => q.LINE_NO)));
+                    return action;
+                }
+                ApiAction<List<U9CReturnData2>> result = new();
+                //濡傛灉鏄殢鍗曡禒鍝佹垨鑰呮牱鍝�
+                if (reqType == "1")
+                {
+                    var iInput = new CreateReceivementInput
                     {
-                        var iInput = new CreateReceivementInput
-                        {
-                            userId = UserCode,
-                            IsLogin = true,
-                            Supplier = "",
-                            RcvDocType = "",
-                            RcvLines = new()
+                        userId = UserCode,
+                        IsLogin = true,
+                        Supplier = "",
+                        RcvDocType = "",
+                        RcvLines = new()
                             {
                                 new(){
                                     ItemInfo = new(){m_itemCode="" },
@@ -258,170 +306,169 @@
                                     InvLotCode  = "",
                                 },
                             }
+                    };
+                    result = await DI.Resolve<IWMS_U9C>().CreateReceivement(iInput);
+                    if (!result.IsSuccessed)
+                    {
+                        throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
+                    }
+                }
+                //濡傛灉鏄湭涓婇棬鎴�
+                else
+                {
+                    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));
+                    }
+                }
+
+                //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
+                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 && x.SplitFlag != 1).ToList();
+
+                if (list != null && list.Count > 0)
+                {
+                    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;
+                    receipt.SUPP_NAME = list.First().SupplierName;
+                    receipt.RECEIVER = UserCode;
+                    receipt.RECEIVE_DATE = DateTime.Now;
+                    receipt.ASN_ID = order.ID;
+                    receipt.ASN_NO = order.ORDER_NO;
+                    receipt.ORDER_DATE = list.First().ModifiedOn;
+                    receipt.HANDLED = 0;
+                    receipt.HANDLED_DATE = DateTime.Now;
+
+                    foreach (var item in list)
+                    {
+                        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.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
+                            QTY_GIFT = asnDtl.QTY_GIFT,
+                            ASN_ID = item.SrcASNDocId.ToString(),
+                            ASN_NO = asnDtl.ORDER_NO,
+                            ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
+                            ASN_LINE = asnDtl.LINE_NO,
+                            ERP_CODE = item.ItemCode1,
                         };
-                        result = DI.Resolve<IWMS_U9C>().CreateReceivement(iInput).Result;
-                        if (!result.IsSuccessed)
-                        {
-                            throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
-                        }
+                        receipt.Details.Add(receiptDt);
                     }
-                    //濡傛灉鏄湭涓婇棬鎴�
-                    else if (reqType == "0")
+
+                    foreach (var sn in order.SnList)
                     {
-                        var iInput = new CreateRcvBySrcASNInput
+                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
+                        BIZ_U9_RECEIPT_SN receiptSn = new()
                         {
-                            userId = UserCode,
-                            IsLogin = true,
-                            CreateRcvBySrcASNParam = new()
-                            {
-                                aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY } }).ToList(),
-                            }
+                            AUTH_ORG = dtl.AUTH_ORG,
+                            ORDER_NO = dtl.ORDER_NO,
+                            LINE_NO = dtl.LINE_NO,
+                            SN = sn.SN,
+                            META_SN = sn.META_SN,
+                            ITEM_CODE = sn.ITEM_CODE,
+                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
+                            QTY = sn.QTY,
+                            UNIT = sn.UNIT,
+                            IS_OK = sn.IS_OK,
+                            IS_IN = sn.IS_IN,
+                            LOTNO = sn.LOTNO,
+                            CARTON_NO = sn.CARTON_NO,
+                            PALLET_NO = sn.PALLET_NO,
                         };
-                        result = DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput).Result;
-                        if (!result.IsSuccessed)
-                        {
-                            throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
-                        }
+                        receipt.SnList.Add(receiptSn);
                     }
+                }
 
-                    //鏍规嵁鎺ュ彛杩斿洖鏀惰揣鍗曞崟鍙锋煡璇㈠崟鎹槑缁嗭紝骞跺垱寤烘潯鐮佹槑缁�
-                    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 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>();
+                foreach (var item in items)
+                {
+                    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;
+                    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;
+                    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;
 
-                    if (list != null && list.Count > 0)
-                    {
-                        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;
-                        receipt.SUPP_NAME = list.First().SupplierName;
-                        receipt.RECEIVER = UserCode;
-                        receipt.RECEIVE_DATE = DateTime.Now;
-                        receipt.ASN_ID = order.ID;
-                        receipt.ASN_NO = order.ORDER_NO;
-                        receipt.ORDER_DATE = list.First().ModifiedOn;
-                        receipt.HANDLED = 0;
-                        receipt.HANDLED_DATE = DateTime.Now;
-
-                        foreach (var item in list)
-                        {
-                            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.EyeballingQtyTU.ToDouble(), // mes鍗曟嵁鏁伴噺 --U9閫�琛ユ暟閲�
-                                QTY_GIFT = asnDtl.QTY_GIFT,
-                                ASN_ID = item.SrcASNDocId.ToString(),
-                                ASN_NO = asnDtl.ORDER_NO,
-                                ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
-                                ASN_LINE = asnDtl.LINE_NO,
-                                ERP_CODE = item.ItemCode1,
-                            };
-                            receipt.Details.Add(receiptDt);
-                        }
-
-                        foreach (var sn in order.SnList)
-                        {
-                            var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
-                            BIZ_U9_RECEIPT_SN receiptSn = new()
-                            {
-                                AUTH_ORG = dtl.AUTH_ORG,
-                                ORDER_NO = dtl.ORDER_NO,
-                                LINE_NO = dtl.LINE_NO,
-                                SN = sn.SN,
-                                META_SN = sn.META_SN,
-                                ITEM_CODE = sn.ITEM_CODE,
-                                STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
-                                QTY = sn.QTY,
-                                UNIT = sn.UNIT,
-                                IS_OK = sn.IS_OK,
-                                IS_IN = sn.IS_IN,
-                                LOTNO = sn.LOTNO,
-                                CARTON_NO = sn.CARTON_NO,
-                                PALLET_NO = sn.PALLET_NO,
-                            };
-                            receipt.SnList.Add(receiptSn);
-                        }
-                    }
-
-                    //鏇存柊搴撳瓨琛ㄤ俊鎭�
-                    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>();
-                    foreach (var item in items)
-                    {
-                        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;
-                        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;
-                        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();
-                    var dbTran = db.UseTran(() =>
-                    {
-                        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();
-                    });
-                    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);
-                    }
-                    else
-                    {
-                        Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
-                        //鎶涘嚭寮傚父
-                        throw dbTran.ErrorException;
-                    }
-                };
-
-                //瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
-                action = DoIfFinish(action, input.Locale, generatedAction);
+                //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+                var db = GetCommitDB();
+                var dbTran = db.UseTran(() =>
+                {
+                    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();
+                });
+                if (dbTran.IsSuccess)
+                {
+                    //action.LocaleMsg = Biz.L($"閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗昜{1}]鎴愬姛");
+                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
+                }
+                else
+                {
+                    Logger.Default.Fatal(dbTran.ErrorException, "Database transaction save exception");
+                    //鎶涘嚭寮傚父
+                    throw dbTran.ErrorException;
+                }
             }
-            catch (Exception ex)
+            catch (System.Exception ex)
             {
-                //鍙栨秷褰撳墠鎿嶄綔
-                ResetScan();
-                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
+                //return action.CatchExceptionWithLog(ex, Biz.L("閫佽揣鍗昜{0}]鐢熸垚鏀惰揣鍗曞紓甯�"));
+                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
             }
-            return SetOutPutMqttMsg(action, input.Locale);
+            return action;
         }
-
         /// <summary>
         /// 瀹屾垚鎵�鏈夊鐞嗗悗浣跨敤浜嬪姟淇濆瓨鏁版嵁
         /// </summary>

--
Gitblit v1.9.3