优化了一些已知问题

Rodney Chen

2025-03-26 7e0299298399c566b81b1ab786881998c746d228

 Tiger.Business.WMS/Transaction/Yada/Print_BIZ_U9_ASN.cs

@@ -13,6 +13,7 @@
using Tiger.Model.Entitys.MES.U9C;
using System.Security.Policy;
using Tiger.Model.Entitys.MES.Position;
using MailKit.Search;

namespace Tiger.Business.WMS.Transaction
{
@@ -25,7 +26,7 @@
        {
            base.Init(id, userCode, apiHost, orgCode);
            //加载已经清点数据
            LoadData();
            //LoadData();
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
            return this;
        }
@@ -33,6 +34,7 @@
        #region Propertys & Variables
        //private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
        private List<string> OrderList = new();
        private BIZ_U9_ASN order = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        private List<BIZ_U9_ASN_SN> ScanList = new();
        #endregion
@@ -60,8 +62,21 @@
                    action.LocaleMsg = Biz.L("WMS.Default.ScanItem.SnEmptyFailure");
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //扫描物料并复核
                else //if (Command == "Normal")
                //如果是未上门户
                else if (input.Data == "0")
                {
                    action = await GetAsnInfoForPrint(input);
                }
                //如果是随单赠品或者样品
                else if (input.Data == "1")
                {
                    action = await Submit(input);
                }
                else if (input.Data == "Submit")
                {

                }
                else
                {
                    action = await ScanItem(input);
                }
@@ -77,7 +92,61 @@
        }

        /// <summary>
        /// 扫描物料并复核
        /// 获取用于打印的 asn 信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction<ScanOutput>> GetAsnInfoForPrint(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>($"成功获取ASN单[{input.SN}]信息", new ScanOutput());
            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) {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                action.Data.Data = order;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// 提交数据
        /// </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());
            try
            {
                var snlist = input.Options["Snlist"].ToString().JsonToObject<List<string>>();
                List<string> SnList = 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)
        {
@@ -117,7 +186,7 @@
                    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); ;
                    return SetOutPutMqttMsg(action, input.Locale); 
                }
                if (CurSn.First().AUTH_ORG != input.AuthOption.CurOrg)
                {
@@ -155,7 +224,14 @@
                });

                //完成所有处理后使用事务保存数据
                action = DoIfFinish(action, input.Locale);
                action = DoIfFinish(action, input.Locale, () =>
                {
                    if (!OrderList.Contains(CurSn.First().ORDER_NO))
                    {
                        OrderList.Add(CurSn.First().ORDER_NO);
                    }
                    ScanList.AddRange(CurSn);
                });
            }
            catch (Exception ex)
            {
@@ -171,17 +247,16 @@
        /// 完成所有处理后使用事务保存数据
        /// </summary>
        /// <param name="action"></param>
        /// <param name="locale"></param>
        /// <param name="doAfterSave"></param>
        /// <returns></returns>
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale)
        public ApiAction<ScanOutput> DoIfFinish(ApiAction<ScanOutput> action, string locale, Action doAfterSave = null)
        {
            //保存数据库
            SaveCommitListToDB();

            if (!OrderList.Contains(CurSn.First().ORDER_NO))
            {
                OrderList.Add(CurSn.First().ORDER_NO);
            }
            ScanList.AddRange(CurSn);
            //保存数据成功后执行
            doAfterSave?.Invoke();

            // 返回数据
            action.Data.Data = ScanList;
@@ -209,21 +284,6 @@
                    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}]"));
                //}

                //使用统一的事务DB对象
                var db = GetCommitDB();
@@ -261,16 +321,6 @@
            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;

                //使用统一的事务DB对象
                var db = GetCommitDB();
                var dbTran = db.UseTran(() =>