一些更改

Ben Lin

2025-03-26 e070b26178e324ea7afecccb4c5ff41f96d2dd8d

一些更改

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

@@ -32,14 +32,14 @@
        //private List<WmsOrder<BIZ_U9_ASN>> _OrderList { get; set; } = new();
        private List<string> OrderList = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        private List<BIZ_U9_ASN_SN> ScanList = new();
        #endregion
        private List<BIZ_U9_ASN_SN> ScanList = new();
        #endregion

        #region Functions
        /// <summary>
        /// 初始化清点数据
        /// </summary>
        private void LoadData()
        #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();
        }
@@ -143,13 +143,13 @@

                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _CurSn = CurSn.Clone();
                AddCommitAction("Counted", () =>
                AddCommitAction("Counted", () =>
                {
                    //使用统一的事务DB对象
                    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 == _CurSn.First().ORDER_NO).ExecuteCommand();
                    db.Storageable(_CurSn, UserCode).ExecuteCommand();
                });

                //完成所有处理后使用事务保存数据
@@ -162,7 +162,7 @@
                //action.CatchExceptionWithLog(ex, $"扫描条码[{0}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
            return SetOutPutMqttMsg(action, input.Locale); 
            return SetOutPutMqttMsg(action, input.Locale);
        }

        /// <summary>
@@ -175,136 +175,136 @@
            //保存数据库
            SaveCommitListToDB();

            if (!OrderList.Contains(CurSn.First().ORDER_NO))
            {
                OrderList.Add(CurSn.First().ORDER_NO);
            }
            ScanList.AddRange(CurSn);
            if (!OrderList.Contains(CurSn.First().ORDER_NO))
            {
                OrderList.Add(CurSn.First().ORDER_NO);
            }
            ScanList.AddRange(CurSn);

            // 返回数据
            action.Data.Data = ScanList;
            // 返回数据
            action.Data.Data = ScanList;

            //action.LocaleMsg = Biz.L($"条码[{0}]清点成功！");
            action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);
            //action.LocaleMsg = Biz.L($"条码[{0}]清点成功！");
            action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);

            //重置工序
            ResetScan();
            return SetOutPutMqttMsg(action, locale); ;
        }

        /// <summary>
        /// 删除当前所有已清点记录
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> DeleteScannedList()
        {
        /// <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();
                foreach (var sn in ScanList)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
                    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();
                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;
                }
            }
                //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();
                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.Count_BIZ_U9_ASN.DeleteScanListException"));
            }
            return action;
        }
                //return action.CatchExceptionWithLog(ex, Biz.L("删除当前所有已清点记录异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.DeleteScanListException"));
            }
            return action;
        }

        /// <summary>
        /// 删除当前用户的已扫单个记录
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> DeleteScannedSn(BaseInput input)
        {
            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(() =>
                {
                    db.Updateable<BIZ_U9_ASN_SN>(UserCode).SetColumns(q => q.STATUS == WMS_ITEM.STATUSs.Incoming.GetValue())
        /// <summary>
        /// 删除当前用户的已扫单个记录
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> DeleteScannedSn(BaseInput input)
        {
            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(() =>
                {
                    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.Count_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
            }
            return action;
        }
                    //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.Count_BIZ_U9_ASN.DeleteScannedSnException", input.SN));
            }
            return action;
        }

        /// <summary>
        ///  获取本次已清点的物料列表（带分页）
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
        {
        /// <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;
@@ -323,157 +323,158 @@
        {
            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);
                    }
            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;
        }
            }
            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.Count_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
                    return action;
                }
        {
            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.Count_BIZ_U9_ASN.SetGiftQty.DetailIDIsNull");
                    return action;
                }

                //使用统一的事务DB对象
                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)
            {
                //使用统一的事务DB对象
                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.Count_BIZ_U9_ASN.SetGiftQtyException"));
            }
            return action;
        }
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.SetGiftQtyException"));
            }
            return action;
        }

        /// <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 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.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
                    return action;
                }
                //验证条码是否正确
                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;
                }
        /// <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 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.Count_BIZ_U9_ASN.GenerateReceipt.ASNNotExists", orderNo);
                    return action;
                }
                //验证条码是否正确
                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;
                //查询是否清点完成
                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;
                }
                    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 } },
                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(),
                    }
                };
                var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
                if (!result.IsSuccessed)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = result.LocaleMsg;
                    return action;
                }
                    }
                };
                var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
                if (!result.IsSuccessed)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = result.LocaleMsg;
                    return action;
                }

                //根据接口返回收货单单号查询单据明细，并创建条码明细
                var receipt = new BIZ_U9_RECEIPT();
                receipt.Details = new();
                receipt.SnList = new();
                var list = Biz.DataSource["YadaU9C"].Client.Queryable<mes_ReturnedDocInfo>().Where(x => x.RcvId == result.Data[0].ID.ToDouble() && x.DocNo == result.Data[0].Code).ToList();
                //根据接口返回收货单单号查询单据明细，并创建条码明细
                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)
                {
                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;
                    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()
                        {
                    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退补数量
                            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,
                            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)
                    {
                    foreach (var sn in order.SnList)
                    {
                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
                        BIZ_U9_RECEIPT_SN receiptSn = new()
                        {
@@ -494,23 +495,23 @@
                        };
                        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 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)
                {
                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}]，待检验完成后可入库"));
                }
                    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)
                {
@@ -530,42 +531,42 @@

                //使用统一的事务DB对象
                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();
                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 (System.Exception ex)
            {
                //return action.CatchExceptionWithLog(ex, Biz.L("送货单[{0}]生成收货单异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
            }
            return action;
        }
                    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 (System.Exception ex)
            {
                //return action.CatchExceptionWithLog(ex, Biz.L("送货单[{0}]生成收货单异常"));
                return action.CatchExceptionWithLog(ex, Biz.L("WMS.Count_BIZ_U9_ASN.GenerateReceiptException", orderNo));
            }
            return action;
        }

        #endregion
        #endregion

        /// <summary>
        /// 重置当前操作，有需要则重写此方法
        /// </summary>
        public override void ResetScan()
        /// <summary>
        /// 重置当前操作，有需要则重写此方法
        /// </summary>
        public override void ResetScan()
        {
            base.ResetScan();
            Command = null;

 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
@@ -68,6 +70,10 @@
                //如果是随单赠品或者样品
                else if (input.Data == "1")
                {
                    action = await Submit(input);
                }
                else if (input.Data == "Submit")
                {

                }
                else
@@ -92,10 +98,43 @@
        /// <returns></returns>
        public async Task<ApiAction<ScanOutput>> GetAsnInfoForPrint(BaseInput input)
        {
            var action = new ApiAction<ScanOutput>(new ScanOutput() );
            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)
            {
@@ -147,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)
                {