From f9a9a948cd138ad0877c54319857c327c0c0c402 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期五, 28 二月 2025 16:50:50 +0800
Subject: [PATCH] 修改问题

---
 Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 3517 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1,804 insertions(+), 1,713 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 152ebb3..5270e8a 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -28,17 +28,1666 @@
     {
         private static readonly SqlSugarScope Db = DataContext.Db;
 
-        // 鑾峰彇鍗曟嵁鍒楄〃
-        public List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model)
+        #region JC34
+
+        /// <summary>
+        /// 缁戝畾鎵樼洏 璐存爣鐗╂枡
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="userId"></param>
+        /// <exception cref="Exception"></exception>
+        public void BindPalletPasteCode(PdaPalletBindVm model, int userId)
+        {
+            try
+            {
+                #region 鍒ゆ柇
+                //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 8锛氱敓浜ч��鏂欏叆搴�
+                
+
+                if (string.IsNullOrEmpty(model.AsnNo))
+                {
+                    throw new Exception("鍗曟嵁鍙蜂笉鍙负绌�!");
+                }
+                if (model.AsnDetailId == null || model.AsnDetailId == 0)
+                {
+                    throw new Exception("鐗╂枡-鎵规涓嶅彲涓虹┖!");
+                }
+                if (string.IsNullOrEmpty(model.PalletNo))
+                {
+                    throw new Exception("鎵樼洏鍙蜂笉鍙负绌�!");
+                }
+                //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
+                var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
+                if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
+                {
+                    throw new Exception("璇ュ崟鎹凡鍏冲崟!");
+                }
+                if (string.IsNullOrEmpty(model.LotNo))
+                {
+                    throw new Exception("鐗╂枡-鎵规涓嶅彲涓虹┖!");
+                }
+                else
+                {
+                    //浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
+                    int indexOfDash = model.LotNo.IndexOf("-");
+                    if (indexOfDash != -1)
+                    {
+                        model.LotNo = model.LotNo.Substring(indexOfDash + 1);
+                    }
+                    else
+                    {
+                        throw new Exception("鐗╂枡-鎵规涓嶅彲涓虹┖!");
+                    }
+                }
+
+                //鍒ゆ柇绠辩爜淇℃伅
+                if (string.IsNullOrEmpty(model.BoxNo))
+                {
+                    throw new Exception("绠辩爜淇℃伅涓嶅彲涓虹┖!");
+                }
+                //鏄惁杩炵画缁勬墭 0锛氬惁  1锛氭槸
+                if (model.IsContinue == "1")
+                {
+                    if (string.IsNullOrWhiteSpace(model.TailBoxNo))
+                    {
+                        throw new Exception("寮�鍚繛缁粍鎵樻椂锛屽熬绠辩爜淇℃伅涓嶅彲涓虹┖!");
+                    }
+                }
+
+                //鎵樼洏淇℃伅鏄惁瀛樺湪
+                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+                if (pallet == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
+                }
+                //楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
+                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
+                if (detail == null)
+                {
+                    throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
+                }
+                //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
+                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+                if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+                {
+                    throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝涓嶅彲缁勬墭锛岃鏍稿疄锛�");
+                }
+
+                #endregion
+
+                //寮�鍚簨鍔�
+                Db.BeginTran();
+                //褰撳墠鏃堕棿
+                var comTime = DateTime.Now;
+
+                #region 鍖呰 
+
+                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
+                var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo);
+
+                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+
+                if (pack == null)
+                {
+                    throw new Exception("鑾峰彇鐗╂枡鍖呰淇℃伅澶辫触锛岃鏍稿疄!");
+                }
+                if (pack.L5Num.HasValue)
+                {
+                    pNum = (int)pack.L5Num;
+                    bNum = (int)pack.L4Num;
+                }
+                else if (pack.L4Num.HasValue)
+                {
+                    pNum = (int)pack.L4Num;
+                    bNum = (int)pack.L3Num;
+                }
+                else if (pack.L3Num.HasValue)
+                {
+                    pNum = (int)pack.L3Num;
+                    bNum = (int)pack.L2Num;
+                }
+                else if (pack.L2Num.HasValue)
+                {
+                    pNum = (int)pack.L2Num;
+                    bNum = (int)pack.L1Num;
+                }
+                else if (pack.L1Num.HasValue)
+                {
+                    pNum = (int)pack.L1Num;
+                    bNum = (int)pack.L1Num;
+                }
+                if (pNum == 0 || bNum == 0)
+                {
+                    throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+                }
+
+                #endregion
+
+                #region 楠岃瘉鏄惁鍏佽绔嬪簱鍚屾墭鐩樹笉鍚岀墿鏂欏叆搴撴垨鍚屾墭鐩樺悓鐗╂枡涓嶅悓鎵规鍏ュ簱
+                var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
+                if (palletBind != null)
+                {
+                    var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
+                    if (box != null && (box.SkuNo != detail.SkuNo || !detail.LotNo.Contains(box.LotNo)))
+                    {
+                        var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
+                        if (funSetting == null || funSetting.IsEnable == "OFF")
+                        {
+                            throw new Exception($"涓嶅厑璁哥珛搴撳悓鎵樼洏涓嶅悓鐗╂枡鍏ュ簱鎴栧悓鎵樼洏涓嶅悓鎵规鍏ュ簱锛�");
+                        }
+                    }
+                }
+                #endregion
+
+                #region 绠辩爜淇℃伅
+                var msgStr = $"绠卞彿涓簕model.BoxNo}";
+                var boxInfoList = new List<BllBoxInfo>();
+
+                //棣栫
+                var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();
+                if (boxInfo.Count == 0)
+                {
+                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+                }
+                boxInfoList.AddRange(boxInfo);
+                //鏄惁杩炵画缁勬墭
+                if (model.IsContinue == "1")
+                {
+                    //灏剧
+                    var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo).ToList();
+                    if (boxInfo2.Count == 0)
+                    {
+                        throw new Exception("灏剧鐮佷俊鎭笉瀛樺湪!");
+                    }
+                    boxInfoList.AddRange(boxInfo2);
+                    var sql = $"select * from BllBoxInfo where IsDel = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
+                    var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
+                    boxInfoList.AddRange(list);
+                    msgStr += $"灏剧鍙蜂负{model.TailBoxNo}";
+                }
+                //缁戝畾绠辨�绘暟閲�
+                //model.SkuQty = boxInfoList.Sum(s => s.Qty);
+                //鍜岄�夋嫨鐨勬壒娆″悓鎵规鐨勭鐮佷俊鎭�
+                var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo && w.Status == "0").ToList();
+                //鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆$殑绠辩爜淇℃伅锛堟嫾绠辨壒娆★級
+                var notBoxInfoList = boxInfoList.Where(w => w.LotNo != model.LotNo).ToList();
+                #endregion
+
+                if (sameBoxInfoList.Count <= 0)
+                {
+                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+                }
+                else
+                {
+                    #region 鎵樼洏缁戝畾淇℃伅
+                    var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo && m.LotNo == model.LotNo);
+                    var bindId = 0;
+                    if (bind == null)
+                    {
+                        bind = new BllPalletBind
+                        {
+                            ASNNo = model.AsnNo,
+                            ASNDetailNo = (int)model.AsnDetailId,
+                            PalletNo = model.PalletNo,
+                            PalletNo2 = "",
+                            PalletNo3 = "",
+                            Qty = model.SkuQty,//涓嶅寘鍚嫾绠变腑闈炲悓鎵规鏁伴噺
+                            FullQty = pNum,
+                            Status = "2",//鍏ュ簱瀹屾垚
+                            Type = "0",
+                            LotNo = model.LotNo,
+                            LotText = detail.LotText,
+                            SupplierLot = detail.SupplierLot,
+                            //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                            //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                            BitPalletMark = "1",
+                            IsBale = "0",
+                            IsBelt = "0",
+                            CreateUser = userId,
+                            Demo = model.Demo,
+                        };
+                        // 鎻掑叆鎵樼洏缁戝畾琛�
+                        bindId = Db.Insertable(bind).ExecuteReturnIdentity();
+                    }
+                    else
+                    {
+                        bindId = bind.Id;
+                        bind.Qty += model.SkuQty;
+                    }
+                    
+                    #endregion
+
+                    #region 搴撳瓨鏄庣粏鍜岃川妫�淇℃伅
+                    //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
+                    BllQualityInspect quality = new BllQualityInspect();
+                    //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+                    if (notice.Type == "3")
+                    {
+                        quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                    }
+                    else
+                    {
+                        quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                    }
+                    var tags = "0";
+                    if (notice.Type == "3" || notice.Type == "4")
+                    {
+                        tags = "1";
+                    }
+
+                    // 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�  
+                    var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
+                    var sdId1 = 0;
+                    if (sd1 != null)
+                    {
+                        sdId1 = sd1.Id;
+                        // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
+                        sd1.Qty = bind.Qty;
+                        sd1.CompleteTime = comTime;
+                        sd1.UpdateUser = userId;
+                        sd1.UpdateTime = comTime;
+
+                        Db.Updateable(sd1).ExecuteCommand();
+                    }
+                    else
+                    {
+                        // 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
+                        sd1 = new DataStockDetail()
+                        {
+                            LotNo = bind.LotNo,
+                            LotText = bind.LotText,
+                            SupplierLot = bind.SupplierLot,
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            Qty = bind.Qty,
+                            LockQty = 0,
+                            FrozenQty = 0,
+                            InspectQty = 0,
+                            ASNNo = bind.ASNNo,
+                            ASNDetailNo = bind.ASNDetailNo,
+                            WareHouseNo = "",//鎵�灞炰粨搴�
+                            RoadwayNo = "",//鎵�灞炲贩閬�
+                            AreaNo = "",//鎵�灞炲尯鍩�
+                            LocatNo = "",//鍌ㄤ綅鍦板潃
+                            PalletNo = bind.PalletNo,
+                            PalletNo2 = bind.PalletNo2,
+                            PalletNo3 = bind.PalletNo3,
+                            PalletTags = tags,
+                            CompleteTime = comTime,
+                            ProductionTime = bind.ProductionTime,
+                            ExpirationTime = bind.ExpirationTime,
+                            Status = "0",
+                            InspectMark = bind.InspectMark,
+                            InspectStatus = sku.IsInspect,
+                            BitPalletMark = bind.BitPalletMark,
+                            PackagNo = detail.PackagNo,                    //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�       
+                            IsBale = bind.IsBale,
+                            IsBelt = bind.IsBelt,
+
+                            IsDel = "0",
+                            CreateUser = 0,
+                            CreateTime = comTime
+                        };
+
+                        //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭� //0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")
+                        {
+                            sd1.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                            sd1.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                        }
+                        else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+                        {
+                            sd1.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+                            sd1.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
+                        }
+                        if (quality != null)
+                        {
+                            //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
+                            if (quality.IsQualified == "1") //鍚堟牸
+                            {
+                                //澧炲姞鍚堟牸鏁伴噺
+                                quality.PassQty += bind.Qty;
+                                sd1.InspectStatus = "1";
+                            }
+                            else if (quality.IsQualified == "0") //涓嶅悎鏍�
+                            {
+                                //澧炲姞涓嶅悎鏍兼暟閲�
+                                quality.FailQty += bind.Qty;
+                                sd1.InspectStatus = "2";
+                            }
+                            Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+                        }
+                        //娣诲姞搴撳瓨鏄庣粏
+                        sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+                    }
+                    #endregion
+
+                    // 鏇存敼绠辨敮鍏崇郴琛�
+                    decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
+                    var isSample = "0";//鏄惁鍙栨牱
+                    var sampleQty = 0m;//鍙栨牱鏁伴噺
+
+                    //鏍囩缁勬墭
+                    var boxGroup = sameBoxInfoList.GroupBy(m => m.BoxNo).ToList();
+                    foreach (var g in boxGroup)
+                    {
+                        decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
+                        foreach (var box in g)
+                        {
+                            if (box.BindNo != null && box.BindNo != 0)
+                            {
+                                continue;
+                            }
+                            //绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
+                            if (box.SkuNo != detail.SkuNo || box.LotNo != model.LotNo)
+                            {
+                                throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
+                            }
+
+                            box.ASNNo = model.AsnNo;
+                            box.ASNDetailNo = model.AsnDetailId;
+                            box.BindNo = bindId;
+                            box.PalletNo = model.PalletNo;
+                            box.Status = "2";
+                            //box.InspectMark = model.IsSample;  //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                            //box.SamplingQty = 0;    //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                            box.CompleteTime = comTime;
+                            box.UpdateTime = comTime;
+                            box.UpdateUser = userId;
+
+                            //box.Qty = box.Qty;
+                            //box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";
+
+                            factQty += box.Qty;
+                            boxFullQty += box.Qty;
+                            if (box.InspectMark == "1") //鍒ゆ柇鏄惁鍙栨牱
+                            {
+                                isSample = "1";
+                                sampleQty += (decimal)box.SamplingQty;
+                            }
+
+                            #region 搴撳瓨绠辩爜鏄庣粏
+                            var box2 = new DataBoxInfo()
+                            {
+                                StockDetailId = sdId1,
+                                BindNo = bind.Id,
+                                BoxNo = box.BoxNo,
+                                BoxNo2 = box.BoxNo2,
+                                BoxNo3 = box.BoxNo3,
+                                PalletNo = box.PalletNo,
+                                PalletNo2 = box.PalletNo2,
+                                PalletNo3 = box.PalletNo3,
+                                Qty = box.Qty,
+                                FullQty = box.FullQty,
+                                Status = "2",//0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷h揣
+                                LotNo = box.LotNo,
+                                LotText = box.LotText,
+                                SkuNo = box.SkuNo,
+                                SkuName = box.SkuName,
+                                Standard = sku.Standard,
+                                ProductionTime = box.ProductionTime,
+                                SupplierLot = box.SupplierLot,
+                                InspectStatus = sku.IsInspect,
+                                InspectMark = box.InspectMark,
+                                BitBoxMark = box.BitBoxMark,
+                                ExpirationTime = box.ExpirationTime,
+
+                                CreateUser = 0,
+                                CreateTime = comTime
+                            };
+                            //娣诲姞搴撳瓨绠辩爜鏄庣粏
+                            Db.Insertable(box2).ExecuteCommand();
+                            #endregion
+                        }
+                        if (boxFullQty > bNum)
+                        {
+                            throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
+                        }
+                    }
+                    //鏇存敼绠辨敮鍏崇郴琛ㄤ俊鎭�
+                    Db.Updateable(boxInfoList).ExecuteCommand();
+
+                    // 鏇存柊鎵樼洏缁戝畾琛�
+                    bind.Qty += factQty;
+
+                    if (bind.FullQty < bind.Qty)
+                    {
+                        throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
+                    }
+
+                    if (bind.FullQty == bind.Qty)
+                    {
+                        bind.BitPalletMark = "0";
+                        sd1.BitPalletMark = "0";
+                    }
+                    if (bind.Qty > pNum)
+                    {
+                        throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+                    }
+
+                    if (isSample == "1")
+                    {
+                        bind.InspectMark = "1";
+                        bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
+                    }
+                    Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
+
+                    #region 鍏ュ簱鍗曞強鏄庣粏
+                    detail.FactQty += factQty;//宸茬粍鏁伴噺
+                    detail.CompleteQty += factQty;//瀹屾垚鏁伴噺
+                    if (isSample == "1") //鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�兼敼涓哄垽鏂槸鍚﹀彇鏍�
+                    {
+                        detail.IsSampling = "1";
+                    }
+                    detail.Status = "1";//0锛氱瓑寰呮墽琛� 1锛氭鍦ㄦ墽琛� 2锛氭墽琛屽畬鎴�
+                    if (detail.CompleteQty >= detail.Qty)
+                    {
+                        detail.Status = "2";
+                        detail.CompleteTime = comTime;
+                    }
+                    detail.UpdateUser = userId;
+                    detail.UpdateTime = comTime;
+                    //鏇存柊鍏ュ簱鍗曟槑缁�
+                    Db.Updateable(detail).ExecuteCommand();
+
+                    notice.UpdateUser = userId;
+                    notice.UpdateTime = comTime;
+                    if (notice.Status == "0")
+                    {
+                        notice.Status = "1";
+                    }
+                    var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo && m.Status != "2");
+                    if (asnDetailNum == 0)
+                    {
+                        notice.Status = "2";//鎵ц瀹屾垚
+                        notice.CompleteTime = comTime;//瀹屾垚鏃堕棿
+                    }
+                    //鏇存柊鍏ュ簱鍗�
+                    Db.Updateable(notice).ExecuteCommand();
+                    #endregion
+
+                    #region 搴撳瓨鏄庣粏
+                    sd1.Qty = bind.Qty;
+                    //鏇存敼搴撳瓨鏄庣粏鏁伴噺
+                    Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
+                    #endregion
+
+                    #region 搴撳瓨
+                    var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
+                    if (dataStock != null)
+                    {
+                        dataStock.Qty += factQty;
+
+                        if (bind.InspectMark == "1")
+                        {
+                            dataStock.IsSampling = bind.InspectMark;
+                        }
+                        Db.Updateable(dataStock).ExecuteCommand();
+                    }
+                    else
+                    {
+                        var stock = new DataStock()
+                        {
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            LotNo = bind.LotNo,
+                            LotText = bind.LotText,
+                            Qty = bind.Qty,
+                            LockQty = 0,
+                            FrozenQty = 0,
+                            IsSampling = bind.InspectMark,
+                            IsDel = "0",
+                            CreateUser = userId,
+                            CreateTime = comTime
+                        };
+                        //缁存姢搴撳瓨璐т富淇℃伅
+                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                        {
+                            stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                            stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                        }
+                        Db.Insertable(stock).ExecuteCommand();
+                    }
+                    #endregion
+
+                    #region 璐ㄦ璇烽獙
+                    if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
+                    {
+                        var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
+                        if (qualityRequest == null)
+                        {
+                            string qcNo = new Common().GetMaxNo("QC");
+                            qualityRequest = new BllQualityInspectionRequest();
+                            qualityRequest.QcNo = qcNo;
+                            qualityRequest.Status = "0";
+                            qualityRequest.SkuNo = sku.SkuNo;
+                            qualityRequest.SkuName = sku.SkuName;
+                            qualityRequest.LotNo = bind.LotNo;
+                            qualityRequest.SupplierLot = bind.SupplierLot;
+                            qualityRequest.Qty = detail.Qty;
+                            qualityRequest.SamplingQty = 0;
+                            qualityRequest.ASNNo = detail.ASNNo;
+                            qualityRequest.CreateUser = userId;
+                            qualityRequest.CreateTime = comTime;
+                            //娣诲姞璐ㄦ璇烽獙鍗�
+                            Db.Insertable(qualityRequest).ExecuteCommand();
+                        }
+                    }
+                    #endregion
+                }
+                
+                //鎷肩
+                if (notBoxInfoList.Count > 0)
+                {
+                    var gbox = notBoxInfoList.GroupBy(g => g.BoxNo).ToList();
+                    if (gbox.Count > 1)
+                    {
+                        throw new Exception("涓�涓墭鐩樹笂鍙兘鏈�1涓嫾绠�!");
+                    }
+                    gbox = notBoxInfoList.GroupBy(g => g.LotNo).ToList();
+                    if (gbox.Count > 1)
+                    {
+                        throw new Exception("涓�涓鍐呮渶澶氳兘鏈�2涓笉鍚屾壒娆$墿鏂�!");
+                    }
+                    var pinBoxNo = notBoxInfoList[0].BoxNo;//鎷肩绠辩爜
+                    var pinBoxLotNo = notBoxInfoList[0].LotNo;//鎷肩鎵规鍙�
+                    //鎷肩鏁伴噺(鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆$殑绠辩爜鏁伴噺)
+                    decimal pinBoxQty = notBoxInfoList.Sum(s => s.Qty);
+
+                    var dataBoxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == pinBoxNo && w.LotNo == pinBoxLotNo).ToList();
+                    if (dataBoxList.Count > 0)//宸叉湁搴撳瓨
+                    {
+                        //鍘熸墭鐩樼粦瀹氫俊鎭�
+                        var oldPalletBind = Db.Queryable<BllPalletBind>().First(w => w.Id == notBoxInfoList[0].BindNo);
+                        //鍘熷叆搴撳崟鏄庣粏
+                        var oldAsnDetail = Db.Queryable<BllArrivalNoticeDetail>().First(w => w.Id == oldPalletBind.ASNDetailNo);
+                        //鍘熷叆搴撳崟
+                        var oldAsnNotice = Db.Queryable<BllArrivalNotice>().First(w => w.ASNNo == oldAsnDetail.ASNNo);
+                        #region 鎵樼洏缁戝畾淇℃伅
+                        var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == oldAsnDetail.Id && m.PalletNo == model.PalletNo);
+                        var bindId = 0;
+                        if (bind == null)
+                        {
+                            bind = new BllPalletBind
+                            {
+                                ASNNo = oldAsnDetail.ASNNo,
+                                ASNDetailNo = oldAsnDetail.Id,
+                                PalletNo = model.PalletNo,
+                                PalletNo2 = "",
+                                PalletNo3 = "",
+                                Qty = 0,
+                                FullQty = pNum,
+                                Status = "2",//鍏ュ簱瀹屾垚
+                                Type = "0",
+                                LotNo = pinBoxLotNo,
+                                LotText = oldAsnDetail.LotText,
+                                SupplierLot = oldAsnDetail.SupplierLot,
+                                //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                                //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                                BitPalletMark = "1",
+                                IsBale = "0",
+                                IsBelt = "0",
+                                CreateUser = userId,
+                                Demo = model.Demo,
+                            };
+                            // 鎻掑叆鎵樼洏缁戝畾琛�
+                            bindId = Db.Insertable(bind).ExecuteReturnIdentity();
+                        }
+                        else
+                        {
+                            bindId = bind.Id;
+                            bind.Qty += pinBoxQty;
+
+                            Db.Updateable(bind).ExecuteCommand();
+                        }
+                        #endregion
+
+                        // 鎻掑叆搴撳瓨鏄庣粏鏁版嵁
+                        var sd1 = new DataStockDetail()
+                        {
+                            LotNo = pinBoxLotNo,
+                            LotText = notBoxInfoList[0].LotText,
+                            SupplierLot = notBoxInfoList[0].SupplierLot,
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            Qty = pinBoxQty,
+                            LockQty = 0,
+                            FrozenQty = 0,
+                            InspectQty = 0,
+                            ASNNo = oldPalletBind.ASNNo,
+                            ASNDetailNo = oldPalletBind.ASNDetailNo,
+                            WareHouseNo = "",//鎵�灞炰粨搴�
+                            RoadwayNo = "",//鎵�灞炲贩閬�
+                            AreaNo = "",//鎵�灞炲尯鍩�
+                            LocatNo = "",//鍌ㄤ綅鍦板潃
+                            PalletNo = bind.PalletNo,
+                            PalletNo2 = bind.PalletNo2,
+                            PalletNo3 = bind.PalletNo3,
+                            PalletTags = "0",
+                            CompleteTime = comTime,
+                            ProductionTime = oldPalletBind.ProductionTime,
+                            ExpirationTime = oldPalletBind.ExpirationTime,
+                            Status = "0",
+                            InspectMark = oldPalletBind.InspectMark,
+                            InspectStatus = sku.IsInspect,
+                            BitPalletMark = oldPalletBind.BitPalletMark,
+                            PackagNo = oldAsnDetail.PackagNo,
+                            IsBale = oldPalletBind.IsBale,
+                            IsBelt = oldPalletBind.IsBelt,
+
+                            IsDel = "0",
+                            CreateUser = 0,
+                            CreateTime = comTime
+                        };
+                        //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
+                        if (oldAsnNotice.Type == "0" || oldAsnNotice.Type == "2" || oldAsnNotice.Type == "4" || oldAsnNotice.Type == "6" || oldAsnNotice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                        {
+                            sd1.OwnerNo = oldAsnNotice.CustomerNo;//璐т富缂栫爜
+                            sd1.OwnerName = oldAsnNotice.CustomerName;//璐т富鍚嶇О
+                        }
+                        else if (oldAsnNotice.Type == "1" || oldAsnNotice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+                        {
+                            sd1.SupplierNo = oldAsnNotice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+                            sd1.SupplierName = oldAsnNotice.CustomerName;//渚涘簲鍟嗗悕绉�
+                        }
+                        //娣诲姞搴撳瓨鏄庣粏
+                        var sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+                        foreach (var item in dataBoxList)
+                        {
+                            item.StockDetailId = sdId1;//搴撳瓨鏄庣粏id
+                            item.BindNo = bind.Id;//鎵樼洏缁戝畾id
+                        }
+                        //鏇存柊搴撳瓨绠辨敮鏄庣粏琛�
+                        Db.Updateable(dataBoxList).ExecuteCommand();
+
+                        //鎵樼洏瑙g粦淇℃伅
+                        var palletUnbind = Db.Queryable<BllPalletUnbind>().First(w => w.IsDel == "0" && w.UpbindPalletNo == oldPalletBind.PalletNo && w.BoxNo == pinBoxNo);
+                        if (palletUnbind == null)
+                        {
+                            throw new Exception("鎷肩鐨勬墭鐩樿В缁戜俊鎭笉瀛樺湪!");
+                        }
+                        palletUnbind.BindPalletNo = model.PalletNo;//缁戝畾鎵樼洏鍙�
+                        palletUnbind.UpdateTime = comTime;
+                        palletUnbind.UpdateUser = userId;
+                        //鏇存柊鎵樼洏瑙g粦缁戝畾琛ㄤ俊鎭�
+                        Db.Updateable(palletUnbind).ExecuteCommand();
+                    }
+                    else
+                    {
+                        string sql = $@"SELECT detail.* FROM BllArrivalNoticeDetail as detail
+                                        JOIN BllArrivalNotice as notice ON detail.ASNNo=notice.ASNNo
+                                        WHERE notice.IsDel='0'
+                                        AND ( notice.Status=0 or notice.Status=1 )
+                                        AND detail.IsDel='0' 
+                                        AND detail.LotNo='{pinBoxLotNo}' 
+                                        AND detail.SkuNo='{sku.SkuNo}'
+                                        ORDER BY detail.CreateTime ";
+                        //鎵惧埌鎷肩鍐呭叾浠栨壒娆℃墍灞炲叆搴撳崟鏄庣粏
+                        var arrDetail = Db.Ado.SqlQuery<BllArrivalNoticeDetail>(sql).FirstOrDefault();
+                        if (arrDetail == null)
+                        {
+                            throw new Exception("鎷肩鍐呯墿鏂欐墍灞炲叆搴撳崟鏄庣粏涓嶅瓨鍦�!");
+                        }
+                        //鎵惧埌鎷肩鍐呭叾浠栨壒娆℃墍灞炲叆搴撳崟
+                        var arrNotice = Db.Queryable<BllArrivalNotice>().First(w => w.IsDel == "0" && w.ASNNo == arrDetail.ASNNo);
+                        if (arrNotice == null)
+                        {
+                            throw new Exception("鎷肩鍐呯墿鏂欐墍灞炲叆搴撳崟涓嶅瓨鍦�!");
+                        }
+                        #region 鎵樼洏缁戝畾淇℃伅
+                        var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == arrDetail.Id && m.PalletNo == model.PalletNo);
+                        var bindId = 0;
+                        if (bind == null)
+                        {
+                            bind = new BllPalletBind
+                            {
+                                ASNNo = arrDetail.ASNNo,
+                                ASNDetailNo = arrDetail.Id,
+                                PalletNo = model.PalletNo,
+                                PalletNo2 = "",
+                                PalletNo3 = "",
+                                Qty = 0,
+                                FullQty = pNum,
+                                Status = "2",//鍏ュ簱瀹屾垚
+                                Type = "0",
+                                LotNo = pinBoxLotNo,
+                                LotText = arrDetail.LotText,
+                                SupplierLot = arrDetail.SupplierLot,
+                                //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                                //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                                BitPalletMark = "1",
+                                IsBale = "0",
+                                IsBelt = "0",
+                                CreateUser = userId,
+                                Demo = model.Demo,
+                            };
+                            // 鎻掑叆鎵樼洏缁戝畾琛�
+                            bindId = Db.Insertable(bind).ExecuteReturnIdentity();
+                        }
+                        else
+                        {
+                            bindId = bind.Id;
+                        }
+                        #endregion
+
+                        #region 搴撳瓨鏄庣粏鍜岃川妫�淇℃伅
+                        //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
+                        BllQualityInspect quality = new BllQualityInspect();
+                        //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+                        if (arrNotice.Type == "3")
+                        {
+                            quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == arrDetail.ASNNo && a.SkuNo == arrDetail.SkuNo && a.LotNo == arrDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                        }
+                        else
+                        {
+                            quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == arrDetail.SkuNo && a.LotNo == arrDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                        }
+                        var tags = "0";
+                        if (arrNotice.Type == "3" || arrNotice.Type == "4")
+                        {
+                            tags = "1";
+                        }
+
+                        // 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�  
+                        var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == arrDetail.Id && m.PalletNo == model.PalletNo);
+                        var sdId1 = 0;
+                        if (sd1 != null)
+                        {
+                            sdId1 = sd1.Id;
+                            // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
+                            sd1.Qty = bind.Qty;
+                            sd1.CompleteTime = comTime;
+                            sd1.UpdateUser = userId;
+                            sd1.UpdateTime = comTime;
+
+                            Db.Updateable(sd1).ExecuteCommand();
+                        }
+                        else
+                        {
+                            // 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
+                            sd1 = new DataStockDetail()
+                            {
+                                LotNo = pinBoxLotNo,
+                                LotText = notBoxInfoList[0].LotText,
+                                SupplierLot = bind.SupplierLot,
+                                SkuNo = sku.SkuNo,
+                                SkuName = sku.SkuName,
+                                Standard = sku.Standard,
+                                Qty = bind.Qty,
+                                LockQty = 0,
+                                FrozenQty = 0,
+                                InspectQty = 0,
+                                ASNNo = arrDetail.ASNNo,
+                                ASNDetailNo = arrDetail.Id,
+                                WareHouseNo = "",//鎵�灞炰粨搴�
+                                RoadwayNo = "",//鎵�灞炲贩閬�
+                                AreaNo = "",//鎵�灞炲尯鍩�
+                                LocatNo = "",//鍌ㄤ綅鍦板潃
+                                PalletNo = bind.PalletNo,
+                                PalletNo2 = bind.PalletNo2,
+                                PalletNo3 = bind.PalletNo3,
+                                PalletTags = tags,
+                                CompleteTime = comTime,
+                                ProductionTime = bind.ProductionTime,
+                                ExpirationTime = bind.ExpirationTime,
+                                Status = "0",
+                                InspectMark = bind.InspectMark,
+                                InspectStatus = sku.IsInspect,
+                                BitPalletMark = bind.BitPalletMark,
+                                PackagNo = arrDetail.PackagNo,                    //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�       
+                                IsBale = bind.IsBale,
+                                IsBelt = bind.IsBelt,
+
+                                IsDel = "0",
+                                CreateUser = 0,
+                                CreateTime = comTime
+                            };
+
+                            //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
+                            if (arrNotice.Type == "0" || arrNotice.Type == "2" || arrNotice.Type == "4" || arrNotice.Type == "6" || arrNotice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                            {
+                                sd1.OwnerNo = arrNotice.CustomerNo;//璐т富缂栫爜
+                                sd1.OwnerName = arrNotice.CustomerName;//璐т富鍚嶇О
+                            }
+                            else if (arrNotice.Type == "1" || arrNotice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+                            {
+                                sd1.SupplierNo = arrNotice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+                                sd1.SupplierName = arrNotice.CustomerName;//渚涘簲鍟嗗悕绉�
+                            }
+                            if (quality != null)
+                            {
+                                //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
+                                if (quality.IsQualified == "1") //鍚堟牸
+                                {
+                                    //澧炲姞鍚堟牸鏁伴噺
+                                    quality.PassQty += bind.Qty;
+                                    sd1.InspectStatus = "1";
+                                }
+                                else if (quality.IsQualified == "0") //涓嶅悎鏍�
+                                {
+                                    //澧炲姞涓嶅悎鏍兼暟閲�
+                                    quality.FailQty += bind.Qty;
+                                    sd1.InspectStatus = "2";
+                                }
+                                Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+                            }
+                            //娣诲姞搴撳瓨鏄庣粏
+                            sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+                        }
+                        #endregion
+
+                        // 鏇存敼绠辨敮鍏崇郴琛�
+                        decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
+                        var isSample = "0";//鏄惁鍙栨牱
+                        var sampleQty = 0m;//鍙栨牱鏁伴噺
+
+                        //鏍囩缁勬墭
+                        var boxGroup = notBoxInfoList.GroupBy(m => m.BoxNo).ToList();
+                        foreach (var g in boxGroup)
+                        {
+                            decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
+                            foreach (var box in g)
+                            {
+                                if (box.BindNo != null && box.BindNo != 0)
+                                {
+                                    continue;
+                                }
+                                //绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
+                                if (box.SkuNo != arrDetail.SkuNo || box.LotNo != arrDetail.LotNo)
+                                {
+                                    throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
+                                }
+
+                                box.ASNNo = arrDetail.ASNNo;
+                                box.ASNDetailNo = arrDetail.Id;
+                                box.BindNo = bindId;
+                                box.PalletNo = model.PalletNo;
+                                box.Status = "2";
+                                //box.InspectMark = model.IsSample;  //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                                //box.SamplingQty = 0;    //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                                box.CompleteTime = comTime;
+                                box.UpdateTime = comTime;
+                                box.UpdateUser = userId;
+
+                                //box.Qty = box.Qty;
+                                //box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";
+
+                                factQty += box.Qty;
+                                boxFullQty += box.Qty;
+                                if (box.InspectMark == "1") //鍒ゆ柇鏄惁鍙栨牱
+                                {
+                                    isSample = "1";
+                                    sampleQty += (decimal)box.SamplingQty;
+                                }
+
+                                #region 搴撳瓨绠辩爜鏄庣粏
+                                var box2 = new DataBoxInfo()
+                                {
+                                    StockDetailId = sdId1,
+                                    BindNo = bind.Id,
+                                    BoxNo = box.BoxNo,
+                                    BoxNo2 = box.BoxNo2,
+                                    BoxNo3 = box.BoxNo3,
+                                    PalletNo = box.PalletNo,
+                                    PalletNo2 = box.PalletNo2,
+                                    PalletNo3 = box.PalletNo3,
+                                    Qty = box.Qty,
+                                    FullQty = box.FullQty,
+                                    Status = "2",//0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷h揣
+                                    LotNo = box.LotNo,
+                                    LotText = box.LotText,
+                                    SkuNo = box.SkuNo,
+                                    SkuName = box.SkuName,
+                                    Standard = sku.Standard,
+                                    ProductionTime = box.ProductionTime,
+                                    SupplierLot = box.SupplierLot,
+                                    InspectStatus = sku.IsInspect,
+                                    InspectMark = box.InspectMark,
+                                    BitBoxMark = box.BitBoxMark,
+                                    ExpirationTime = box.ExpirationTime,
+
+                                    CreateUser = 0,
+                                    CreateTime = comTime
+                                };
+                                //娣诲姞搴撳瓨绠辩爜鏄庣粏
+                                Db.Insertable(box2).ExecuteCommand();
+                                #endregion
+                            }
+                            if (boxFullQty > bNum)
+                            {
+                                throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
+                            }
+                        }
+                        //鏇存敼绠辨敮鍏崇郴琛ㄤ俊鎭�
+                        Db.Updateable(boxInfoList).ExecuteCommand();
+
+                        // 鏇存柊鎵樼洏缁戝畾琛�
+                        bind.Qty += factQty;
+
+                        if (bind.FullQty < bind.Qty)
+                        {
+                            throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
+                        }
+
+                        if (bind.FullQty == bind.Qty)
+                        {
+                            bind.BitPalletMark = "0";
+                            sd1.BitPalletMark = "0";
+                        }
+                        if (bind.Qty > pNum)
+                        {
+                            throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+                        }
+
+                        if (isSample == "1")
+                        {
+                            bind.InspectMark = "1";
+                            bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
+                        }
+                        Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
+
+                        #region 鍏ュ簱鍗曞強鏄庣粏
+                        arrDetail.FactQty += factQty;//宸茬粍鏁伴噺
+                        arrDetail.CompleteQty += factQty;//瀹屾垚鏁伴噺
+                        if (isSample == "1") //鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�兼敼涓哄垽鏂槸鍚﹀彇鏍�
+                        {
+                            arrDetail.IsSampling = "1";
+                        }
+                        arrDetail.Status = "1";//0锛氱瓑寰呮墽琛� 1锛氭鍦ㄦ墽琛� 2锛氭墽琛屽畬鎴�
+                        if (arrDetail.CompleteQty >= arrDetail.Qty)
+                        {
+                            arrDetail.Status = "2";
+                            arrDetail.CompleteTime = comTime;
+                        }
+                        arrDetail.UpdateUser = userId;
+                        arrDetail.UpdateTime = comTime;
+                        //鏇存柊鍏ュ簱鍗曟槑缁�
+                        Db.Updateable(arrDetail).ExecuteCommand();
+
+                        arrNotice.UpdateUser = userId;
+                        arrNotice.UpdateTime = comTime;
+                        if (arrNotice.Status == "0")
+                        {
+                            arrNotice.Status = "1";
+                        }
+                        var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.ASNNo == arrDetail.ASNNo && m.Status != "2");
+                        if (asnDetailNum == 0)
+                        {
+                            arrNotice.Status = "2";//鎵ц瀹屾垚
+                            arrNotice.CompleteTime = comTime;//瀹屾垚鏃堕棿
+                        }
+                        //鏇存柊鍏ュ簱鍗�
+                        Db.Updateable(arrNotice).ExecuteCommand();
+                        #endregion
+
+                        #region 搴撳瓨鏄庣粏
+                        sd1.Qty = bind.Qty;
+                        //鏇存敼搴撳瓨鏄庣粏鏁伴噺
+                        Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
+                        #endregion
+
+                        #region 搴撳瓨
+                        var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
+                        if (dataStock != null)
+                        {
+                            dataStock.Qty += factQty;
+
+                            if (bind.InspectMark == "1")
+                            {
+                                dataStock.IsSampling = bind.InspectMark;
+                            }
+                            Db.Updateable(dataStock).ExecuteCommand();
+                        }
+                        else
+                        {
+                            var stock = new DataStock()
+                            {
+                                SkuNo = sku.SkuNo,
+                                SkuName = sku.SkuName,
+                                Standard = sku.Standard,
+                                LotNo = bind.LotNo,
+                                LotText = bind.LotText,
+                                Qty = bind.Qty,
+                                LockQty = 0,
+                                FrozenQty = 0,
+                                IsSampling = bind.InspectMark,
+                                IsDel = "0",
+                                CreateUser = userId,
+                                CreateTime = comTime
+                            };
+                            //缁存姢搴撳瓨璐т富淇℃伅
+                            if (arrNotice.Type == "0" || arrNotice.Type == "2" || arrNotice.Type == "4" || arrNotice.Type == "6" || arrNotice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                            {
+                                stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                                stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                            }
+                            Db.Insertable(stock).ExecuteCommand();
+                        }
+                        #endregion
+
+                        #region 璐ㄦ璇烽獙
+                        if ((arrNotice.Type == "1" || arrNotice.Type == "4" || arrNotice.Type == "5") && sku.IsInspect != "1")
+                        {
+                            var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
+                            if (qualityRequest == null)
+                            {
+                                string qcNo = new Common().GetMaxNo("QC");
+                                qualityRequest = new BllQualityInspectionRequest();
+                                qualityRequest.QcNo = qcNo;
+                                qualityRequest.Status = "0";
+                                qualityRequest.SkuNo = sku.SkuNo;
+                                qualityRequest.SkuName = sku.SkuName;
+                                qualityRequest.LotNo = bind.LotNo;
+                                qualityRequest.SupplierLot = bind.SupplierLot;
+                                qualityRequest.Qty = arrDetail.Qty;
+                                qualityRequest.SamplingQty = 0;
+                                qualityRequest.ASNNo = arrDetail.ASNNo;
+                                qualityRequest.CreateUser = userId;
+                                qualityRequest.CreateTime = comTime;
+                                //娣诲姞璐ㄦ璇烽獙鍗�
+                                Db.Insertable(qualityRequest).ExecuteCommand();
+                            }
+                        }
+                        #endregion
+                    }
+                }
+                // 鏇存敼鎵樼洏浣跨敤鐘舵��
+                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
+                //娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
+                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
+                Db.Ado.ExecuteCommand(sqlStr);
+                new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}銆亄msgStr}鐨勭粍鐩樹俊鎭�", userId);
+
+                //鎻愪氦浜嬪姟
+                Db.CommitTran();
+            }
+            catch (Exception e)
+            {
+                //鍥炴粴浜嬪姟
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 缁戝畾鎵樼洏 涓嶈创鏍囩墿鏂�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="userId"></param>
+        /// <exception cref="Exception"></exception>
+        public void BindPalletNoPasteCode(PdaPalletBindVm model, int userId)
+        {
+            try
+            {
+                #region 鍒ゆ柇
+
+                //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 8锛氱敓浜ч��鏂欏叆搴�
+            
+
+                if (string.IsNullOrEmpty(model.AsnNo))
+                {
+                    throw new Exception("鍗曟嵁鍙蜂笉鍙负绌�!");
+                }
+                if (model.AsnDetailId == null || model.AsnDetailId == 0)
+                {
+                    throw new Exception("鐗╂枡涓嶅彲涓虹┖!");
+                }
+                if (string.IsNullOrEmpty(model.PalletNo))
+                {
+                    throw new Exception("鎵樼洏鍙蜂笉鍙负绌�!");
+                }
+                if (model.SkuQty < 0)
+                {
+                    throw new Exception("鐗╂枡鏁伴噺涓嶈兘灏忎簬0!");
+                }
+                //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
+                var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
+                if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
+                {
+                    throw new Exception("璇ュ崟鎹凡鍏冲崟!");
+                }
+
+                if (string.IsNullOrEmpty(model.LotNo))
+                {
+                    throw new Exception("鐗╂枡鎵规涓嶄负绌�!");
+                }
+                else
+                {
+                    //浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
+                    int indexOfDash = model.LotNo.IndexOf("-");
+                    if (indexOfDash != -1)
+                    {
+                        model.LotNo = model.LotNo.Substring(indexOfDash + 1);
+                    }
+                    else
+                    {
+                        throw new Exception("鐗╂枡鎵规涓嶅彲涓虹┖!");
+                    }
+                }
+
+                //鎵樼洏鏄惁瀛樺湪
+                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+                if (pallet == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
+                }
+                // 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
+                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
+                if (detail == null)
+                {
+                    throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
+                }
+                //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
+                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+                if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+                {
+                    throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝璇锋牳瀹烇紒");
+                }
+                if (stockDetail != null && (stockDetail.SkuNo != detail.SkuNo || stockDetail.LotNo != model.LotNo))
+                {
+                    throw new Exception("璇ユ墭鐩樺湪搴撳瓨宸叉湁鍏跺畠鐗╂枡鎵规淇℃伅锛岃鏍稿疄锛�");
+                }
+
+                #endregion
+
+                #region 鍖呰
+
+                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
+                var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo);    // liudl 鐢盨ku鍖呰缂栧彿鍙樻洿涓哄叆搴撳崟鏄庣粏鍖呰缂栧彿
+
+                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
+                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
+
+                if (pack == null)
+                {
+                    throw new Exception("鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
+                }
+                if (pack.L5Num.HasValue)
+                {
+                    pNum = (int)pack.L5Num;
+                    bNum = (int)pack.L4Num;
+                }
+                else if (pack.L4Num.HasValue)
+                {
+                    pNum = (int)pack.L4Num;
+                    bNum = (int)pack.L3Num;
+                }
+                else if (pack.L3Num.HasValue)
+                {
+                    pNum = (int)pack.L3Num;
+                    bNum = (int)pack.L2Num;
+                }
+                else if (pack.L2Num.HasValue)
+                {
+                    pNum = (int)pack.L2Num;
+                    bNum = (int)pack.L1Num;
+                }
+                else if (pack.L1Num.HasValue)
+                {
+                    pNum = (int)pack.L1Num;
+                    bNum = (int)pack.L1Num;
+                }
+                if (pNum == 0 || bNum == 0)
+                {
+                    throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+                }
+
+                #endregion
+
+                #region 楠岃瘉鏄惁鍏佽绔嬪簱鍚屾墭鐩樹笉鍚岀墿鏂欏叆搴撴垨鍚屾墭鐩樺悓鐗╂枡涓嶅悓鎵规鍏ュ簱
+                //var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
+                //if (palletBind != null)
+                //{
+                //    var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
+                //    if (box != null && (box.SkuNo != detail.SkuNo || !detail.LotNo.Contains(box.LotNo)))
+                //    {
+                //        var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
+                //        if (funSetting == null || funSetting.IsEnable == "OFF")
+                //        {
+                //            throw new Exception($"涓嶅厑璁哥珛搴撳悓鎵樼洏涓嶅悓鐗╂枡鍏ュ簱鎴栧悓鎵樼洏涓嶅悓鎵规鍏ュ簱锛�");
+                //        }
+                //    }
+                //}
+                #endregion
+
+                var comTime = DateTime.Now;
+
+                #region 缁勬墭淇℃伅
+
+                var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
+                var bindId = 0;
+                if (bind == null)
+                {
+                    DateTime? pTime = null;//鐢熶骇鏃ユ湡
+                    DateTime? eTime = null;//澶辨晥鏃ユ湡
+                    if (!string.IsNullOrWhiteSpace(detail.Lot1))
+                    {
+                        pTime = DateTime.Parse(detail.Lot1);
+                    }
+                    if (!string.IsNullOrWhiteSpace(detail.Lot2))
+                    {
+                        eTime = DateTime.Parse(detail.Lot2);
+                    }
+
+
+                    bind = new BllPalletBind
+                    {
+                        ASNNo = model.AsnNo,
+                        ASNDetailNo = (int)model.AsnDetailId,
+                        PalletNo = model.PalletNo,
+
+                        Qty = model.SkuQty,
+                        FullQty = pNum,
+                        Status = "2",//鍏ュ簱瀹屾垚
+                        Type = "0",
+                        LotNo = model.LotNo,
+                        LotText = detail.LotText,
+                        SupplierLot = detail.SupplierLot,
+                        //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                        //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
+                        ProductionTime = pTime,
+                        ExpirationTime = eTime,
+                        BitPalletMark = "1",
+                        IsBale = "0",
+                        IsBelt = "0",
+                        CreateUser = userId,
+                        Demo = model.Demo,
+
+                    };
+                    // 鎻掑叆鎵樼洏缁戝畾琛�
+                    bindId = Db.Insertable(bind).ExecuteReturnIdentity();
+                }
+                else
+                {
+                    bindId = bind.Id;
+                    bind.Qty += model.SkuQty;
+                }
+                if (bind.Qty < 0)
+                {
+                    throw new Exception("缁勬墭鏁伴噺涓嶈兘灏忎簬0");
+                }
+
+                #endregion
+
+                #region 搴撳瓨鏄庣粏
+                //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
+                BllQualityInspect quality = new BllQualityInspect();
+                //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+                if (notice.Type == "3")
+                {
+                    quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                }
+                else
+                {
+                    quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                }
+                var tags = "0";
+                if (notice.Type == "3" || notice.Type == "4")
+                {
+                    tags = "1";
+                }
+
+                // 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�  
+                var sd1 = Db.Queryable<DataStockDetail>()
+                    .First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo && m.LotNo == bind.LotNo);
+                var sdId1 = 0;
+                if (sd1 != null)
+                {
+                    sdId1 = sd1.Id;
+                    // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
+                    sd1.Qty = bind.Qty;
+                    sd1.CompleteTime = comTime;
+                    sd1.UpdateUser = userId;
+                    sd1.UpdateTime = comTime;
+
+                    Db.Updateable(sd1).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+                }
+                else
+                {
+                    string inspectStatusStr = "0";
+                    if (sku.IsInspect == "1")
+                    {
+                        inspectStatusStr = "1";
+                    }
+
+                    // 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
+                    sd1 = new DataStockDetail()
+                    {
+                        LotNo = bind.LotNo,
+                        LotText = bind.LotText,
+                        SupplierLot = bind.SupplierLot,
+                        SkuNo = sku.SkuNo,
+                        SkuName = sku.SkuName,
+                        Standard = sku.Standard,
+                        Qty = bind.Qty,
+                        LockQty = 0,
+                        FrozenQty = 0,
+                        InspectQty = 0,
+                        ASNNo = bind.ASNNo,
+                        ASNDetailNo = bind.ASNDetailNo,
+                        WareHouseNo = "",//鎵�灞炰粨搴�
+                        RoadwayNo = "",//鎵�灞炲贩閬�
+                        AreaNo = "",//鎵�灞炲尯鍩�
+                        LocatNo = "",//鍌ㄤ綅鍦板潃
+                        PalletNo = bind.PalletNo,
+                        PalletNo2 = bind.PalletNo2,
+                        PalletNo3 = bind.PalletNo3,
+                        PalletTags = tags,
+                        CompleteTime = comTime,
+                        ProductionTime = bind.ProductionTime,
+                        ExpirationTime = bind.ExpirationTime,
+                        Status = "0",
+                        InspectMark = bind.InspectMark,
+                        InspectStatus = inspectStatusStr,
+                        BitPalletMark = bind.BitPalletMark,
+                        PackagNo = detail.PackagNo,                    //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�       
+                        IsBale = bind.IsBale,
+                        IsBelt = bind.IsBelt,
+
+                        IsDel = "0",
+                        CreateUser = 0,
+                        CreateTime = comTime
+                    };
+
+                    //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭� //0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                    if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")
+                    {
+                        sd1.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                        sd1.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                    }
+                    else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+                    {
+                        sd1.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+                        sd1.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
+                    }
+                    if (quality != null)
+                    {
+                        //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
+                        if (quality.IsQualified == "1") //鍚堟牸
+                        {
+                            //澧炲姞鍚堟牸鏁伴噺
+                            quality.PassQty += bind.Qty;
+                            sd1.InspectStatus = "1";
+                        }
+                        else if (quality.IsQualified == "0") //涓嶅悎鏍�
+                        {
+                            //澧炲姞涓嶅悎鏍兼暟閲�
+                            quality.FailQty += bind.Qty;
+                            sd1.InspectStatus = "2";
+                        }
+                        Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+                    }
+                    //娣诲姞搴撳瓨鏄庣粏
+                    sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+                }
+                #endregion
+
+
+
+                #region 鏇存敼缁勬墭淇℃伅
+
+                var isSample = "0";//鏄惁鍙栨牱
+                var sampleQty = 0m;//鍙栨牱鏁伴噺
+
+
+                //if (bind.FullQty < bind.Qty && isTextTable == 0)
+                if (bind.FullQty < bind.Qty)
+                {
+                    throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
+                }
+
+                if (bind.FullQty == bind.Qty)
+                {
+                    bind.BitPalletMark = "0";
+                    sd1.BitPalletMark = "0";
+                }
+                //if (bind.Qty > pNum && isTextTable == 0)
+                if (bind.Qty > pNum)
+                {
+                    throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+                }
+
+                if (isSample == "1")
+                {
+                    bind.InspectMark = "1";
+                    bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
+                }
+                Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
+
+                #endregion
+
+                #region 鍏ュ簱鍗曞強鏄庣粏
+                decimal addQty = model.SkuQty;
+
+                detail.FactQty += addQty;//宸茬粍鏁伴噺
+                detail.CompleteQty += addQty;//瀹屾垚鏁伴噺
+                if (isSample == "1") //鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�兼敼涓哄垽鏂槸鍚﹀彇鏍�
+                {
+                    detail.IsSampling = "1";
+                }
+                detail.Status = "1";//0锛氱瓑寰呮墽琛� 1锛氭鍦ㄦ墽琛� 2锛氭墽琛屽畬鎴�
+                if (detail.CompleteQty >= detail.Qty)
+                {
+                    detail.Status = "2";
+                    detail.CompleteTime = comTime;
+                }
+                detail.UpdateUser = userId;
+                detail.UpdateTime = comTime;
+                //鏇存柊鍏ュ簱鍗曟槑缁�
+                Db.Updateable(detail).ExecuteCommand();
+
+                notice.UpdateUser = userId;
+                notice.UpdateTime = comTime;
+                if (notice.Status == "0")
+                {
+                    notice.Status = "1";
+                }
+                var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
+                                .Count(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo && m.Status != "2");
+                if (asnDetailNum == 0)
+                {
+                    notice.Status = "2";
+                    notice.CompleteTime = comTime;//瀹屾垚鏃堕棿
+                }
+                //鏇存柊鍏ュ簱鍗�
+                Db.Updateable(notice).ExecuteCommand();
+                #endregion
+
+                #region 搴撳瓨鏄庣粏
+                sd1.Qty = bind.Qty;
+                //鏇存敼搴撳瓨鏄庣粏鏁伴噺
+                Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
+                #endregion
+
+                #region 搴撳瓨
+                var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
+                if (dataStock != null)
+                {
+                    dataStock.Qty += model.SkuQty;
+
+
+                    if (bind.InspectMark == "1")
+                    {
+                        dataStock.IsSampling = bind.InspectMark;
+                    }
+                    Db.Updateable(dataStock).ExecuteCommand();
+                }
+                else
+                {
+                    var stock = new DataStock()
+                    {
+                        SkuNo = sku.SkuNo,
+                        SkuName = sku.SkuName,
+                        Standard = sku.Standard,
+                        LotNo = bind.LotNo,
+                        LotText = bind.LotText,
+                        Qty = bind.Qty,
+                        LockQty = 0,
+                        FrozenQty = 0,
+                        IsSampling = bind.InspectMark,
+                        IsDel = "0",
+                        CreateUser = userId,
+                        CreateTime = comTime
+                    };
+                    //缁存姢搴撳瓨璐т富淇℃伅
+                    if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+                    {
+                        stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+                        stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+                    }
+                    Db.Insertable(stock).ExecuteCommand();
+                }
+                #endregion
+
+                #region 璐ㄦ璇烽獙
+                if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
+                {
+                    var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
+                    if (qualityRequest == null)
+                    {
+                        string qcNo = new Common().GetMaxNo("QC");
+                        qualityRequest = new BllQualityInspectionRequest();
+                        qualityRequest.QcNo = qcNo;
+                        qualityRequest.Status = "0";
+                        qualityRequest.SkuNo = sku.SkuNo;
+                        qualityRequest.SkuName = sku.SkuName;
+                        qualityRequest.LotNo = bind.LotNo;
+                        qualityRequest.SupplierLot = bind.SupplierLot;
+                        qualityRequest.Qty = detail.Qty;
+                        qualityRequest.SamplingQty = 0;
+                        qualityRequest.ASNNo = detail.ASNNo;
+                        qualityRequest.CreateUser = userId;
+                        qualityRequest.CreateTime = comTime;
+                        //娣诲姞璐ㄦ璇烽獙鍗�
+                        Db.Insertable(qualityRequest).ExecuteCommand();
+                    }
+                }
+                #endregion
+
+                // 鏇存敼鎵樼洏浣跨敤鐘舵��
+                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
+                //娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
+                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
+                Db.Ado.ExecuteCommand(sqlStr);
+                new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}鐨勭粍鐩樹俊鎭�", userId);
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇闇�瑕佽创鏍囩鐨勫叆搴撳崟 鍗曟嵁鍙烽泦鍚�
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetPasteAsnNoStrList()
+        {
+            try
+            {
+                var item = Expressionable.Create<BllArrivalNoticeDetail>() 
+                .AndIF(true, it => it.IsDel == "0")
+                .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+                var modelList = Db.Queryable<BllArrivalNoticeDetail>().Where(item)
+                    .LeftJoin<BllArrivalNotice>((tb1, tb2) => tb1.ASNNo == tb2.ASNNo && tb2.IsDel == "0" && (tb1.Status == "0" || tb1.Status == "1"))
+                    .LeftJoin<SysMaterials>((tb1, tb2, tb3) => tb1.SkuNo == tb3.SkuNo && tb3.IsDel == "0" && tb3.IsPasteCode == "1")
+                    .Select((tb1, tb2, tb3) => tb1.ASNNo).Distinct().ToList();
+
+                return modelList;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+        /// <summary>
+        /// 鑾峰彇涓嶉渶瑕佽创鏍囩鐨勫叆搴撳崟 鍗曟嵁鍙烽泦鍚�
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetNoPasteAsnNoStrList()
+        {
+            try
+            {
+                var item = Expressionable.Create<BllArrivalNoticeDetail>()
+                .AndIF(true, it => it.IsDel == "0")
+                .ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
+
+                var modelList = Db.Queryable<BllArrivalNoticeDetail>().Where(item)
+                     .LeftJoin<BllArrivalNotice>((tb1, tb2) => tb1.ASNNo == tb2.ASNNo && tb2.IsDel == "0" && (tb2.Status == "0" || tb2.Status == "1"))
+                     .LeftJoin<SysMaterials>((tb1, tb2, tb3) => tb1.SkuNo == tb3.SkuNo && tb3.IsDel == "0" && tb3.IsPasteCode == "0")
+                     .Select((tb1, tb2, tb3) => tb1.ASNNo).Distinct().ToList();
+
+                return modelList;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+        
+        /// <summary>
+        /// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
         {
             string sqlString = string.Empty;
             try
             {
-                // 鏈叧鍗曠殑鍗曟嵁
-                sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4'  and IsDel='0' order by CreateTime;";
-                var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
+                sqlString = $"select * from BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' and isdel='0' order by CreateTime;";
+                var modelList = Db.Ado.SqlQuery<ArrivalNoticeDetailDto>(sqlString);
+                List<ArrivalNoticeDetailDto> noticeList = new List<ArrivalNoticeDetailDto>();
+                foreach (var item in modelList)
+                {
+                    if (string.IsNullOrEmpty(item.LotNo))
+                    {
+                        noticeList.Add(item);
+                    }
+                    else
+                    {
+                        string[] LotNoList = item.LotNo.Split(';');
+                        foreach (var item2 in LotNoList)
+                        {
+                            ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto()
+                            {
+                                Id = item.Id,
+                                ASNNo = item.ASNNo,
+                                CompleteQty = item.CompleteQty,
+                                CompleteTime = item.CompleteTime,
+                                CreateTime = item.CreateTime,
+                                Qty = item.Qty,
+                                FactQty = item.FactQty,
+                                LotNo = item2,
+                                Money = item.Money,
+                                PackagNo = item.PackagNo,
+                                PackagName = item.PackagName,
+                                Status = item.Status,
+                                SkuNo = item.SkuNo,
+                                SkuName = item.SkuName,
+                            };
 
-                return modelList;
+
+                            noticeList.Add(entry);
+                        }
+                    }
+                }
+                List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
+                foreach (var item in noticeList)
+                {
+                    string str = BySkuNoGetPackInfo(item.SkuNo);
+                    if (str == "璐存爣")
+                    {
+                        list.Add(item);
+                    }
+                }
+
+                return list;
             }
             catch (Exception ex)
             {
@@ -46,24 +1695,11 @@
             }
         }
 
-        //鏍规嵁鍏ュ簱鍗曞彿鑾峰彇鍏ュ簱鎬诲崟淇℃伅
-        public List<BllArrivalNotice> GetArrivalNotice(ArrivalNoticeVm model)
-        {
-            string sqlString = string.Empty;
-            try
-            {
-                sqlString = $"select * from BllArrivalNotice where ASNNo = '{model.ASNNo}' and isdel='0'  ";
-                var modelList = Db.Ado.SqlQuery<BllArrivalNotice>(sqlString);
-
-                return modelList;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        // 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
+        /// <summary>
+        /// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         public List<ArrivalNoticeDetailDto> GetArrivalNoticeDetails(ArrivalNoticeVm model)
         {
             string sqlString = string.Empty;
@@ -90,7 +1726,11 @@
             }
         }
 
-        // 鏍规嵁鍗曟嵁鏄庣粏ID鑾峰彇鏄庣粏璇︽儏
+        /// <summary>
+        /// 鏍规嵁鍗曟嵁鏄庣粏ID鑾峰彇鏄庣粏璇︽儏
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         public ArrivalNoticeDetailDto GetArrivalNoticeDetail(ArrivalNoticeDetailVm model)
         {
             string sqlString = string.Empty;
@@ -129,6 +1769,142 @@
                 throw ex;
             }
         }
+
+        /// <summary>
+        /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(model.BoxNo))
+                {
+                    throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
+                }
+                string sqlString = $@"SELECT 
+                                        ASNNo,
+                                        BoxNo, 
+                                        SkuNo,
+                                        SkuName, 
+                                        LotNo,
+                                        BitBoxMark,
+                                        SUM(Qty) as Qty 
+                                      FROM BllBoxInfo 
+                                      WHERE IsDel = '0' 
+                                        AND Status='0'  
+                                        AND BoxNo = '{model.BoxNo}'
+                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
+                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+
+                if (models.Count == 0)
+                {
+                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+                }
+
+                return models;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁绠辩爜鍚戣拷婧郴缁熻姹傛爣绛剧鐮佷俊鎭�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
+        {
+            try
+            {
+                #region 绠辩爜璇锋眰鎺ュ彛锛屾寮忕郴缁熸斁寮�
+                /*var jsonData = JsonConvert.SerializeObject(boxno);
+
+                var response = HttpHelper.DoPost(url, jsonData, "绠辩爜淇℃伅璇锋眰", "FM");
+
+                var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙f瀽杩斿洖鏁版嵁
+                if (obj.Success != 0)
+                {
+                    throw new Exception("璇锋眰澶辫触" + obj.Message);
+                }*/
+                #endregion
+                string sqlString = $@"SELECT 
+                                        ASNNo,
+                                        BoxNo, 
+                                        SkuNo,
+                                        SkuName, 
+                                        LotNo,
+                                        BitBoxMark,
+                                        SUM(Qty) as Qty 
+                                      FROM BllBoxInfo 
+                                      WHERE IsDel = '0' 
+                                        AND Status='0'  
+                                        AND BoxNo = '{boxno}'
+                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
+                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);  // response
+
+                if (models.Count == 0)
+                {
+                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+                }
+
+                return models;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+        #endregion
+
+
+
+
+
+
+
+        // 鑾峰彇鍗曟嵁鍒楄〃
+        public List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model)
+        {
+            string sqlString = string.Empty;
+            try
+            {
+                // 鏈叧鍗曠殑鍗曟嵁
+                sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4'  and IsDel='0' order by CreateTime;";
+                var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
+
+                return modelList;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        //鏍规嵁鍏ュ簱鍗曞彿鑾峰彇鍏ュ簱鎬诲崟淇℃伅
+        public List<BllArrivalNotice> GetArrivalNotice(ArrivalNoticeVm model)
+        {
+            string sqlString = string.Empty;
+            try
+            {
+                sqlString = $"select * from BllArrivalNotice where ASNNo = '{model.ASNNo}' and isdel='0'  ";
+                var modelList = Db.Ado.SqlQuery<BllArrivalNotice>(sqlString);
+
+                return modelList;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+       
+
 
         /// <summary>
         /// 楠岃瘉鎵樼洏鏄惁瀛樺湪
@@ -1884,156 +3660,9 @@
         }
 
         #region 浜у搧缁勬墭
-        /// <summary>
-        /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(model.BoxNo))
-                {
-                    throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
-                }
-                string sqlString = $@"SELECT 
-                                        ASNNo,
-                                        BoxNo, 
-                                        SkuNo,
-                                        SkuName, 
-                                        LotNo,
-                                        BitBoxMark,
-                                        SUM(Qty) as Qty 
-                                      FROM BllBoxInfo 
-                                      WHERE IsDel = '0' 
-                                        AND Status='0'  
-                                        AND BoxNo = '{model.BoxNo}'
-                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
-                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+        
 
-                if (models.Count == 0 )
-                {
-                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
-                }
-
-                return models;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        /// <summary>
-        /// 鏍规嵁绠辩爜鍚戣拷婧郴缁熻姹傛爣绛剧鐮佷俊鎭�
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
-        {
-            try
-            {
-                #region 绠辩爜璇锋眰鎺ュ彛锛屾寮忕郴缁熸斁寮�
-                /*var jsonData = JsonConvert.SerializeObject(boxno);
-
-                var response = HttpHelper.DoPost(url, jsonData, "绠辩爜淇℃伅璇锋眰", "FM");
-
-                var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙f瀽杩斿洖鏁版嵁
-                if (obj.Success != 0)
-                {
-                    throw new Exception("璇锋眰澶辫触" + obj.Message);
-                }*/
-                #endregion
-                string sqlString = $@"SELECT 
-                                        ASNNo,
-                                        BoxNo, 
-                                        SkuNo,
-                                        SkuName, 
-                                        LotNo,
-                                        BitBoxMark,
-                                        SUM(Qty) as Qty 
-                                      FROM BllBoxInfo 
-                                      WHERE IsDel = '0' 
-                                        AND Status='0'  
-                                        AND BoxNo = '{boxno}'
-                                      GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
-                var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);  // response
-
-                if (models.Count == 0)
-                {
-                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
-                }
-
-                return models;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
-        // 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
-        public List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
-        {
-            string sqlString = string.Empty;
-            try
-            {
-                sqlString = $"select * from BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' and isdel='0' order by CreateTime;";
-                var modelList = Db.Ado.SqlQuery<ArrivalNoticeDetailDto>(sqlString);
-                List<ArrivalNoticeDetailDto> noticeList = new List<ArrivalNoticeDetailDto>();
-                foreach (var item in modelList)
-                {
-                    if (string.IsNullOrEmpty(item.LotNo))
-                    {
-                        noticeList.Add(item);
-                    }
-                    else
-                    {
-                        string[] LotNoList = item.LotNo.Split(';');
-                        foreach (var item2 in LotNoList)
-                        {
-                            ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto()
-                            {
-                                Id = item.Id,
-                                ASNNo = item.ASNNo,
-                                CompleteQty = item.CompleteQty,
-                                CompleteTime = item.CompleteTime,
-                                CreateTime = item.CreateTime,
-                                Qty = item.Qty,
-                                FactQty = item.FactQty,
-                                LotNo = item2,
-                                Money = item.Money,
-                                PackagNo = item.PackagNo,
-                                PackagName = item.PackagName,
-                                Status = item.Status,
-                                SkuNo = item.SkuNo,
-                                SkuName = item.SkuName,
-                            };
-
-
-                            noticeList.Add(entry);
-                        }
-                    }
-                }
-                List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
-                foreach (var item in noticeList)
-                {
-                    string str = BySkuNoGetPackInfo(item.SkuNo);
-                    if (str == "璐存爣")
-                    {
-                        list.Add(item);
-                    }
-                }
-
-                return list;
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
-        }
-
+        
         //鏍规嵁鐗╂枡鑾峰彇鏄惁瀛樺湪鍖呰淇℃伅
         public string BySkuNoGetPackInfo(string skuNo)
         {
@@ -3416,1545 +5045,7 @@
             }
         }
 
-        //JC26缁戝畾鎵樼洏 璐存爣鐗╂枡
-        public void BindPalletPasteCode(PdaPalletBindVm model, int userId)
-        {
-            try
-            {
-                #region 鍒ゆ柇
-                //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴�
-                var TypeLot = "5, 6";
-
-                if (string.IsNullOrEmpty(model.AsnNo))
-                {
-                    throw new Exception("鍗曟嵁鍙蜂笉鍙负绌�!");
-                }
-                if (model.AsnDetailId == null || model.AsnDetailId == 0)
-                {
-                    throw new Exception("鐗╂枡涓嶅彲涓虹┖!");
-                }
-                if (string.IsNullOrEmpty(model.PalletNo))
-                {
-                    throw new Exception("鎵樼洏鍙蜂笉鍙负绌�!");
-                }
-                //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
-                var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
-                if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
-                {
-                    throw new Exception("璇ュ崟鎹凡鍏冲崟!");
-                }
-
-                if (string.IsNullOrEmpty(model.LotNo))
-                {
-                    throw new Exception("鐗╂枡涓嶄负绌�!");
-                }
-                else
-                {
-                    //浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
-                    int indexOfDash = model.LotNo.IndexOf("-");
-                    if (indexOfDash != -1)
-                    {
-                        model.LotNo = model.LotNo.Substring(indexOfDash + 1);
-                    }
-                    else
-                    {
-                        throw new Exception("鐗╂枡鎵规涓嶅彲涓虹┖!");
-                    }
-                }
-
-                //鍒ゆ柇绠辩爜淇℃伅
-                if (string.IsNullOrEmpty(model.BoxNo))
-                {
-                    throw new Exception("绠辩爜淇℃伅涓嶅彲涓虹┖!");
-                }
-                //鏄惁杩炵画缁勬墭 0锛氬惁  1锛氭槸
-                if (model.IsContinue == "1")
-                {
-                    if (string.IsNullOrWhiteSpace(model.TailBoxNo))
-                    {
-                        throw new Exception("寮�鍚繛缁粍鎵樻椂锛屽熬绠辩爜淇℃伅涓嶅彲涓虹┖!");
-                    }
-                }
-
-                //鎵樼洏淇℃伅鏄惁瀛樺湪
-                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
-                if (pallet == null)
-                {
-                    throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
-                }
-                //楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
-                var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
-                if (detail == null)
-                {
-                    throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
-                }
-                //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
-                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
-                if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
-                {
-                    throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝璇锋牳瀹烇紒");
-                }
-                /*if (stockDetail != null && stockDetail.SkuNo != detail.SkuNo)
-                {
-                    throw new Exception("璇ユ墭鐩樺湪搴撳瓨宸叉湁鍏跺畠鐗╂枡淇℃伅锛岃鏍稿疄锛�");
-                }*/
-                #endregion
-
-                //寮�鍚簨鍔�
-                Db.BeginTran();
-                //褰撳墠鏃堕棿
-                var comTime = DateTime.Now;
-
-                #region 鍖呰
-                var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
-                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
-                var pack = package.First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo);    // liudl 鐢盨ku鍖呰缂栧彿鍙樻洿涓哄叆搴撳崟鏄庣粏鍖呰缂栧彿
-
-                var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-                var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
-
-                if (pack == null)
-                {
-                    throw new Exception("鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
-                }
-                if (pack.L5Num.HasValue)
-                {
-                    pNum = (int)pack.L5Num;
-                    bNum = (int)pack.L4Num;
-                }
-                else if (pack.L4Num.HasValue)
-                {
-                    pNum = (int)pack.L4Num;
-                    bNum = (int)pack.L3Num;
-                }
-                else if (pack.L3Num.HasValue)
-                {
-                    pNum = (int)pack.L3Num;
-                    bNum = (int)pack.L2Num;
-                }
-                else if (pack.L2Num.HasValue)
-                {
-                    pNum = (int)pack.L2Num;
-                    bNum = (int)pack.L1Num;
-                }
-                else if (pack.L1Num.HasValue)
-                {
-                    pNum = (int)pack.L1Num;
-                    bNum = (int)pack.L1Num;
-                }
-                if (pNum == 0 || bNum == 0)
-                {
-                    throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
-                }
-
-                #endregion
-
-                #region 楠岃瘉鏄惁鍏佽绔嬪簱鍚屾墭鐩樹笉鍚岀墿鏂欏叆搴撴垨鍚屾墭鐩樺悓鐗╂枡涓嶅悓鎵规鍏ュ簱
-                var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
-                if (palletBind != null)
-                {
-                    var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
-                    if (box != null && (box.SkuNo != detail.SkuNo || !detail.LotNo.Contains(box.LotNo)))
-                    {
-                        var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
-                        if (funSetting == null || funSetting.IsEnable == "OFF")
-                        {
-                            throw new Exception($"涓嶅厑璁哥珛搴撳悓鎵樼洏涓嶅悓鐗╂枡鍏ュ簱鎴栧悓鎵樼洏涓嶅悓鎵规鍏ュ簱锛�");
-                        }
-                    }
-                }
-                #endregion
-
-                #region 绠辩爜淇℃伅
-                var msgStr = $"绠卞彿涓簕model.BoxNo}";
-                var boxInfoList = new List<BllBoxInfo>();
-
-                //棣栫
-                var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();
-                if (boxInfo.Count == 0)
-                {
-                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
-                }
-                boxInfoList.AddRange(boxInfo);
-                //鏄惁杩炵画缁勬墭
-                if (model.IsContinue == "1")
-                {
-                    //灏剧
-                    var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo).ToList();
-                    if (boxInfo2.Count == 0)
-                    {
-                        throw new Exception("灏剧鐮佷俊鎭笉瀛樺湪!");
-                    }
-                    boxInfoList.AddRange(boxInfo2);
-                    var sql = $"select * from BllBoxInfo where IsDel = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
-                    var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
-                    boxInfoList.AddRange(list);
-                    msgStr += $"灏剧鍙蜂负{model.TailBoxNo}";
-                }
-                //缁戝畾绠辨�绘暟閲�
-                //model.SkuQty = boxInfoList.Sum(s => s.Qty);
-                //鍜岄�夋嫨鐨勬壒娆″悓鎵规鐨勭鐮佷俊鎭�
-                var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo && w.Status == "0").ToList();
-                //鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆$殑绠辩爜淇℃伅锛堟嫾绠辨壒娆★級
-                var notBoxInfoList = boxInfoList.Where(w => w.LotNo != model.LotNo).ToList();
-                #endregion
-
-                if (sameBoxInfoList.Count <= 0)
-                {
-                    throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
-                }
-                else
-                {
-                    #region 鎵樼洏缁戝畾淇℃伅
-                    var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
-                    var bindId = 0;
-                    if (bind == null)
-                    {
-                        bind = new BllPalletBind
-                        {
-                            ASNNo = model.AsnNo,
-                            ASNDetailNo = (int)model.AsnDetailId,
-                            PalletNo = model.PalletNo,
-                            PalletNo2 = "",
-                            PalletNo3 = "",
-                            Qty = model.SkuQty,//涓嶅寘鍚嫾绠变腑闈炲悓鎵规鏁伴噺
-                            FullQty = pNum,
-                            Status = "2",//鍏ュ簱瀹屾垚
-                            Type = "0",
-                            LotNo = model.LotNo,
-                            LotText = detail.LotText,
-                            SupplierLot = detail.SupplierLot,
-                            //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                            //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                            BitPalletMark = "1",
-                            IsBale = "0",
-                            IsBelt = "0",
-                            CreateUser = userId,
-                            Demo = model.Demo,
-                        };
-                        // 鎻掑叆鎵樼洏缁戝畾琛�
-                        bindId = Db.Insertable(bind).ExecuteReturnIdentity();
-                    }
-                    else
-                    {
-                        bindId = bind.Id;
-                        bind.Qty += model.SkuQty;
-                    }
-                    /*if (bind.Qty < 0)
-                    {
-                        throw new Exception("缁勭洏鏁伴噺涓嶈兘灏忎簬0");
-                    }*/
-                    #endregion
-
-                    #region 搴撳瓨鏄庣粏鍜岃川妫�淇℃伅
-                    //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
-                    BllQualityInspect quality = new BllQualityInspect();
-                    //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
-                    if (notice.Type == "3")
-                    {
-                        quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
-                    }
-                    else
-                    {
-                        quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
-                    }
-                    var tags = "0";
-                    if (notice.Type == "3" || notice.Type == "4")
-                    {
-                        tags = "1";
-                    }
-
-                    // 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�  
-                    var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
-                    var sdId1 = 0;
-                    if (sd1 != null)
-                    {
-                        sdId1 = sd1.Id;
-                        // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
-                        sd1.Qty = bind.Qty;
-                        sd1.CompleteTime = comTime;
-                        sd1.UpdateUser = userId;
-                        sd1.UpdateTime = comTime;
-
-                        Db.Updateable(sd1).ExecuteCommand();
-                    }
-                    else
-                    {
-                        // 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
-                        sd1 = new DataStockDetail()
-                        {
-                            LotNo = bind.LotNo,
-                            LotText = bind.LotText,
-                            SupplierLot = bind.SupplierLot,
-                            SkuNo = sku.SkuNo,
-                            SkuName = sku.SkuName,
-                            Standard = sku.Standard,
-                            Qty = bind.Qty,
-                            LockQty = 0,
-                            FrozenQty = 0,
-                            InspectQty = 0,
-                            ASNNo = bind.ASNNo,
-                            ASNDetailNo = bind.ASNDetailNo,
-                            WareHouseNo = "",//鎵�灞炰粨搴�
-                            RoadwayNo = "",//鎵�灞炲贩閬�
-                            AreaNo = "",//鎵�灞炲尯鍩�
-                            LocatNo = "",//鍌ㄤ綅鍦板潃
-                            PalletNo = bind.PalletNo,
-                            PalletNo2 = bind.PalletNo2,
-                            PalletNo3 = bind.PalletNo3,
-                            PalletTags = tags,
-                            CompleteTime = comTime,
-                            ProductionTime = bind.ProductionTime,
-                            ExpirationTime = bind.ExpirationTime,
-                            Status = "0",
-                            InspectMark = bind.InspectMark,
-                            InspectStatus = sku.IsInspect,
-                            BitPalletMark = bind.BitPalletMark,
-                            PackagNo = detail.PackagNo,                    //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�       
-                            IsBale = bind.IsBale,
-                            IsBelt = bind.IsBelt,
-
-                            IsDel = "0",
-                            CreateUser = 0,
-                            CreateTime = comTime
-                        };
-
-                        //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
-                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                        {
-                            sd1.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
-                            sd1.OwnerName = notice.CustomerName;//璐т富鍚嶇О
-                        }
-                        else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
-                        {
-                            sd1.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
-                            sd1.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
-                        }
-                        if (quality != null)
-                        {
-                            //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
-                            if (quality.IsQualified == "1") //鍚堟牸
-                            {
-                                //澧炲姞鍚堟牸鏁伴噺
-                                quality.PassQty += bind.Qty;
-                                sd1.InspectStatus = "1";
-                            }
-                            else if (quality.IsQualified == "0") //涓嶅悎鏍�
-                            {
-                                //澧炲姞涓嶅悎鏍兼暟閲�
-                                quality.FailQty += bind.Qty;
-                                sd1.InspectStatus = "2";
-                            }
-                            Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
-                        }
-                        //娣诲姞搴撳瓨鏄庣粏
-                        sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
-                    }
-                    #endregion
-
-                    // 鏇存敼绠辨敮鍏崇郴琛�
-                    decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
-                    var isSample = "0";//鏄惁鍙栨牱
-                    var sampleQty = 0m;//鍙栨牱鏁伴噺
-
-                    //鏍囩缁勬墭
-                    var boxGroup = sameBoxInfoList.GroupBy(m => m.BoxNo).ToList();
-                    foreach (var g in boxGroup)
-                    {
-                        decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
-                        foreach (var box in g)
-                        {
-                            if (box.BindNo != null && box.BindNo != 0)
-                            {
-                                continue;
-                            }
-                            //绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
-                            if (box.SkuNo != detail.SkuNo || box.LotNo != model.LotNo)
-                            {
-                                throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
-                            }
-
-                            box.ASNNo = model.AsnNo;
-                            box.ASNDetailNo = model.AsnDetailId;
-                            box.BindNo = bindId;
-                            box.PalletNo = model.PalletNo;
-                            box.Status = "2";
-                            //box.InspectMark = model.IsSample;  //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                            //box.SamplingQty = 0;    //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                            box.CompleteTime = comTime;
-                            box.UpdateTime = comTime;
-                            box.UpdateUser = userId;
-
-                            //box.Qty = box.Qty;
-                            //box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";
-
-                            factQty += box.Qty;
-                            boxFullQty += box.Qty;
-                            if (box.InspectMark == "1") //鍒ゆ柇鏄惁鍙栨牱
-                            {
-                                isSample = "1";
-                                sampleQty += (decimal)box.SamplingQty;
-                            }
-
-                            #region 搴撳瓨绠辩爜鏄庣粏
-                            var box2 = new DataBoxInfo()
-                            {
-                                StockDetailId = sdId1,
-                                BindNo = bind.Id,
-                                BoxNo = box.BoxNo,
-                                BoxNo2 = box.BoxNo2,
-                                BoxNo3 = box.BoxNo3,
-                                PalletNo = box.PalletNo,
-                                PalletNo2 = box.PalletNo2,
-                                PalletNo3 = box.PalletNo3,
-                                Qty = box.Qty,
-                                FullQty = box.FullQty,
-                                Status = "2",//0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷h揣
-                                LotNo = box.LotNo,
-                                LotText = box.LotText,
-                                SkuNo = box.SkuNo,
-                                SkuName = box.SkuName,
-                                Standard = sku.Standard,
-                                ProductionTime = box.ProductionTime,
-                                SupplierLot = box.SupplierLot,
-                                InspectStatus = sku.IsInspect,
-                                InspectMark = box.InspectMark,
-                                BitBoxMark = box.BitBoxMark,
-                                ExpirationTime = box.ExpirationTime,
-
-                                CreateUser = 0,
-                                CreateTime = comTime
-                            };
-                            //娣诲姞搴撳瓨绠辩爜鏄庣粏
-                            Db.Insertable(box2).ExecuteCommand();
-                            #endregion
-                        }
-                        if (boxFullQty > bNum)
-                        {
-                            throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
-                        }
-                    }
-                    //鏇存敼绠辨敮鍏崇郴琛ㄤ俊鎭�
-                    Db.Updateable(boxInfoList).ExecuteCommand();
-
-                    // 鏇存柊鎵樼洏缁戝畾琛�
-                    bind.Qty += factQty;
-
-                    if (bind.FullQty < bind.Qty)
-                    {
-                        throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
-                    }
-
-                    if (bind.FullQty == bind.Qty)
-                    {
-                        bind.BitPalletMark = "0";
-                        sd1.BitPalletMark = "0";
-                    }
-                    if (bind.Qty > pNum)
-                    {
-                        throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
-                    }
-
-                    if (isSample == "1")
-                    {
-                        bind.InspectMark = "1";
-                        bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
-                    }
-                    Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
-
-                    #region 鍏ュ簱鍗曞強鏄庣粏
-                    detail.FactQty += factQty;//宸茬粍鏁伴噺
-                    detail.CompleteQty += factQty;//瀹屾垚鏁伴噺
-                    if (isSample == "1") //鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�兼敼涓哄垽鏂槸鍚﹀彇鏍�
-                    {
-                        detail.IsSampling = "1";
-                    }
-                    detail.Status = "1";//0锛氱瓑寰呮墽琛� 1锛氭鍦ㄦ墽琛� 2锛氭墽琛屽畬鎴�
-                    if (detail.CompleteQty >= detail.Qty)
-                    {
-                        detail.Status = "2";
-                        detail.CompleteTime = comTime;
-                    }
-                    detail.UpdateUser = userId;
-                    detail.UpdateTime = comTime;
-                    //鏇存柊鍏ュ簱鍗曟槑缁�
-                    Db.Updateable(detail).ExecuteCommand();
-
-                    notice.UpdateUser = userId;
-                    notice.UpdateTime = comTime;
-                    if (notice.Status == "0")
-                    {
-                        notice.Status = "1";
-                    }
-                    var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo && m.Status != "2");
-                    if (asnDetailNum == 0)
-                    {
-                        notice.Status = "2";//鎵ц瀹屾垚
-                        notice.CompleteTime = comTime;//瀹屾垚鏃堕棿
-                    }
-                    //鏇存柊鍏ュ簱鍗�
-                    Db.Updateable(notice).ExecuteCommand();
-                    #endregion
-
-                    #region 搴撳瓨鏄庣粏
-                    sd1.Qty = bind.Qty;
-                    //鏇存敼搴撳瓨鏄庣粏鏁伴噺
-                    Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
-                    #endregion
-
-                    #region 搴撳瓨
-                    var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
-                    if (dataStock != null)
-                    {
-                        dataStock.Qty += factQty;
-
-                        if (bind.InspectMark == "1")
-                        {
-                            dataStock.IsSampling = bind.InspectMark;
-                        }
-                        Db.Updateable(dataStock).ExecuteCommand();
-                    }
-                    else
-                    {
-                        var stock = new DataStock()
-                        {
-                            SkuNo = sku.SkuNo,
-                            SkuName = sku.SkuName,
-                            Standard = sku.Standard,
-                            LotNo = bind.LotNo,
-                            LotText = bind.LotText,
-                            Qty = bind.Qty,
-                            LockQty = 0,
-                            FrozenQty = 0,
-                            IsSampling = bind.InspectMark,
-                            IsDel = "0",
-                            CreateUser = userId,
-                            CreateTime = comTime
-                        };
-                        //缁存姢搴撳瓨璐т富淇℃伅
-                        if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                        {
-                            stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
-                            stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
-                        }
-                        Db.Insertable(stock).ExecuteCommand();
-                    }
-                    #endregion
-
-                    #region 璐ㄦ璇烽獙
-                    if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
-                    {
-                        var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
-                        if (qualityRequest == null)
-                        {
-                            string qcNo = new Common().GetMaxNo("QC");
-                            qualityRequest = new BllQualityInspectionRequest();
-                            qualityRequest.QcNo = qcNo;
-                            qualityRequest.Status = "0";
-                            qualityRequest.SkuNo = sku.SkuNo;
-                            qualityRequest.SkuName = sku.SkuName;
-                            qualityRequest.LotNo = bind.LotNo;
-                            qualityRequest.SupplierLot = bind.SupplierLot;
-                            qualityRequest.Qty = detail.Qty;
-                            qualityRequest.SamplingQty = 0;
-                            qualityRequest.ASNNo = detail.ASNNo;
-                            qualityRequest.CreateUser = userId;
-                            qualityRequest.CreateTime = comTime;
-                            //娣诲姞璐ㄦ璇烽獙鍗�
-                            Db.Insertable(qualityRequest).ExecuteCommand();
-                        }
-                    }
-                    #endregion
-                }
-                //鎷肩
-                if (notBoxInfoList.Count > 0)
-                {
-                    var gbox = notBoxInfoList.GroupBy(g => g.BoxNo).ToList();
-                    if (gbox.Count > 1)
-                    {
-                        throw new Exception("涓�涓墭鐩樹笂鍙兘鏈�1涓嫾绠�!");
-                    }
-                    gbox = notBoxInfoList.GroupBy(g => g.LotNo).ToList();
-                    if (gbox.Count > 1)
-                    {
-                        throw new Exception("涓�涓鍐呮渶澶氳兘鏈�2涓笉鍚屾壒娆$墿鏂�!");
-                    }
-                    var pinBoxNo = notBoxInfoList[0].BoxNo;//鎷肩绠辩爜
-                    var pinBoxLotNo = notBoxInfoList[0].LotNo;//鎷肩鎵规鍙�
-                    //鎷肩鏁伴噺(鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆$殑绠辩爜鏁伴噺)
-                    decimal pinBoxQty = notBoxInfoList.Sum(s => s.Qty);
-
-                    var dataBoxList = Db.Queryable<DataBoxInfo>().Where(w => w.IsDel == "0" && w.BoxNo == pinBoxNo && w.LotNo == pinBoxLotNo).ToList();
-                    if (dataBoxList.Count > 0)//宸叉湁搴撳瓨
-                    {
-                        //鍘熸墭鐩樼粦瀹氫俊鎭�
-                        var oldPalletBind = Db.Queryable<BllPalletBind>().First(w => w.Id == notBoxInfoList[0].BindNo);
-                        //鍘熷叆搴撳崟鏄庣粏
-                        var oldAsnDetail = Db.Queryable<BllArrivalNoticeDetail>().First(w => w.Id == oldPalletBind.ASNDetailNo);
-                        //鍘熷叆搴撳崟
-                        var oldAsnNotice = Db.Queryable<BllArrivalNotice>().First(w => w.ASNNo == oldAsnDetail.ASNNo);
-                        #region 鎵樼洏缁戝畾淇℃伅
-                        var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == oldAsnDetail.Id && m.PalletNo == model.PalletNo);
-                        var bindId = 0;
-                        if (bind == null)
-                        {
-                            bind = new BllPalletBind
-                            {
-                                ASNNo = oldAsnDetail.ASNNo,
-                                ASNDetailNo = oldAsnDetail.Id,
-                                PalletNo = model.PalletNo,
-                                PalletNo2 = "",
-                                PalletNo3 = "",
-                                Qty = 0,
-                                FullQty = pNum,
-                                Status = "2",//鍏ュ簱瀹屾垚
-                                Type = "0",
-                                LotNo = pinBoxLotNo,
-                                LotText = oldAsnDetail.LotText,
-                                SupplierLot = oldAsnDetail.SupplierLot,
-                                //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                                //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                                BitPalletMark = "1",
-                                IsBale = "0",
-                                IsBelt = "0",
-                                CreateUser = userId,
-                                Demo = model.Demo,
-                            };
-                            // 鎻掑叆鎵樼洏缁戝畾琛�
-                            bindId = Db.Insertable(bind).ExecuteReturnIdentity();
-                        }
-                        else
-                        {
-                            bindId = bind.Id;
-                            bind.Qty += pinBoxQty;
-
-                            Db.Updateable(bind).ExecuteCommand();
-                        }
-                        #endregion
-
-                        // 鎻掑叆搴撳瓨鏄庣粏鏁版嵁
-                        var sd1 = new DataStockDetail()
-                        {
-                            LotNo = pinBoxLotNo,
-                            LotText = notBoxInfoList[0].LotText,
-                            SupplierLot = notBoxInfoList[0].SupplierLot,
-                            SkuNo = sku.SkuNo,
-                            SkuName = sku.SkuName,
-                            Standard = sku.Standard,
-                            Qty = pinBoxQty,
-                            LockQty = 0,
-                            FrozenQty = 0,
-                            InspectQty = 0,
-                            ASNNo = oldPalletBind.ASNNo,
-                            ASNDetailNo = oldPalletBind.ASNDetailNo,
-                            WareHouseNo = "",//鎵�灞炰粨搴�
-                            RoadwayNo = "",//鎵�灞炲贩閬�
-                            AreaNo = "",//鎵�灞炲尯鍩�
-                            LocatNo = "",//鍌ㄤ綅鍦板潃
-                            PalletNo = bind.PalletNo,
-                            PalletNo2 = bind.PalletNo2,
-                            PalletNo3 = bind.PalletNo3,
-                            PalletTags = "0",
-                            CompleteTime = comTime,
-                            ProductionTime = oldPalletBind.ProductionTime,
-                            ExpirationTime = oldPalletBind.ExpirationTime,
-                            Status = "0",
-                            InspectMark = oldPalletBind.InspectMark,
-                            InspectStatus = sku.IsInspect,
-                            BitPalletMark = oldPalletBind.BitPalletMark,
-                            PackagNo = oldAsnDetail.PackagNo,
-                            IsBale = oldPalletBind.IsBale,
-                            IsBelt = oldPalletBind.IsBelt,
-
-                            IsDel = "0",
-                            CreateUser = 0,
-                            CreateTime = comTime
-                        };
-                        //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
-                        if (oldAsnNotice.Type == "0" || oldAsnNotice.Type == "2" || oldAsnNotice.Type == "4" || oldAsnNotice.Type == "6" || oldAsnNotice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                        {
-                            sd1.OwnerNo = oldAsnNotice.CustomerNo;//璐т富缂栫爜
-                            sd1.OwnerName = oldAsnNotice.CustomerName;//璐т富鍚嶇О
-                        }
-                        else if (oldAsnNotice.Type == "1" || oldAsnNotice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
-                        {
-                            sd1.SupplierNo = oldAsnNotice.CustomerNo;//渚涘簲鍟嗙紪鐮�
-                            sd1.SupplierName = oldAsnNotice.CustomerName;//渚涘簲鍟嗗悕绉�
-                        }
-                        //娣诲姞搴撳瓨鏄庣粏
-                        var sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
-                        foreach (var item in dataBoxList)
-                        {
-                            item.StockDetailId = sdId1;//搴撳瓨鏄庣粏id
-                            item.BindNo = bind.Id;//鎵樼洏缁戝畾id
-                        }
-                        //鏇存柊搴撳瓨绠辨敮鏄庣粏琛�
-                        Db.Updateable(dataBoxList).ExecuteCommand();
-
-                        //鎵樼洏瑙g粦淇℃伅
-                        var palletUnbind = Db.Queryable<BllPalletUnbind>().First(w => w.IsDel == "0" && w.UpbindPalletNo == oldPalletBind.PalletNo && w.BoxNo == pinBoxNo);
-                        if (palletUnbind == null)
-                        {
-                            throw new Exception("鎷肩鐨勬墭鐩樿В缁戜俊鎭笉瀛樺湪!");
-                        }
-                        palletUnbind.BindPalletNo = model.PalletNo;//缁戝畾鎵樼洏鍙�
-                        palletUnbind.UpdateTime = comTime;
-                        palletUnbind.UpdateUser = userId;
-                        //鏇存柊鎵樼洏瑙g粦缁戝畾琛ㄤ俊鎭�
-                        Db.Updateable(palletUnbind).ExecuteCommand();
-                    }
-                    else
-                    {
-                        string sql = $@"SELECT detail.* FROM BllArrivalNoticeDetail as detail
-                                        JOIN BllArrivalNotice as notice ON detail.ASNNo=notice.ASNNo
-                                        WHERE notice.IsDel='0'
-                                        AND ( notice.Status=0 or notice.Status=1 )
-                                        AND detail.IsDel='0' 
-                                        AND detail.LotNo='{pinBoxLotNo}' 
-                                        AND detail.SkuNo='{sku.SkuNo}'
-                                        ORDER BY detail.CreateTime ";
-                        //鎵惧埌鎷肩鍐呭叾浠栨壒娆℃墍灞炲叆搴撳崟鏄庣粏
-                        var arrDetail = Db.Ado.SqlQuery<BllArrivalNoticeDetail>(sql).FirstOrDefault();
-                        if (arrDetail == null)
-                        {
-                            throw new Exception("鎷肩鍐呯墿鏂欐墍灞炲叆搴撳崟鏄庣粏涓嶅瓨鍦�!");
-                        }
-                        //鎵惧埌鎷肩鍐呭叾浠栨壒娆℃墍灞炲叆搴撳崟
-                        var arrNotice = Db.Queryable<BllArrivalNotice>().First(w => w.IsDel == "0" && w.ASNNo == arrDetail.ASNNo);
-                        if (arrNotice == null)
-                        {
-                            throw new Exception("鎷肩鍐呯墿鏂欐墍灞炲叆搴撳崟涓嶅瓨鍦�!");
-                        }
-                        #region 鎵樼洏缁戝畾淇℃伅
-                        var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == arrDetail.Id && m.PalletNo == model.PalletNo);
-                        var bindId = 0;
-                        if (bind == null)
-                        {
-                            bind = new BllPalletBind
-                            {
-                                ASNNo = arrDetail.ASNNo,
-                                ASNDetailNo = arrDetail.Id,
-                                PalletNo = model.PalletNo,
-                                PalletNo2 = "",
-                                PalletNo3 = "",
-                                Qty = 0,
-                                FullQty = pNum,
-                                Status = "2",//鍏ュ簱瀹屾垚
-                                Type = "0",
-                                LotNo = pinBoxLotNo,
-                                LotText = arrDetail.LotText,
-                                SupplierLot = arrDetail.SupplierLot,
-                                //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                                //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                                BitPalletMark = "1",
-                                IsBale = "0",
-                                IsBelt = "0",
-                                CreateUser = userId,
-                                Demo = model.Demo,
-                            };
-                            // 鎻掑叆鎵樼洏缁戝畾琛�
-                            bindId = Db.Insertable(bind).ExecuteReturnIdentity();
-                        }
-                        else
-                        {
-                            bindId = bind.Id;
-                        }
-                        #endregion
-
-                        #region 搴撳瓨鏄庣粏鍜岃川妫�淇℃伅
-                        //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
-                        BllQualityInspect quality = new BllQualityInspect();
-                        //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
-                        if (arrNotice.Type == "3")
-                        {
-                            quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == arrDetail.ASNNo && a.SkuNo == arrDetail.SkuNo && a.LotNo == arrDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
-                        }
-                        else
-                        {
-                            quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == arrDetail.SkuNo && a.LotNo == arrDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
-                        }
-                        var tags = "0";
-                        if (arrNotice.Type == "3" || arrNotice.Type == "4")
-                        {
-                            tags = "1";
-                        }
-
-                        // 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�  
-                        var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == arrDetail.Id && m.PalletNo == model.PalletNo);
-                        var sdId1 = 0;
-                        if (sd1 != null)
-                        {
-                            sdId1 = sd1.Id;
-                            // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
-                            sd1.Qty = bind.Qty;
-                            sd1.CompleteTime = comTime;
-                            sd1.UpdateUser = userId;
-                            sd1.UpdateTime = comTime;
-
-                            Db.Updateable(sd1).ExecuteCommand();
-                        }
-                        else
-                        {
-                            // 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
-                            sd1 = new DataStockDetail()
-                            {
-                                LotNo = pinBoxLotNo,
-                                LotText = notBoxInfoList[0].LotText,
-                                SupplierLot = bind.SupplierLot,
-                                SkuNo = sku.SkuNo,
-                                SkuName = sku.SkuName,
-                                Standard = sku.Standard,
-                                Qty = bind.Qty,
-                                LockQty = 0,
-                                FrozenQty = 0,
-                                InspectQty = 0,
-                                ASNNo = arrDetail.ASNNo,
-                                ASNDetailNo = arrDetail.Id,
-                                WareHouseNo = "",//鎵�灞炰粨搴�
-                                RoadwayNo = "",//鎵�灞炲贩閬�
-                                AreaNo = "",//鎵�灞炲尯鍩�
-                                LocatNo = "",//鍌ㄤ綅鍦板潃
-                                PalletNo = bind.PalletNo,
-                                PalletNo2 = bind.PalletNo2,
-                                PalletNo3 = bind.PalletNo3,
-                                PalletTags = tags,
-                                CompleteTime = comTime,
-                                ProductionTime = bind.ProductionTime,
-                                ExpirationTime = bind.ExpirationTime,
-                                Status = "0",
-                                InspectMark = bind.InspectMark,
-                                InspectStatus = sku.IsInspect,
-                                BitPalletMark = bind.BitPalletMark,
-                                PackagNo = arrDetail.PackagNo,                    //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�       
-                                IsBale = bind.IsBale,
-                                IsBelt = bind.IsBelt,
-
-                                IsDel = "0",
-                                CreateUser = 0,
-                                CreateTime = comTime
-                            };
-
-                            //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
-                            if (arrNotice.Type == "0" || arrNotice.Type == "2" || arrNotice.Type == "4" || arrNotice.Type == "6" || arrNotice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                            {
-                                sd1.OwnerNo = arrNotice.CustomerNo;//璐т富缂栫爜
-                                sd1.OwnerName = arrNotice.CustomerName;//璐т富鍚嶇О
-                            }
-                            else if (arrNotice.Type == "1" || arrNotice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
-                            {
-                                sd1.SupplierNo = arrNotice.CustomerNo;//渚涘簲鍟嗙紪鐮�
-                                sd1.SupplierName = arrNotice.CustomerName;//渚涘簲鍟嗗悕绉�
-                            }
-                            if (quality != null)
-                            {
-                                //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
-                                if (quality.IsQualified == "1") //鍚堟牸
-                                {
-                                    //澧炲姞鍚堟牸鏁伴噺
-                                    quality.PassQty += bind.Qty;
-                                    sd1.InspectStatus = "1";
-                                }
-                                else if (quality.IsQualified == "0") //涓嶅悎鏍�
-                                {
-                                    //澧炲姞涓嶅悎鏍兼暟閲�
-                                    quality.FailQty += bind.Qty;
-                                    sd1.InspectStatus = "2";
-                                }
-                                Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
-                            }
-                            //娣诲姞搴撳瓨鏄庣粏
-                            sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
-                        }
-                        #endregion
-
-                        // 鏇存敼绠辨敮鍏崇郴琛�
-                        decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
-                        var isSample = "0";//鏄惁鍙栨牱
-                        var sampleQty = 0m;//鍙栨牱鏁伴噺
-
-                        //鏍囩缁勬墭
-                        var boxGroup = notBoxInfoList.GroupBy(m => m.BoxNo).ToList();
-                        foreach (var g in boxGroup)
-                        {
-                            decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
-                            foreach (var box in g)
-                            {
-                                if (box.BindNo != null && box.BindNo != 0)
-                                {
-                                    continue;
-                                }
-                                //绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
-                                if (box.SkuNo != arrDetail.SkuNo || box.LotNo != arrDetail.LotNo)
-                                {
-                                    throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
-                                }
-
-                                box.ASNNo = arrDetail.ASNNo;
-                                box.ASNDetailNo = arrDetail.Id;
-                                box.BindNo = bindId;
-                                box.PalletNo = model.PalletNo;
-                                box.Status = "2";
-                                //box.InspectMark = model.IsSample;  //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                                //box.SamplingQty = 0;    //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                                box.CompleteTime = comTime;
-                                box.UpdateTime = comTime;
-                                box.UpdateUser = userId;
-
-                                //box.Qty = box.Qty;
-                                //box.BitBoxMark = box.Qty == box.FullQty ? "0" : "1";
-
-                                factQty += box.Qty;
-                                boxFullQty += box.Qty;
-                                if (box.InspectMark == "1") //鍒ゆ柇鏄惁鍙栨牱
-                                {
-                                    isSample = "1";
-                                    sampleQty += (decimal)box.SamplingQty;
-                                }
-
-                                #region 搴撳瓨绠辩爜鏄庣粏
-                                var box2 = new DataBoxInfo()
-                                {
-                                    StockDetailId = sdId1,
-                                    BindNo = bind.Id,
-                                    BoxNo = box.BoxNo,
-                                    BoxNo2 = box.BoxNo2,
-                                    BoxNo3 = box.BoxNo3,
-                                    PalletNo = box.PalletNo,
-                                    PalletNo2 = box.PalletNo2,
-                                    PalletNo3 = box.PalletNo3,
-                                    Qty = box.Qty,
-                                    FullQty = box.FullQty,
-                                    Status = "2",//0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷h揣
-                                    LotNo = box.LotNo,
-                                    LotText = box.LotText,
-                                    SkuNo = box.SkuNo,
-                                    SkuName = box.SkuName,
-                                    Standard = sku.Standard,
-                                    ProductionTime = box.ProductionTime,
-                                    SupplierLot = box.SupplierLot,
-                                    InspectStatus = sku.IsInspect,
-                                    InspectMark = box.InspectMark,
-                                    BitBoxMark = box.BitBoxMark,
-                                    ExpirationTime = box.ExpirationTime,
-
-                                    CreateUser = 0,
-                                    CreateTime = comTime
-                                };
-                                //娣诲姞搴撳瓨绠辩爜鏄庣粏
-                                Db.Insertable(box2).ExecuteCommand();
-                                #endregion
-                            }
-                            if (boxFullQty > bNum)
-                            {
-                                throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
-                            }
-                        }
-                        //鏇存敼绠辨敮鍏崇郴琛ㄤ俊鎭�
-                        Db.Updateable(boxInfoList).ExecuteCommand();
-
-                        // 鏇存柊鎵樼洏缁戝畾琛�
-                        bind.Qty += factQty;
-
-                        if (bind.FullQty < bind.Qty)
-                        {
-                            throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
-                        }
-
-                        if (bind.FullQty == bind.Qty)
-                        {
-                            bind.BitPalletMark = "0";
-                            sd1.BitPalletMark = "0";
-                        }
-                        if (bind.Qty > pNum)
-                        {
-                            throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
-                        }
-
-                        if (isSample == "1")
-                        {
-                            bind.InspectMark = "1";
-                            bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
-                        }
-                        Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
-
-                        #region 鍏ュ簱鍗曞強鏄庣粏
-                        arrDetail.FactQty += factQty;//宸茬粍鏁伴噺
-                        arrDetail.CompleteQty += factQty;//瀹屾垚鏁伴噺
-                        if (isSample == "1") //鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�兼敼涓哄垽鏂槸鍚﹀彇鏍�
-                        {
-                            arrDetail.IsSampling = "1";
-                        }
-                        arrDetail.Status = "1";//0锛氱瓑寰呮墽琛� 1锛氭鍦ㄦ墽琛� 2锛氭墽琛屽畬鎴�
-                        if (arrDetail.CompleteQty >= arrDetail.Qty)
-                        {
-                            arrDetail.Status = "2";
-                            arrDetail.CompleteTime = comTime;
-                        }
-                        arrDetail.UpdateUser = userId;
-                        arrDetail.UpdateTime = comTime;
-                        //鏇存柊鍏ュ簱鍗曟槑缁�
-                        Db.Updateable(arrDetail).ExecuteCommand();
-
-                        arrNotice.UpdateUser = userId;
-                        arrNotice.UpdateTime = comTime;
-                        if (arrNotice.Status == "0")
-                        {
-                            arrNotice.Status = "1";
-                        }
-                        var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>().Count(m => m.IsDel == "0" && m.ASNNo == arrDetail.ASNNo && m.Status != "2");
-                        if (asnDetailNum == 0)
-                        {
-                            arrNotice.Status = "2";//鎵ц瀹屾垚
-                            arrNotice.CompleteTime = comTime;//瀹屾垚鏃堕棿
-                        }
-                        //鏇存柊鍏ュ簱鍗�
-                        Db.Updateable(arrNotice).ExecuteCommand();
-                        #endregion
-
-                        #region 搴撳瓨鏄庣粏
-                        sd1.Qty = bind.Qty;
-                        //鏇存敼搴撳瓨鏄庣粏鏁伴噺
-                        Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
-                        #endregion
-
-                        #region 搴撳瓨
-                        var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
-                        if (dataStock != null)
-                        {
-                            dataStock.Qty += factQty;
-
-                            if (bind.InspectMark == "1")
-                            {
-                                dataStock.IsSampling = bind.InspectMark;
-                            }
-                            Db.Updateable(dataStock).ExecuteCommand();
-                        }
-                        else
-                        {
-                            var stock = new DataStock()
-                            {
-                                SkuNo = sku.SkuNo,
-                                SkuName = sku.SkuName,
-                                Standard = sku.Standard,
-                                LotNo = bind.LotNo,
-                                LotText = bind.LotText,
-                                Qty = bind.Qty,
-                                LockQty = 0,
-                                FrozenQty = 0,
-                                IsSampling = bind.InspectMark,
-                                IsDel = "0",
-                                CreateUser = userId,
-                                CreateTime = comTime
-                            };
-                            //缁存姢搴撳瓨璐т富淇℃伅
-                            if (arrNotice.Type == "0" || arrNotice.Type == "2" || arrNotice.Type == "4" || arrNotice.Type == "6" || arrNotice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                            {
-                                stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
-                                stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
-                            }
-                            Db.Insertable(stock).ExecuteCommand();
-                        }
-                        #endregion
-
-                        #region 璐ㄦ璇烽獙
-                        if ((arrNotice.Type == "1" || arrNotice.Type == "4" || arrNotice.Type == "5") && sku.IsInspect != "1")
-                        {
-                            var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
-                            if (qualityRequest == null)
-                            {
-                                string qcNo = new Common().GetMaxNo("QC");
-                                qualityRequest = new BllQualityInspectionRequest();
-                                qualityRequest.QcNo = qcNo;
-                                qualityRequest.Status = "0";
-                                qualityRequest.SkuNo = sku.SkuNo;
-                                qualityRequest.SkuName = sku.SkuName;
-                                qualityRequest.LotNo = bind.LotNo;
-                                qualityRequest.SupplierLot = bind.SupplierLot;
-                                qualityRequest.Qty = arrDetail.Qty;
-                                qualityRequest.SamplingQty = 0;
-                                qualityRequest.ASNNo = arrDetail.ASNNo;
-                                qualityRequest.CreateUser = userId;
-                                qualityRequest.CreateTime = comTime;
-                                //娣诲姞璐ㄦ璇烽獙鍗�
-                                Db.Insertable(qualityRequest).ExecuteCommand();
-                            }
-                        }
-                        #endregion
-                    }
-                }
-                // 鏇存敼鎵樼洏浣跨敤鐘舵��
-                var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
-                //娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
-                sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
-                Db.Ado.ExecuteCommand(sqlStr);
-                new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}銆亄msgStr}鐨勭粍鐩樹俊鎭�", userId);
-
-                //鎻愪氦浜嬪姟
-                Db.CommitTran();
-            }
-            catch (Exception e)
-            {
-                //鍥炴粴浜嬪姟
-                Db.RollbackTran();
-                throw new Exception(e.Message);
-            }
-        }
-
-        //JC26缁戝畾鎵樼洏 涓嶈创鏍囩墿鏂�
-        public void BindPalletNoPasteCode(PdaPalletBindVm model, int userId)
-        {
-
-            #region 鍒ゆ柇
-
-            //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴�
-            var TypeLot = "5, 6";
-
-            if (string.IsNullOrEmpty(model.AsnNo))
-            {
-                throw new Exception("鍗曟嵁鍙蜂笉鍙负绌�!");
-            }
-            if (model.AsnDetailId == null || model.AsnDetailId == 0)
-            {
-                throw new Exception("鐗╂枡涓嶅彲涓虹┖!");
-            }
-            if (string.IsNullOrEmpty(model.PalletNo))
-            {
-                throw new Exception("鎵樼洏鍙蜂笉鍙负绌�!");
-            }
-            if (model.SkuQty < 0)
-            {
-                throw new Exception("鐗╂枡鏁伴噺涓嶈兘灏忎簬0!");
-            }
-            //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
-            var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == model.AsnNo);
-            if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
-            {
-                throw new Exception("璇ュ崟鎹凡鍏冲崟!");
-            }
-
-            if (string.IsNullOrEmpty(model.LotNo))
-            {
-                throw new Exception("鐗╂枡鎵规涓嶄负绌�!");
-            }
-            else
-            {
-                //浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
-                int indexOfDash = model.LotNo.IndexOf("-");
-                if (indexOfDash != -1)
-                {
-                    model.LotNo = model.LotNo.Substring(indexOfDash + 1);
-                }
-                else
-                {
-                    if (!TypeLot.Contains(notice.Type))
-                    {
-                        throw new Exception("鐗╂枡鎵规涓嶅彲涓虹┖!");
-                    }
-
-                    model.LotNo = "";
-                }
-            }
-
-            //int isTextTable = model.TableType;
-            #endregion
-
-            var comTime = DateTime.Now;
-
-            //鎵樼洏鏄惁瀛樺湪
-            var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
-            if (pallet == null)
-            {
-                throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
-            }
-            // 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
-            var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
-            if (detail == null)
-            {
-                throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
-            }
-            //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
-            var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
-            if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
-            {
-                throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝璇锋牳瀹烇紒");
-            }
-            if (stockDetail != null && (stockDetail.SkuNo != detail.SkuNo || stockDetail.LotNo != model.LotNo))
-            {
-                throw new Exception("璇ユ墭鐩樺湪搴撳瓨宸叉湁鍏跺畠鐗╂枡鎵规淇℃伅锛岃鏍稿疄锛�");
-            }
-
-            #region 鍖呰
-            var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
-            var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo);    // liudl 鐢盨ku鍖呰缂栧彿鍙樻洿涓哄叆搴撳崟鏄庣粏鍖呰缂栧彿
-
-            var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺 
-            var bNum = 0;//绠辩爜鐗╁搧鏁伴噺 
-
-            if (pack == null)
-            {
-                throw new Exception("鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
-            }
-            if (pack.L5Num.HasValue)
-            {
-                pNum = (int)pack.L5Num;
-                bNum = (int)pack.L4Num;
-            }
-            else if (pack.L4Num.HasValue)
-            {
-                pNum = (int)pack.L4Num;
-                bNum = (int)pack.L3Num;
-            }
-            else if (pack.L3Num.HasValue)
-            {
-                pNum = (int)pack.L3Num;
-                bNum = (int)pack.L2Num;
-            }
-            else if (pack.L2Num.HasValue)
-            {
-                pNum = (int)pack.L2Num;
-                bNum = (int)pack.L1Num;
-            }
-            else if (pack.L1Num.HasValue)
-            {
-                pNum = (int)pack.L1Num;
-                bNum = (int)pack.L1Num;
-            }
-            if (pNum == 0 || bNum == 0)
-            {
-                throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
-            }
-
-            #endregion
-
-            #region 楠岃瘉鏄惁鍏佽绔嬪簱鍚屾墭鐩樹笉鍚岀墿鏂欏叆搴撴垨鍚屾墭鐩樺悓鐗╂枡涓嶅悓鎵规鍏ュ簱
-            var palletBind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNNo == model.AsnNo && m.PalletNo == model.PalletNo && m.ASNDetailNo != model.AsnDetailId);
-            if (palletBind != null)
-            {
-                var box = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.BindNo == palletBind.Id && m.BitBoxMark == "0");
-                if (box != null && (box.SkuNo != detail.SkuNo || !detail.LotNo.Contains(box.LotNo)))
-                {
-                    var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
-                    if (funSetting == null || funSetting.IsEnable == "OFF")
-                    {
-                        throw new Exception($"涓嶅厑璁哥珛搴撳悓鎵樼洏涓嶅悓鐗╂枡鍏ュ簱鎴栧悓鎵樼洏涓嶅悓鎵规鍏ュ簱锛�");
-                    }
-                }
-            }
-            #endregion
-            //liudl  && m.Status != "2"  缁勭洏鏃㈠叆搴撳畬鎴愭棤闇�鏍规嵁鎵樼洏鐘舵�佸垽鏂�
-            var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
-            var bindId = 0;
-            if (bind == null)
-            {
-                DateTime? pTime = null;
-                DateTime? eTime = null;
-                if (!string.IsNullOrWhiteSpace(detail.Lot1)) 
-                {
-                    pTime = DateTime.Parse(detail.Lot1);
-                }
-                if (!string.IsNullOrWhiteSpace(detail.Lot2)) 
-                {
-                    eTime = DateTime.Parse(detail.Lot2);
-                }
-
-
-                bind = new BllPalletBind
-                {
-                    ASNNo = model.AsnNo,
-                    ASNDetailNo = (int)model.AsnDetailId,
-                    PalletNo = model.PalletNo,
-
-                    Qty = model.SkuQty,
-                    FullQty = pNum,
-                    Status = "2",//鍏ュ簱瀹屾垚
-                    Type = "0",
-                    LotNo = model.LotNo,
-                    LotText = detail.LotText,
-                    SupplierLot = detail.SupplierLot,
-                    //InspectMark = model.IsSample,      //鏄惁鍙栨牱鎵樼洏  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                    //SamplingQty = 0,     //鍙栨牱鏁伴噺  鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
-                    ProductionTime = pTime,
-                    ExpirationTime = eTime,
-                    BitPalletMark = "1",
-                    IsBale = "0",
-                    IsBelt = "0",
-                    CreateUser = userId,
-                    Demo = model.Demo,
-
-                };
-                // 鎻掑叆鎵樼洏缁戝畾琛�
-                bindId = Db.Insertable(bind).ExecuteReturnIdentity();
-            }
-            else
-            {
-                bindId = bind.Id;
-                bind.Qty += model.SkuQty;
-            }
-            if (bind.Qty < 0)
-            {
-                throw new Exception("缁勭洏鏁伴噺涓嶈兘灏忎簬0");
-            }
-
-            #region 搴撳瓨鏄庣粏
-            //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
-            BllQualityInspect quality = new BllQualityInspect();
-            //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
-            if (notice.Type == "3")
-            {
-                quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
-            }
-            else
-            {
-                quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == detail.SkuNo && a.LotNo == detail.LotNo).OrderByDescending(a => a.CreateTime).First();
-            }
-            var tags = "0";
-            if (notice.Type == "3" || notice.Type == "4")
-            {
-                tags = "1";
-            }
-
-            // 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�  
-            var sd1 = Db.Queryable<DataStockDetail>()
-                .First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo && m.LotNo == bind.LotNo);
-            var sdId1 = 0;
-            if (sd1 != null)
-            {
-                sdId1 = sd1.Id;
-                // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
-                sd1.Qty = bind.Qty;
-                sd1.CompleteTime = comTime;
-                sd1.UpdateUser = userId;
-                sd1.UpdateTime = comTime;
-
-                Db.Updateable(sd1).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
-            }
-            else
-            {
-                string inspectStatusStr = "0";
-                if (sku.IsInspect == "1") 
-                {
-                    inspectStatusStr = "1";
-                }
-
-                // 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
-                sd1 = new DataStockDetail()
-                {
-                    LotNo = bind.LotNo,
-                    LotText = bind.LotText,
-                    SupplierLot = bind.SupplierLot,
-                    SkuNo = sku.SkuNo,
-                    SkuName = sku.SkuName,
-                    Standard = sku.Standard,
-                    Qty = bind.Qty,
-                    LockQty = 0,
-                    FrozenQty = 0,
-                    InspectQty = 0,
-                    ASNNo = bind.ASNNo,
-                    ASNDetailNo = bind.ASNDetailNo,
-                    WareHouseNo = "",//鎵�灞炰粨搴�
-                    RoadwayNo = "",//鎵�灞炲贩閬�
-                    AreaNo = "",//鎵�灞炲尯鍩�
-                    LocatNo = "",//鍌ㄤ綅鍦板潃
-                    PalletNo = bind.PalletNo,
-                    PalletNo2 = bind.PalletNo2,
-                    PalletNo3 = bind.PalletNo3,
-                    PalletTags = tags,
-                    CompleteTime = comTime,
-                    ProductionTime = bind.ProductionTime,
-                    ExpirationTime = bind.ExpirationTime,
-                    Status = "0",
-                    InspectMark = bind.InspectMark,
-                    InspectStatus = inspectStatusStr,
-                    BitPalletMark = bind.BitPalletMark,
-                    PackagNo = detail.PackagNo,                    //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�       
-                    IsBale = bind.IsBale,
-                    IsBelt = bind.IsBelt,
-
-                    IsDel = "0",
-                    CreateUser = 0,
-                    CreateTime = comTime
-                };
-
-                //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
-                if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                {
-                    sd1.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
-                    sd1.OwnerName = notice.CustomerName;//璐т富鍚嶇О
-                }
-                else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
-                {
-                    sd1.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
-                    sd1.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
-                }
-                if (quality != null)
-                {
-                    //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
-                    if (quality.IsQualified == "1") //鍚堟牸
-                    {
-                        //澧炲姞鍚堟牸鏁伴噺
-                        quality.PassQty += bind.Qty;
-                        sd1.InspectStatus = "1";
-                    }
-                    else if (quality.IsQualified == "0") //涓嶅悎鏍�
-                    {
-                        //澧炲姞涓嶅悎鏍兼暟閲�
-                        quality.FailQty += bind.Qty;
-                        sd1.InspectStatus = "2";
-                    }
-                    Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
-                }
-                //娣诲姞搴撳瓨鏄庣粏
-                sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
-            }
-            #endregion
-
-
-
-            // 鏇存敼绠辨敮鍏崇郴琛�
-
-            var isSample = "0";//鏄惁鍙栨牱
-            var sampleQty = 0m;//鍙栨牱鏁伴噺
-
-
-            //if (bind.FullQty < bind.Qty && isTextTable == 0)
-            if (bind.FullQty < bind.Qty)
-            {
-                throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
-            }
-
-            if (bind.FullQty == bind.Qty)
-            {
-                bind.BitPalletMark = "0";
-                sd1.BitPalletMark = "0";
-            }
-            //if (bind.Qty > pNum && isTextTable == 0)
-            if (bind.Qty > pNum)
-            {
-                throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
-            }
-
-            if (isSample == "1")
-            {
-                bind.InspectMark = "1";
-                bind.SamplingQty = bind.SamplingQty == null ? sampleQty : bind.SamplingQty + sampleQty;
-            }
-            Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
-
-            #region 鍏ュ簱鍗曞強鏄庣粏
-            decimal addQty = model.SkuQty;
-
-            detail.FactQty += addQty;//宸茬粍鏁伴噺
-            detail.CompleteQty += addQty;//瀹屾垚鏁伴噺
-            if (isSample == "1") //鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�兼敼涓哄垽鏂槸鍚﹀彇鏍�
-            {
-                detail.IsSampling = "1";
-            }
-            detail.Status = "1";//0锛氱瓑寰呮墽琛� 1锛氭鍦ㄦ墽琛� 2锛氭墽琛屽畬鎴�
-            if (detail.CompleteQty >= detail.Qty)
-            {
-                detail.Status = "2";
-                detail.CompleteTime = comTime;
-            }
-            detail.UpdateUser = userId;
-            detail.UpdateTime = comTime;
-            //鏇存柊鍏ュ簱鍗曟槑缁�
-            Db.Updateable(detail).ExecuteCommand();
-
-            notice.UpdateUser = userId;
-            notice.UpdateTime = comTime;
-            if (notice.Status == "0")
-            {
-                notice.Status = "1";
-            }
-            var asnDetailNum = Db.Queryable<BllArrivalNoticeDetail>()
-                            .Count(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo && m.Status != "2");
-            if (asnDetailNum == 0)
-            {
-                notice.Status = "2";
-                notice.CompleteTime = comTime;//瀹屾垚鏃堕棿
-            }
-            //鏇存柊鍏ュ簱鍗�
-            Db.Updateable(notice).ExecuteCommand();
-            #endregion
-
-            #region 搴撳瓨鏄庣粏
-            sd1.Qty = bind.Qty;
-            //鏇存敼搴撳瓨鏄庣粏鏁伴噺
-            Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
-            #endregion
-
-            #region 搴撳瓨
-            var dataStock = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo);
-            if (dataStock != null)
-            {
-                dataStock.Qty += model.SkuQty;
-
-
-                if (bind.InspectMark == "1")
-                {
-                    dataStock.IsSampling = bind.InspectMark;
-                }
-                Db.Updateable(dataStock).ExecuteCommand();
-            }
-            else
-            {
-                var stock = new DataStock()
-                {
-                    SkuNo = sku.SkuNo,
-                    SkuName = sku.SkuName,
-                    Standard = sku.Standard,
-                    LotNo = bind.LotNo,
-                    LotText = bind.LotText,
-                    Qty = bind.Qty,
-                    LockQty = 0,
-                    FrozenQty = 0,
-                    IsSampling = bind.InspectMark,
-                    IsDel = "0",
-                    CreateUser = userId,
-                    CreateTime = comTime
-                };
-                //缁存姢搴撳瓨璐т富淇℃伅
-                if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠e偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
-                {
-                    stock.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
-                    stock.OwnerName = notice.CustomerName;//璐т富鍚嶇О
-                }
-                Db.Insertable(stock).ExecuteCommand();
-            }
-            #endregion
-
-            #region 璐ㄦ璇烽獙
-            if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1")
-            {
-                var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
-                if (qualityRequest == null)
-                {
-                    string qcNo = new Common().GetMaxNo("QC");
-                    qualityRequest = new BllQualityInspectionRequest();
-                    qualityRequest.QcNo = qcNo;
-                    qualityRequest.Status = "0";
-                    qualityRequest.SkuNo = sku.SkuNo;
-                    qualityRequest.SkuName = sku.SkuName;
-                    qualityRequest.LotNo = bind.LotNo;
-                    qualityRequest.SupplierLot = bind.SupplierLot;
-                    qualityRequest.Qty = detail.Qty;
-                    qualityRequest.SamplingQty = 0;
-                    qualityRequest.ASNNo = detail.ASNNo;
-                    qualityRequest.CreateUser = userId;
-                    qualityRequest.CreateTime = comTime;
-                    //娣诲姞璐ㄦ璇烽獙鍗�
-                    Db.Insertable(qualityRequest).ExecuteCommand();
-                }
-            }
-            #endregion
-
-            // 鏇存敼鎵樼洏浣跨敤鐘舵��
-            var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
-            //娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
-            sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
-            Db.Ado.ExecuteCommand(sqlStr);
-            new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}鐨勭粍鐩樹俊鎭�", userId);
-        }
+        
 
         #endregion
 

--
Gitblit v1.8.0