优化了一些已知问题

Rodney Chen

2025-04-10 4d16a7cedbbf2d9d7ebc392ee3774df108b4026e

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

@@ -11,6 +11,7 @@
using Tiger.IBusiness;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.U9C;
using Microsoft.Scripting.Utils;

namespace Tiger.Business.WMS.Transaction
{
@@ -67,7 +68,7 @@
            catch (Exception ex)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描[{input.SN}]异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.Scan.ScanException", input.SN));
            }
@@ -153,12 +154,19 @@
                });

                //完成所有处理后使用事务保存数据
                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)
            {
                //取消当前操作
                ResetScan();
                ResetTrans();
                //action.CatchExceptionWithLog(ex, $"扫描条码[{0}]复核异常");
                action.CatchExceptionWithLog(ex, Biz.L("WMS.Default.ScanItem.ScanException", input.SN));
            }
@@ -169,17 +177,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;
@@ -188,7 +195,7 @@
            action.LocaleMsg = Biz.L("WMS.Count_BIZ_U9_ASN.CountSuccess", CurSn.First().SN);

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

@@ -396,12 +403,13 @@
                    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;
                }
@@ -412,7 +420,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 },
@@ -453,7 +461,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(),
@@ -469,11 +477,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()
@@ -498,7 +514,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)
                {
@@ -510,9 +526,9 @@
                    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}]，待检验完成后可入库"));
                    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;
@@ -523,11 +539,12 @@
                    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;
                }

                //使用统一的事务DB对象
                var db = GetCommitDB();
@@ -537,6 +554,7 @@
                    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(finishNotSubmit, 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();
@@ -564,15 +582,24 @@
        #endregion

        /// <summary>
        /// 重置当前操作，有需要则重写此方法
        /// 重置事务数据，有需要则重写此方法
        /// </summary>
        public override void ResetTrans()
        {
            ResetScan();
            CurScanShelf = null;
            base.ResetTrans();
        }

        /// <summary>
        /// 重置本次扫码信息
        /// </summary>
        public override void ResetScan()
        {
            base.ResetScan();
            Command = null;
            Command = "Normal";
            CurInvItem = null;
            CurScanShelf = null;
            CurSn = null;
            base.ResetScan();
        }

        public override bool Close(bool needSaveHistoryLog = false)