雅达-优化收货单处理逻辑及参数结构

Ben Lin

2025-04-12 b57fb8b61bd053601035694470ac4e79fbf99bf8

雅达-优化收货单处理逻辑及参数结构

- 修改 `WMS_U9C.cs` 中的日志记录，增加提交的 JSON 数据和错误信息。
- 调整 `WMS_U9C.cs` 中创建收货单的参数结构，直接使用 `input.CreateReceivementParam`。
- 在 `Print_BIZ_U9_ASN.cs` 中增加命令处理和状态判断，确保逻辑清晰。
- 新增 `GetAsnInfoBySn` 方法以处理随单赠品的条码扫描。
- 更新 `U9CParameter.cs` 中的 `CreateReceivementInput` 类，移除不必要的字段，增加 `Mcode` 类以简化表示。

 Tiger.Business.WMS/ERP/WMS_U9C.cs

@@ -85,7 +85,7 @@
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货单-来源ASN单失败:{result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货单-来源ASN单失败，提交Json: {JsonConvert.SerializeObject(param)}，错误信息:{result.Data[0].ErrorMsg}");
                    }
                }
            }
@@ -118,37 +118,27 @@
                        Logger.Interface.Info($"U9C登录token: {input.token}");
                    }
                }
                CreateReceivementParam param = new()
                {
                    rcvDTO = new()
                    {
                        BusinessDate = DateTime.Now,
                        Supplier = new() { m_code = input.Supplier },
                        RcvDocType = new() { m_code = input.RcvDocType },
                        RcvLines= input.RcvLines,
                    },
                    OtherID = "WMS"
                };
                var response = await HttpHelper.PostAsync(CreateReceivementUrl, JsonConvert.SerializeObject(param), new Dictionary<string, string>() { { "token", input.token } });

                var response = await HttpHelper.PostAsync(CreateReceivementUrl, JsonConvert.SerializeObject(input.CreateReceivementParam), new Dictionary<string, string>() { { "token", input.token } });
                var result = JsonConvert.DeserializeObject<U9CResult2>(response.Message);
                if (result != null)
                {
                    if (result.Success && result.Data[0].IsSucess)
                    {
                        action.Data = result.Data;
                        Logger.Interface.Info($"新增收货单-无来源接口提交Json: {JsonConvert.SerializeObject(param)}，返回Json: {response.Message}");
                        Logger.Interface.Info($"新增收货单-无来源接口提交Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}，返回Json: {response.Message}");
                    }
                    else
                    {
                        action.IsSuccessed = false;
                        action.LocaleMsg = new($"{action.Message}; {result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货-单无来源失败:{result.Data[0].ErrorMsg}");
                        Logger.Interface.Info($"新增收货-单无来源失败，提交Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}，错误信息:{result.Data[0].ErrorMsg}");
                    }
                }
            }
            catch (System.Exception ex)
            {
                action.CatchExceptionWithLog(ex, "新增收货单-无来源异常");
                action.CatchExceptionWithLog(ex, $"新增收货单-无来源异常，提交Json: {JsonConvert.SerializeObject(input.CreateReceivementParam)}");
            }
            Logger.Interface.Info($"/* 新增收货单-无来源接口结束 */\r\n"); //固定写法
            return action;

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

@@ -41,7 +41,6 @@
        private BIZ_U9_ASN order = new();
        private List<BIZ_U9_ASN_SN> CurSn = new();
        List<string> SnList = new();
        private List<BIZ_U9_ASN_SN> ScanList = new();
        #endregion

        #region Functions
@@ -61,18 +60,24 @@
                    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)
@@ -95,14 +100,121 @@
            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();
                order = 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 (order == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                action.LocaleMsg = order.STATUS == BIZ_U9_ASN.STATUSs.Counting.GetValue() ? Biz.L($"ASN单[{input.SN}]状态为[{BIZ_U9_ASN.STATUSs.Counting.GetDesc()}]，请继续未完成的操作") : action.LocaleMsg;
                action.Data.Data = order;
            }
            catch (Exception ex)
            {
                //取消当前操作
                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
            {
                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;
                }
                if (CurSn.Count > 0 && CurSn.Any(q => q.LOTNO == AsnSn.LOTNO && q.STATUS <= WMS_ITEM.STATUSs.Counted.GetValue()))
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"已经存在的批次[{AsnSn.LOTNO}]未完成操作，请先完成此批次");
                    return action;
                }
                order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == AsnSn.ORDER_NO).Includes(q => q.Details, d => d._ItemInfos).IncludesAllFirstLayer().FirstAsync();
                if (order == null)
                {
                    action.IsSuccessed = false;
                    action.LocaleMsg = Biz.L($"查不到ASN单[{input.SN}]的数据");
                    return action;
                }
                //如果是第一次扫描，生成单号
                if (CurSn.Count == 0)
                {
                    action.Data.Command = $"WASN{DateTime.Now.ToString("yyyyMMddHHmmss")}";
                }
                CurSn.Add(AsnSn);
                var _order = order.Clone();
                _order.Details = _order.Details.Where(q => CurSn.Any(s => s.LINE_NO == q.LINE_NO)).ToList();
                action.LocaleMsg = Biz.L($"成功获取ASN单[{AsnSn.ORDER_NO}]的信息");
                action.Data.Data = _order;
            }
            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();
                var dtl = input.Options["record"].ToString().JsonToObject<BIZ_U9_ASN_DTL>();
                BIZ_U9_ASN Asn = new()
                {
                    ID = Guid.NewGuid().ToString("N"),
                    ORDER_NO = dtl.ORDER_NO,
                    STATUS = BIZ_U9_ASN.STATUSs.Counting.GetValue(),
                    SUPP_CODE = order.SUPP_CODE,
                    SUPP_NAME = order.SUPP_NAME,
                    DELIVERY_DATE = order.DELIVERY_DATE,
                    PLANARRIVED_DATE = order.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 = order.AUTH_ORG,
                };
                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _dtl = dtl.Clone();
                _dtl.ID = Guid.NewGuid().ToString("N");
                _dtl.IS_GIFT = reqType == "1" ? "Y" : "N";
                _dtl.AUTH_ORG = order.AUTH_ORG;
                input.Options["record"] = _dtl.ToJson();
                var _Asn = Asn.Clone();
                AddCommitAction("GenerateASN", () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Insertable(_Asn, UserCode).ExecuteCommand();
                    var y = db.Storageable(_dtl, UserCode).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();
                });
                action = await Submit(input);
            }
            catch (Exception ex)
            {
@@ -126,12 +238,12 @@
                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)
                {
                    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}]数据已全部提交完成，如果未打印标签请点击打印按钮打印标签");
                    return action;
                }
                List<BIZ_U9_ASN_SN> sns = new();
@@ -139,6 +251,7 @@
                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() ?? "";
@@ -164,6 +277,7 @@
                        RECEIVE_DATE = DateTime.Now,
                    };
                    sns.Add(info);

                    var item = new WMS_ITEM()
                    {
                        SN = barcode.SN,
@@ -202,6 +316,11 @@
                        SUPP_LOTNO = dtl.SUPP_LOTNO,
                    };
                    pkgs.Add(pkg);
                }
                //更新当前清点的条码状态
                foreach (var sn in CurSn)
                {
                    sn.STATUS = WMS_ITEM.STATUSs.Counted.GetValue();
                }

                AddCommitAction("CountedAndPrint", () =>
@@ -264,52 +383,59 @@
                    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 rcvDocType = reqType == "1" ? "RCV01" : "RCV03";
                    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 = rcvDocType == "RCV03" ? $"{DateTime.Now.ToString("yyyyMMdd")}" : "",
                                    InvLotCode = rcvDocType == "RCV03"? $"{DateTime.Now.ToString("yyyyMMdd")}": 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;
                    }
                }
                //如果是未上门户
@@ -318,10 +444,10 @@
                    var iInput = new CreateRcvBySrcASNInput
                    {
                        userId = UserCode,
                        IsLogin = true,
                        IsLogin = false, // 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 +458,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 +489,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(),
@@ -381,9 +509,15 @@
                            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()
@@ -408,7 +542,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)
                {
@@ -422,7 +556,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;
@@ -433,11 +567,13 @@
                    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();
@@ -446,7 +582,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();
@@ -455,6 +592,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
                {
@@ -489,7 +627,7 @@
            action.Data.Data = 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));

            //重置工序
            ResetTrans();
@@ -507,7 +645,8 @@
            Command = null;
            CurInvItem = null;
            CurScanShelf = null;
            CurSn = null;
            //CurSn = null;
            SnList = new();
        }

        public override bool Close(bool needSaveHistoryLog = false)

 Tiger.Model.Net/Entitys/MES/ParameterEntity/U9CParameter.cs

@@ -54,6 +54,11 @@
        public bool IsLogin { get; set; }
    }

    public class Mcode
    {
        public string m_code { get; set; }
    }

    public class IssueUOM : BaseCode { }

    public class POLine : BaseCode
@@ -295,11 +300,9 @@
    public class CreateReceivementInput : U9CBaseInput
    {
        /// <summary>
        /// 供应商
        /// 无来源参数
        /// </summary>
        public string Supplier { get; set; }
        public string RcvDocType { get; set; }
        public List<RcvLine> RcvLines { get; set; }
        public CreateReceivementParam CreateReceivementParam { get; set; }
    }

    public class RcvDTO
@@ -311,11 +314,11 @@
        /// <summary>
        /// 供应商
        /// </summary>
        public Supplier Supplier { get; set; }
        public Mcode Supplier { get; set; }
        /// <summary>
        /// 单据类型：有ASN单传RCV01，没有ASN单赠品传RCV03
        /// </summary>
        public RcvDocType RcvDocType { get; set; }
        public Mcode RcvDocType { get; set; }
        public List<RcvLine> RcvLines { get; set; }
        public bool IsRcvByChangeable { get; set; } = true;
        public bool IsPriceListChangeable { get; set; } = true;
@@ -323,14 +326,7 @@
        public bool IsPaymentTermChangeable { get; set; } = true;
        public bool IsLineApprove { get; set; } = true;
    }
    public class Supplier
    {
        public string m_code { get; set; }
    }
    public class RcvDocType
    {
        public string m_code { get; set; }
    }

    public class RcvLine
    {
        /// <summary>
@@ -382,13 +378,11 @@
    {
        public string m_itemCode { get; set; }
    }
    public class Wh2
    public class Wh2: Mcode
    {
        public string m_code { get; set; }
    }
    public class Location
    public class Location : Mcode
    {
        public string m_code { get; set; }
    }

    public class RcvLineLocation