增加收货单上架事务

Rodney Chen

2025-03-11 2192dd5a99d182f301451be72a64428246968d01

增加收货单上架事务

 Tiger.Api/Language.db

Binary files differ

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

ÎļþÃû´Ó Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_ASN.cs ÐÞ¸Ä
@@ -11,17 +11,16 @@
using Tiger.IBusiness;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
//using Microsoft.IdentityModel.Tokens;
using Tiger.Model.MES.Yada;
using static IronPython.Modules._ast;

namespace Tiger.Business.WMS.Transaction
{
    /// <summary>
    /// é€è´§å•(U9)上架事务
    /// æ”¶è´§å•(U9)上架事务
    /// </summary>
    public class In_BIZ_U9_ASN : WmsTask, IIn_BIZ_U9_ASN
    public class In_BIZ_U9_RECEIPT : WmsTask, IIn_BIZ_U9_RECEIPT
    {
        public IIn_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
        public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode)
        {
            base.Init(id, apiHost, userCode, orgCode);
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
@@ -91,7 +90,7 @@
                    var inv = result.Data as Inventory;

                    //验证条码是否正确
                    if (new[] { WMS_ITEM.STATUSs.InStore, WMS_ITEM.STATUSs.Loaded, WMS_ITEM.STATUSs.UseUp }.Contains(inv.Status))
                    if (!inv.isNormalStatus || inv.Status != WMS_ITEM.STATUSs.WaitIn)
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("状态[{0}]异常，请重新扫描");
@@ -106,123 +105,32 @@
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
                        return action;
                    }

                    if (inv.Items.Count == 0)
                    {
                        List<WMS_ITEM_HIS> ItemHistorys = new List<WMS_ITEM_HIS>();
                        WMS_ITEM Item;
                        WMS_ITEM_PKG ItemPkgs;

                        Item = new()
                        {
                            SN = inv.Barcode.SN,
                            ITEM_CODE = inv.Barcode.ItemCode,
                            AUTH_ORG = input.AuthOption.CurOrg,
                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
                            QTY = inv.Barcode.Qty.ToDouble(),
                            PROD_DATE = inv.Barcode.DateCode.ToDateTime(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        };

                        WMS_ITEM_HIS his = new(Item, $"标准上架入库");
                        ItemHistorys.Add(his);
                        ItemPkgs = new()
                        {
                            SN = inv.Barcode.SN,
                            AUTH_ORG = input.AuthOption.CurOrg,
                            ITEM_CODE = inv.Barcode.ItemCode,
                            QTY = inv.Barcode.Qty.ToDouble(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        };

                        var noExt = inv.Items.Where(q => !inv.ItemsExt.Any(s => s.SN == q.SN)).ToList();
                        //扩展表不存在时新建
                        foreach (var item in noExt)
                        {
                            inv.ItemsExt.Add(new()
                            {
                                SN = item.SN,
                                META_SN = inv.Barcode.MetaSn,
                                QR_CODE = inv.Barcode.MetaSn
                            });
                        }

                        inv.Items.Add(Item);
                        inv.History.Add(his);
                        inv.Packages.Add(ItemPkgs);
                    }
                    //雅达不从条码上更新数量
                    //else if (inv.Items.Count == 1)
                    //{
                    //    inv.Items.First().QTY = inv.Barcode.Qty.ToDouble();
                    //    inv.Items.First().ERP_WH = CurScanShelf.WarehouseCode;
                    //    inv.Items.First().AUTH_ORG = input.AuthOption.CurOrg;

                    //    inv.Packages.First().QTY = inv.Barcode.Qty.ToDouble();
                    //    inv.Packages.First().ERP_WH = CurScanShelf.WarehouseCode;
                    //    inv.Packages.First().AUTH_ORG = input.AuthOption.CurOrg;
                    //}
                    //如果扫描外箱的不能更新数量
                    else
                    {
                        foreach (var item in inv.Items)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                        foreach (var item in inv.Packages)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                    }
                    CurInvItem = inv;

                    //检查物料数量，如果没有则查询雅达条码主档，把数量返回前端确认
                    if (CurInvItem.Items.Any(q => q.QTY <= 0))
                    {
                        var qtyList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MaterialBarCode>().Where(q => CurInvItem.Items.Select(q => q.SN).Contains(q.Code)).ToList();
                        foreach (var qty in qtyList)
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.Code);
                            item.QTY = qty.WhQty;
                        }
                        action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("请确认条码[{0}]的数量是否正确");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ComfirmQty", input.SN);
                        return action;
                    }
                }

                //更新已确认物料数量
                if (Command == "ComfirmQty")
                var receipt = await Biz.Db.Queryable<BIZ_U9_RECEIPT>().Where(q => q.ORDER_NO == CurInvItem.Items.First().TRANS_NO).IncludesAllFirstLayer().FirstAsync();
                if (receipt.IsNullOrEmpty())
                {
                    var qtyList = (input.Data ?? "").JsonToObject<List<WMS_ITEM>>() ?? new List<WMS_ITEM>();
                    if (!qtyList.Any() || qtyList.Any(q => q.QTY <= 0))
                    {
                        action.IsSuccessed = false;
                        action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
                        action.Data.Command = Command = "ComfirmQty";
                        //action.LocaleMsg = Biz.L("数量不能小于等于零，请重新确认条码[{0}]的数量");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ReComfirmQty", input.SN); 
                        return action;
                    } 
                    else
                    {
                        foreach (var qty in qtyList)
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.SN);
                            item.QTY = qty.QTY;
                            var pkg = CurInvItem.Packages.First(q => q.SN == qty.SN);
                            pkg.QTY = qty.QTY;
                        }
                        CurInvItem.UpdatePkgQty();

                        Command = "Normal";
                    }
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("收货单中找不到条码所属的单据[{0}]信息，请重新扫描收货单的条码或选择正确的功能上架");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptNotExists", CurInvItem.Items.First().TRANS_NO);
                    return action;
                }
                var receiptDtl = receipt.Details.First(q => q.LINE_NO == CurInvItem.Items.First().TRANS_LINE);
                if (receiptDtl.STATUS > BIZ_U9_RECEIPT.STATUSs.Storing.GetValue())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("收货单中行[{0}]状态[{1}]异常，请扫描正确的条码");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptDtlStatusException", receiptDtl.LINE_NO, receiptDtl.STATUS.GetEnumDesc<BIZ_U9_RECEIPT.STATUSs>());
                    return action;
                }
                var receiptSn = receipt.SnList.First(q => q.SN == CurInvItem.SN);
                if (receiptSn.STATUS != WMS_ITEM.STATUSs.WaitIn.GetValue())
                {
                    action.IsSuccessed = false;
                    //action.LocaleMsg = Biz.L("收货单中条码[{0}]状态[{1}]异常，请扫描正确的条码");
                    action.LocaleMsg = Biz.L("WMS.In_BIZ_U9_RECEIPT.ScanItem.ReceiptSnStatusException", receiptSn.SN, receiptSn.STATUS.GetEnumDesc<WMS_ITEM.STATUSs>());
                    return action;
                }

                var nLocation = new WMS_LOCATION();
@@ -282,8 +190,12 @@
                //执行上架数据处理
                foreach (var item in CurInvItem.Items)
                {
                    item.TRANS_CODE = "In_Default";
                    item.TRANS_NO = $"In_Default_{DateTime.Now:yyyyMMdd}";
                    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 = receiptDtl.LINE_NO;
                }
                Result putonResult = PutOn(input.AuthOption, nLocation.LOCATION_CODE);
                if (!putonResult.IsSuccessed)
@@ -294,6 +206,41 @@
                    return action;
                }

                //更新单据信息
                receiptSn.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
                receiptSn.IS_IN = "Y";
                //如果当前行上架完成标记为待审核
                receiptDtl.QTY_IN = receipt.SnList.Where(q => q.LINE_NO == receiptDtl.LINE_NO).Sum(q => q.QTY);
                if (receiptDtl.QTY_IN == receiptDtl.QTY)
                {
                    receiptDtl.STATUS = BIZ_U9_RECEIPT.STATUSs.Review.GetValue();
                }
                else
                {
                    receiptDtl.STATUS = BIZ_U9_RECEIPT.STATUSs.Storing.GetValue();
                }
                var dtlStatus = receipt.Details.Select(q => q.STATUS).Distinct();
                if (dtlStatus.Count() == 1 && dtlStatus.First() == BIZ_U9_RECEIPT.STATUSs.Review.GetValue())
                {
                    receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.Review.GetValue();
                }
                else
                {
                    receipt.STATUS = BIZ_U9_RECEIPT.STATUSs.Storing.GetValue();
                }

                //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
                var _receipt = receipt.Clone();
                AddCommitAction("Receipt", () =>
                {
                    //使用统一的事务DB对象
                    var db = GetCommitDB();
                    //数据保存逻辑
                    db.Storageable(receipt, UserCode).ExecuteCommand();
                    db.Storageable(receiptDtl, UserCode).ExecuteCommand();
                    db.Storageable(receiptSn, UserCode).ExecuteCommand();
                });

                //完成所有处理后使用事务保存数据
                action = DoIfFinish(action, input.Locale);
            }

 Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_RECEIPT.cs

ÎļþÃû´Ó Tiger.IBusiness.WMS/Transaction/IIn_BIZ_U9_ASN.cs ÐÞ¸Ä
@@ -11,9 +11,9 @@
    /// <summary>
    /// é€è´§å•(U9)上架事务
    /// </summary>
    public interface IIn_BIZ_U9_ASN : IWmsTask
    public interface IIn_BIZ_U9_RECEIPT : IWmsTask
    {
        public IIn_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode);
        public IIn_BIZ_U9_RECEIPT Init(string id, string userCode, string apiHost, string orgCode);

        /// <summary>
        /// æ‰«æå…¥å£

 Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs

@@ -78,10 +78,15 @@
        /// </summary>
        [DisplayName("报废数量")]
        public double QTY_SCRAP { get; set; }
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [DisplayName("批次号")]
        /// <summary>
        /// èµ å“æ•°é‡
        /// </summary>
        [DisplayName("赠品数量")]
        public double QTY_GIFT { get; set; }
        /// <summary>
        /// æ‰¹æ¬¡å·
        /// </summary>
        [DisplayName("批次号")]
        public string LOTNO { get; set; }
        /// <summary>
        /// é€è´§å•ID