设置当前物料的默认储位

Ben Lin

16 小时以前 a960900364d19bbf0ad7923a57989609e7fce798

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

@@ -20,6 +20,7 @@
using Tiger.Model.Minsun;
using static IronPython.Runtime.Profiler;
using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
using Microsoft.Scripting.Utils;

namespace Tiger.Business.WMS.Transaction
{
@@ -32,19 +33,54 @@
        {
            base.Init(id, userCode, apiHost, orgCode);
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
            LoadData();
            return this;
        }

        #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 BIZ_U9_ASN CurOrder = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        List<string> SnList = new();
        private List<BIZ_U9_ASN_SN> ScanList = new();
        private string rcvDocType = "RCV03"; //默认无单
        private string CurReqType = "0"; 
        #endregion

        #region Functions
        /// <summary>
        /// 初始化清点数据
        /// </summary>
        private void LoadData()
        {
            var _Sns = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.ORDER_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(s => SqlFunc.StartsWith(s.UPDATE_USER, $"GenerateASN_{UserCode}")).Select(s => s.ORDER_NO)).ToList();
            CurSn.AddRange(_Sns);
            OrderList = MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.RECEIVER == $"{UserCode}_NoSource" && 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>
          /// <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)).Includes(q => q.Details, d => d._ItemInfos).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.STATUS != BIZ_U9_ASN.STATUSs.Finished.GetValue()).Any();
                }
            }
            return action;
        }

        /// <summary>
        /// 扫描入口
        /// </summary>
@@ -61,24 +97,30 @@
                    return SetOutPutMqttMsg(action, input.Locale);
                }
                //如果是未上门户
                else if (input.Data == "0")
                else if (input.Command == "NotOn")
                {
                    action = await GetAsnInfoForPrint(input);
                }
                //如果是随单赠品或者样品
                else if (input.Data == "1")
                else if (input.Command == "IsGift")
                {

                    action = await GetAsnInfoBySn(input);
                }
                else if (input.Data == "Submit")
                //如果是未上门户提交
                else if (input.Command == "Submit")
                {
                    action = await Submit(input);
                }
                //如果是随单赠品或者样品提交
                else if (input.Command == "GenerateASN")
                {
                    action = await GenerateASN(input);
                }
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
@@ -95,19 +137,206 @@
            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)
                CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == input.SN && q.STATUS < BIZ_U9_ASN.STATUSs.Finished.GetValue()).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (CurOrder == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                action.Data.Data = order;
                action.LocaleMsg = CurOrder.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN单[{input.SN}]状态为[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]，请继续未完成的操作") : action.LocaleMsg;
                action.Data.Data = CurOrder;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// 随单赠品扫SN获取ASN单信息
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        private async Task<ApiAction<ScanOutput>> GetAsnInfoBySn(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                CurReqType = input.Options["reqType"].ToString();
                rcvDocType = "RCV01";
                if (CurReqType != "1")
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"不是随单赠品，不用扫描条码");
                    return action;
                }
                var AsnSn = await MainDB.Queryable<BIZ_U9_ASN_SN>().Where(q => q.SN == input.SN).FirstAsync();
                if (AsnSn == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到条码[{input.SN}]的数据");
                    return action;
                }
                CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (CurOrder == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                var _sns = CurSn.Where(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()).ToList();
                if (CurSn.Count > 0 && _sns.Any())
                {
                    action.LocaleMsg = Biz.L($"批次[{AsnSn.LOTNO}]已经提交，请继续下一步操作");
                    CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == _sns[0].ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                    if (CurOrder == null)
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = Biz.L($"查不到ASN单[{CurOrder.ORDER_NO}]的数据");
                        return action;
                    }
                    CurOrder.Details = CurOrder.Details.Where(q => _sns[0].LINE_NO == q.LINE_NO).ToList();
                    SnList.AddRange(_sns.Select(q => q.SN).ToList());
                    CurOrder.BarcodeList = SnList;
                    action.Data.Data = CurOrder;
                    return action;
                }
                if (CurSn.Any(q=> q.ORDER_NO == AsnSn.ORDER_NO && q.LINE_NO == AsnSn.LINE_NO))
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"扫描的条码的ASN单[{AsnSn.ORDER_NO}]的行号[{AsnSn.LINE_NO}]已经存在，请先完成未完成的操作");
                    return action;
                }
                if (!CurSn.Any(q=>q.SN == AsnSn.SN))
                {
                    CurSn.Add(AsnSn);
                }
                if (!CurOrder.ORDER_NO.StartsWith("WASN"))
                {
                    CurOrder.ORDER_NO = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                    CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Arrived.GetValue();
                }
                CurOrder.Details = CurOrder.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
                action.LocaleMsg = Biz.L($"成功获取ASN单[{AsnSn.ORDER_NO}]的信息");
                action.Data.Data = CurOrder;
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
        /// 赠品/样品提交，需要生成WMS的ASN单
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction<ScanOutput>> GenerateASN(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput());
            try
            {
                var reqType = input.Options["reqType"].ToString();
                //如果类型不一样，则清除CurOrder
                if (CurReqType != reqType) {
                    CurOrder = null;
                    CurReqType = reqType;
                }
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                if (CurReqType == "2")
                {
                    CurOrder = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(s => SqlFunc.StartsWith(s.UPDATE_USER, $"GenerateASN_{UserCode}_Sample")).Select(s => s.ORDER_NO)).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                }
                CurOrder = CurOrder??new() { 
                    ORDER_NO= $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}",
                    SUPP_CODE = dtl.SUPP_CODE,
                    DELIVERY_DATE = DateTime.Now,
                    PLANARRIVED_DATE = DateTime.Now,
                    AUTH_ORG = OrgCode,
                };
                if (MainDB.Queryable<BIZ_U9_ASN_DTL>().Any(q => q.ORDER_NO == CurOrder.ORDER_NO && q.ITEM_CODE == dtl.ITEM_CODE))
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"扫当前生成的单号[{CurOrder.ORDER_NO}]及物料编码[{dtl.ITEM_CODE}]已经存在，请先完成未完成的操作");
                    return action;
                }
                //如果没有供应商名称，则从供应商表中获取
                if (CurOrder.SUPP_NAME.IsNullOrEmpty()) {
                    CurOrder.SUPP_NAME = MainDB.Queryable<BAS_SUPPLIER>().Where(q => q.SUPP_CODE == CurOrder.SUPP_CODE).First()?.SUPP_NAME_CN;
                }
                //if (!CurOrder.ORDER_NO.IsNullOrEmpty() && CurOrder.ORDER_NO.StartsWith("WASN") && CurOrder.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue())
                //{
                //    action.IsSuccessed = false;
                //    action.LocaleMsg = Biz.L($"已经生成ASN单[{CurOrder.ORDER_NO}]，请继续下一步操作");
                //    return action;
                //}

                dtl.UPDATE_USER = CurReqType == "2" ? $"GenerateASN_{UserCode}_Sample": $"GenerateASN_{UserCode}";
                dtl.REMARK = CurReqType == "1"? CurSn.Where(q => q.ORDER_NO == dtl.ORDER_NO && q.LINE_NO == dtl.LINE_NO).FirstOrDefault()?.SN: dtl.REMARK;
                dtl.ORDER_NO = CurOrder.ORDER_NO;
                BIZ_U9_ASN Asn = new()
                {
                    ID = Guid.NewGuid().ToString("N"),
                    ORDER_NO = CurOrder.ORDER_NO,
                    STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue(),
                    SUPP_CODE = CurOrder.SUPP_CODE,
                    SUPP_NAME = CurOrder.SUPP_NAME,
                    DELIVERY_DATE = CurOrder.DELIVERY_DATE,
                    PLANARRIVED_DATE = CurOrder.PLANARRIVED_DATE,
                    ORDER_DATE = DateTime.Now,
                    CREATE_TIME = DateTime.Now,
                    CREATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
                    UPDATE_TIME = DateTime.Now,
                    UPDATE_USER = $"Print_BIZ_U9_ASN_{UserCode}",
                    AUTH_ORG = CurOrder.AUTH_ORG,
                };
                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _dtl = dtl.Clone();
                _dtl.ID = Guid.NewGuid().ToString("N");
                _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
                _dtl.AUTH_ORG = CurOrder.AUTH_ORG;
                _dtl.LINE_NO = _dtl.LINE_NO ?? "0";
                input.Options["record"] = _dtl.ToJson();
                var _Asn = Asn.Clone();
                AddCommitAction("GenerateASN", () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    var x = db.Storageable(_Asn).WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW }).ToStorage();
                    x.AsInsertable.ExecuteCommand();
                    x.AsUpdateable
                        .IgnoreColumns(x => x.ID)
                        .UpdateColumns(q => new { q.ORDER_NO, q.AUTH_ORG, q.DELIVERY_DATE, q.STATUS, q.SUPP_CODE, q.SUPP_NAME, q.PLANARRIVED_DATE, q.ORDER_DATE, q.UPDATE_TIME, q.UPDATE_USER })
                        .ExecuteCommand();

                    var y = db.Storageable(_dtl).WhereColumns(t => new { t.ORDER_NO, t.LINE_NO, 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.STATUS, q.SUPP_CODE, q.SUPP_LOTNO, q.QTY_PACKING, q.QTY_GIFT, q.IS_GIFT, q.UPDATE_TIME, q.UPDATE_USER })
                        .ExecuteCommand();
                    if (reqType == "2")
                    {
                        db.Updateable<BIZ_U9_ASN_DTL>()
                            .SetColumns( it => it.LINE_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(q=>q.ORDER_NO == _dtl.ORDER_NO).Select(q => (SqlFunc.AggregateMax(SqlFunc.ToInt32(q.LINE_NO)) + 10).ToString()))
                            .Where(q=>q.ORDER_NO == _dtl.ORDER_NO && q.LINE_NO == _dtl.LINE_NO)
                            .ExecuteCommand();
                    }
                });
                action = await Submit(input);
            }
            catch (Exception ex)
            {
                //取消当前操作
                ResetTrans();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
@@ -126,12 +355,14 @@
                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}]行数据，并完成清点，请点击打印按钮打印标签");
                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)
                var asnSn = 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())).ToList();
                if (asnSn.Count>0 && asnSn.Sum(q => q.QTY) == dtl.QTY)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"ASN单[{dtl.ORDER_NO}]行[{dtl.LINE_NO}]数据已全部清点完成，如果未打印标签请点击打印按钮打印标签");
                    action.LocaleMsg = dtl.ORDER_NO.IsNullOrEmpty() ? Biz.L($"数据不存在！") : Biz.L($"ASN单[{dtl.ORDER_NO}]行[{dtl.LINE_NO}]数据已全部提交完成，如果未打印标签请点击打印按钮打印标签");
                    SnList.AddRange(asnSn.Select(q=>q.SN));
                    return action;
                }
                List<BIZ_U9_ASN_SN> sns = new();
@@ -139,9 +370,11 @@
                List<WMS_ITEM_HIS> hiss = new();
                List<WMS_ITEM_EXT> itemExts = new();
                List<WMS_ITEM_PKG> pkgs = new();
                SnList.Clear();
                foreach (var sn in snlist)
                {
                    var metaSn = DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
                    var strs = sn.SN.Split('/');
                    var metaSn = reqType == "2" ? $"{DI.Resolve<ICodeRuleCache>()["SampleBarcode"]?.Generate(strs[0],"/", strs[1], "/").Data.ToString() ?? ""}" : DI.Resolve<ICodeRuleCache>()["NoSourceBarcode"]?.Generate($"{sn.SN}").Data.ToString() ?? "";
                    SnList.Add(metaSn);
                    var barcode = new Barcode(metaSn);
                    BIZ_U9_ASN_SN info = new()
@@ -160,10 +393,11 @@
                        QTY = sn.QTY,
                        LOTNO = barcode.LotNo,
                        CARTON_NO = barcode.SN,
                        RECEIVER = UserCode,
                        RECEIVER = $"{UserCode}_NoSource",
                        RECEIVE_DATE = DateTime.Now,
                    };
                    sns.Add(info);

                    var item = new WMS_ITEM()
                    {
                        SN = barcode.SN,
@@ -203,6 +437,12 @@
                    };
                    pkgs.Add(pkg);
                }
                //更新当前清点的条码状态
                foreach (var sn in CurSn)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
                }
                CurOrder.STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue();

                AddCommitAction("CountedAndPrint", () =>
                {
@@ -211,6 +451,14 @@
                    //数据保存逻辑
                    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();
                    if (reqType == "2")
                    {
                        db.Updateable<BIZ_U9_ASN_SN>()
                            .SetColumns(q => q.LINE_NO == SqlFunc.Subqueryable<BIZ_U9_ASN_DTL>().Where(t1 => t1.ID == dtl.ID).Select(t1 => t1.LINE_NO))
                            .Where(q=>sns.Select(s=>s.ID).Contains(q.ID))
                            .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();
@@ -229,7 +477,7 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale);
@@ -243,7 +491,7 @@
        public async Task<ApiAction> GenerateReceipt(BaseInput input)
        {
            var action = new ApiAction();
            var orderNo = input.Data;
            var orderNo = CurOrder.ORDER_NO;
            try
            {
                var reqType = input.Options["reqType"].ToString();
@@ -264,52 +512,58 @@
                    return action;
                }

                //查询是否清点完成
                //查询是否存在清点完成的行明细，如果有则先提交完成的行，如果没有则报错
                var finishNotSubmit = order.Details.Where(q => SqlFunc.IsNullOrEmpty(q.RECEIVER_NO) && 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)).ToList();
                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())
                if (!finishNotSubmit.Any())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("送货单[{0}]未清点完成，请先清点完成，未完成清点的行号如下：{1}");
                    //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")
                if (reqType.ToInt32() > 0)
                {
                    var iInput = new CreateReceivementInput
                    {
                        userId = UserCode,
                        IsLogin = true,
                        Supplier = "",
                        RcvDocType = "",
                        RcvLines = new()
                        CreateReceivementParam = new()
                        {
                            rcvDTO = new()
                            {
                                new(){
                                    ItemInfo = new(){m_itemCode="" },
                                    Wh= new(){ m_code=""},
                                Supplier = new() { m_code = order.SUPP_CODE },
                                RcvDocType = new() { m_code = rcvDocType },
                                RcvLines = finishNotSubmit.Select(q=> new RcvLine
                                {
                                    ItemInfo = new() { m_itemCode = q.ITEM_CODE},
                                    Wh = new() { m_code = "10101" },
                                    RcvLineLocations = new(){
                                        new(){
                                            Location = new(){ m_code="" },
                                            LocationQtyTU = 0,
                                        }
                                    },
                                    ArriveQtyTU = 0,
                                    ArriveQtyPU = 0,
                                    RcvQtyTU= 0,
                                    RcvQtyPU= 0,
                                    EyeballingQtyTU = 0,
                                            new(){
                                                Location = new(){ m_code= q.ItemInfo.DEFAULT_LOCATION},
                                                LocationQtyTU = q.QTY,
                                            }
                                        },
                                    ArriveQtyTU = q.QTY,
                                    ArriveQtyPU = q.QTY,
                                    RcvQtyTU = 0,
                                    RcvQtyPU = 0,
                                    EyeballingQtyTU = q.QTY,
                                    RcvProcedure = 0,
                                    StorageType = 0,
                                    RcvLotCode = "",
                                    InvLotCode  = "",
                                },
                                    RcvLotCode = q.SUPP_LOTNO,
                                    InvLotCode =  q.LOTNO,
                                }).ToList(),
                            }
                        },
                    };
                    result = await DI.Resolve<IWMS_U9C>().CreateReceivement(iInput);
                    if (!result.IsSuccessed)
                    {
                        throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
                        action.IsSuccessed = false;
                        action.LocaleMsg = result.LocaleMsg;
                        return action;
                    }
                }
                //如果是未上门户
@@ -321,7 +575,7 @@
                        IsLogin = true,
                        CreateRcvBySrcASNParam = new()
                        {
                            aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO
                            aSNToRcvTransDTOs = finishNotSubmit.Select(q => new ASNToRcvTransDTO
                            {
                                ASNLineKey = q.ID,
                                TransQty = new() { m_amount1 = q.QTY },
@@ -332,7 +586,9 @@
                    result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
                    if (!result.IsSuccessed)
                    {
                        throw new Exception(Biz.T(result.LocaleMsg, input.Locale));
                        action.IsSuccessed = false;
                        action.LocaleMsg = result.LocaleMsg;
                        return action;
                    }
                }

@@ -361,7 +617,7 @@

                    foreach (var item in list)
                    {
                        var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        var asnDtl = finishNotSubmit.First(q => q.ID == item.SrcASNDocLineId.ToString());
                        BIZ_U9_RECEIPT_DTL receiptDt = new()
                        {
                            ID = item.RcvLineId.ToString(),
@@ -377,11 +633,19 @@
                            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);
                        asnDtl.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                        asnDtl.RECEIVER_ID = item.RcvId.ToString();
                        asnDtl.RECEIVER_NO = item.DocNo;
                        asnDtl.RECEIVER_LINE = item.DocLineNo.ToString();
                        asnDtl.RECEIVER = UserCode;
                        asnDtl.RECEIVE_DATE = DateTime.Now;
                    }

                    foreach (var sn in order.SnList)
                    foreach (var sn in order.SnList.Where(q => finishNotSubmit.Any(s => s.LINE_NO == q.LINE_NO)))
                    {
                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
                        BIZ_U9_RECEIPT_SN receiptSn = new()
@@ -406,7 +670,7 @@
                }

                //更新库存表信息
                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 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 && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
                var historys = new List<WMS_ITEM_HIS>();
                foreach (var item in items)
                {
@@ -420,7 +684,7 @@
                    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();
                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 && finishNotSubmit.Select(d => d.LINE_NO).Contains(s.LINE_NO)).Any()).ToList();
                foreach (var item in pkgs)
                {
                    item.AUTH_ORG = receipt.AUTH_ORG;
@@ -431,11 +695,15 @@
                    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 (!noFinish.Any())
                {
                    order.STATUS = BIZ_U9_ASN.STATUSs.Finished.GetValue();
                    order.RECEIVER = UserCode;
                    order.RECEIVE_DATE = DateTime.Now;
                    order.UPDATE_USER = UserCode;
                    order.REMARK = "";
                }

                //使用统一的事务DB对象
                var db = GetCommitDB();
@@ -444,7 +712,8 @@
                    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.Updateable(order, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE }).ExecuteCommand();
                    db.Updateable(finishNotSubmit, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.RECEIVER, q.RECEIVE_DATE, q.RECEIVER_ID, q.RECEIVER_NO, q.RECEIVER_LINE }).ExecuteCommand();
                    db.Insertable(receipt, UserCode).ExecuteCommand();
                    db.Insertable(receipt.Details, UserCode).ExecuteCommand();
                    db.Insertable(receipt.SnList, UserCode).ExecuteCommand();
@@ -453,6 +722,7 @@
                {
                    //action.LocaleMsg = Biz.L($"送货单[{0}]生成收货单[{1}]成功");
                    action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceipt.Success", order.ORDER_NO, receipt.ORDER_NO);
                    CurSn.Clear();
                }
                else
                {
@@ -484,28 +754,29 @@
            doAfterSave?.Invoke();

            // 返回数据
            action.Data.Data = SnList;
            action.Data.Data = new { OrderNo = CurOrder.ORDER_NO, Sns = SnList };

            //action.LocaleMsg = Biz.L($"条码[{0}]清点成功！");
            action.LocaleMsg = Biz.L("WMS.Count_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;
            CurSn = null;
            //CurSn = null;
            SnList = new();
        }

        public override bool Close(bool needSaveHistoryLog = false)