优化清点逻辑

Rodney Chen

2025-03-18 05fdade2564f0880fcba935aadf12e79a467764b

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

@@ -9,17 +9,8 @@
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.IBusiness;
using Tiger.Model.Sharetronic.Shelf;
using Tiger.Business.WMS.Sharetronic.Shelf;
using Tiger.Model.MES.Yada;
using static IronPython.SQLite.PythonSQLite;
using static Community.CsharpSqlite.Sqlite3;
using Tiger.Model.Entitys.MES.Position;
using MailKit.Search;
using static IronPython.Modules._ast;
using Tiger.Model.Entitys.MES.U9C;
using System.Security.Policy;
using Org.BouncyCastle.Asn1.X509;

namespace Tiger.Business.WMS.Transaction
{
@@ -30,7 +21,7 @@
    {
        public ICount_BIZ_U9_ASN Init(string id, string userCode, string apiHost, string orgCode)
        {
            base.Init(id, apiHost, userCode, orgCode);
            base.Init(id, userCode, apiHost, orgCode);
            //加载已经清点数据
            LoadData();
            Logger.Console.Info($"Start {this.GetType().Name} Transaction[ID: {TransID}]");
@@ -50,8 +41,7 @@
      /// </summary>
      private void LoadData()
        {
            var orders = MainDB.Queryable<BIZ_U9_ASN>().Where(q => ("," + q.RECEIVER + ",").Contains("," + UserCode + ",")).ToList();
            OrderList = orders.Select(q => q.ORDER_NO).ToList();
            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();
        }
        /// <summary>
        /// 扫描入口
@@ -148,7 +138,7 @@
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = Biz.L("物料编码[{0}]不存在或者该物料未启用");
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", inv.ItemInfo.ITEM_CODE.IsNullOrEmpty(inv.Barcode.ItemCode));
                        action.LocaleMsg = Biz.L("WMS.Default.ScanItem.ItemCodeNotExistsOrNotActive", (inv.ItemInfo?.ITEM_CODE).IsNullOrEmpty(inv.Barcode.ItemCode));
                        return action;
                    }

@@ -164,8 +154,7 @@
                            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,
                            PROD_DATE = (inv.Barcode.DateCode?? DateTime.Now.ToString("yyyy-MM-dd")).ToDateTime(),
                            UNIT = inv.Barcode.Unit,
                        };

@@ -175,7 +164,6 @@
                            AUTH_ORG = input.AuthOption.CurOrg,
                            ITEM_CODE = inv.Barcode.ItemCode,
                            QTY = inv.Barcode.Qty.ToDouble(),
                            ERP_WH = CurScanShelf.WarehouseCode,
                            UNIT = inv.Barcode.Unit,
                        };

@@ -210,12 +198,12 @@
                    {
                        foreach (var item in inv.Items)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.ERP_WH = "";
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                        foreach (var item in inv.Packages)
                        {
                            item.ERP_WH = CurScanShelf.WarehouseCode;
                            item.ERP_WH = "";
                            item.AUTH_ORG = input.AuthOption.CurOrg;
                        }
                    }
@@ -229,6 +217,7 @@
                        {
                            var item = CurInvItem.Items.First(q => q.SN == qty.Code);
                            item.QTY = qty.WhQty;
                     item.SUPP_LOTNO = qty.Segment7; //供应商批次号
                        }
                        action.Data.Data = CurInvItem.Items.Select(q => new { q.SN, q.QTY });
                        action.Data.Command = Command = "ComfirmQty";
@@ -366,12 +355,12 @@
            {
               var order = item.TRANS_CODE;
               item.STATUS = WMS_ITEM.STATUSs.Incoming.GetValue();
               item.TRANS_CODE = item.SOURCE_CODE;
               item.TRANS_NO = item.SOURCE_ORDER;
               item.TRANS_LINE = item.SOURCE_LINE;
               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}]"));
            }
            
@@ -414,12 +403,13 @@
            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.TRANS_CODE = item.SOURCE_CODE;
            item.TRANS_NO = item.SOURCE_ORDER;
            item.TRANS_LINE = item.SOURCE_LINE;
            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(() =>
@@ -482,11 +472,11 @@
         return Orders;
      }

      /// <summary>
      ///  设置收货单明细赠品数量
      /// </summary>
      /// <returns></returns>
      public async Task<ApiAction> SetGiftQty(BaseInput input)
        /// <summary>
        ///  生成收货单：调用U9新增收货单接口
        /// </summary>
        /// <returns></returns>
        public async Task<ApiAction> SetGiftQty(BaseInput input)
      {
         var action = new ApiAction();
         try
@@ -523,7 +513,7 @@
         var orderNo = input.Data;
         try
         {
            var order = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
            var order = await MainDB.Queryable<BIZ_U9_ASN>().Where(q => q.ORDER_NO == orderNo).IncludesAllFirstLayer().FirstAsync();
            if (order.IsNullOrEmpty())
            {
               action.IsSuccessed = false;
@@ -559,7 +549,7 @@
                  aSNToRcvTransDTOs = order.Details.Select(q => new ASNToRcvTransDTO { ASNLineKey = q.ID, TransQty = new() { m_amount1 = q.QTY + q.QTY_GIFT } }).ToList(),
               }
            };
            var result = await DI.Resolve<WMS_U9C>().CreateRcvBySrcASN(iInput);
            var result = await DI.Resolve<IWMS_U9C>().CreateRcvBySrcASN(iInput);
            if (!result.IsSuccessed)
            {
               action.IsSuccessed = false;
@@ -569,20 +559,83 @@

            //根据接口返回收货单单号查询单据明细，并创建条码明细
            var receipt = new BIZ_U9_RECEIPT();
            throw new NotImplementedException();
            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).ToList();

            if (list != null && list.Count > 0)
            {
               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;

               foreach (var item in list)
               {
                  var asnDtl = order.Details.First(q => q.ID == item.SrcASNDocLineId.ToString());
                  BIZ_U9_RECEIPT_DTL receiptDt = new()
                  {
                            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.RtnFillQtyTU.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,
                            ERP_CODE = item.ItemCode1,
                  };
                        receipt.Details.Add(receiptDt);
                    }

               foreach (var sn in order.SnList)
               {
                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
                        BIZ_U9_RECEIPT_SN receiptSn = new()
                        {
                            AUTH_ORG = dtl.AUTH_ORG,
                            ORDER_NO = dtl.ORDER_NO,
                            LINE_NO = dtl.LINE_NO,
                            SN = sn.SN,
                            META_SN = sn.META_SN,
                            ITEM_CODE = sn.ITEM_CODE,
                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
                            QTY = sn.QTY,
                            UNIT = sn.UNIT,
                            IS_OK = sn.IS_OK,
                            IS_IN = sn.IS_IN,
                            LOTNO = sn.LOTNO,
                            CARTON_NO = sn.CARTON_NO,
                            PALLET_NO = sn.PALLET_NO,
                        };
                        receipt.SnList.Add(receiptSn);
                    }
            }

            //更新库存表信息
            var items = Biz.Db.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)
            {
               item.STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue();
               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;
               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}]，待检验完成后可入库"));
            }