From 5b4f00ff3ea04a3246a8f6f86bdefe749fcfd0c4 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 26 三月 2024 08:24:28 +0800
Subject: [PATCH] 合并代码

---
 Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 2128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 2,098 insertions(+), 30 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index fd358ae..78c8489 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -67,6 +67,11 @@
                 {
                     throw new Exception("鎵樼洏鐮佷负绌猴紝璇疯緭鍏ユ墭鐩樼爜");
                 }
+                var palletInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
+                if (!string.IsNullOrEmpty(palletInfo.WareHouseNo))
+                {
+                    throw new Exception("璇ユ墭鐩樿繕鏈嚭搴�");
+                }
                 if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
                 {
                     var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "1" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
@@ -242,7 +247,19 @@
                         {
                             foreach (var demo in list)
                             {
-                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
+                                //if (!string.IsNullOrWhiteSpace(boxNo3))
+                                //{
+                                //    var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 == demo.BoxNo);
+                                //}
+                                //else if (!string.IsNullOrWhiteSpace(boxNo))
+                                //{
+                                //    if (expr)
+                                //    {
+
+                                //    }
+
+                                //}
+                                var com = comInfo.FirstOrDefault(m => m.IsDel == "0" && m.BoxNo3 != null && m.BoxNo3 == demo.BoxNo);
                                 if (com != null)
                                 {
                                     demo.PickedQty = com.CompleteQty;
@@ -296,24 +313,30 @@
                 {
                     throw new Exception($"{palletNo}鎵樼洏涓婂瓨鍦ㄧ鐮佷俊鎭紝鏃犳硶鍦ㄦ暟閲忔嫞璐ц繘琛屾搷浣滐紒");
                 }
-                //鍑哄簱鍗曟槑缁�
-                var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(a => a.Id == int.Parse(soDetailId) && a.IsDel == "0");
-                if (noticeDetail == null)
+
+                BllExportAllot allot = null;
+                if (!string.IsNullOrWhiteSpace(soDetailId))
                 {
-                    throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟槑缁嗕俊鎭紝璇锋牳瀹烇紒");
+                    //鍑哄簱鍗曟槑缁�
+                    var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(a => a.Id == int.Parse(soDetailId) && a.IsDel == "0");
+                    if (noticeDetail == null)
+                    {
+                        throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟槑缁嗕俊鎭紝璇锋牳瀹烇紒");
+                    }
+                    //鍑哄簱鍗曟�诲崟
+                    var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == noticeDetail.SONo);
+                    if (notice == null)
+                    {
+                        throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟�诲崟淇℃伅锛岃鏍稿疄锛�");
+                    }
+                    //鍒嗛厤淇℃伅
+                    allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && (a.Status == "2" || a.Status == "3"));
+                    if (allot == null)
+                    {
+                        throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍒嗛厤淇℃伅锛岃鏍稿疄锛�");
+                    }
                 }
-                //鍑哄簱鍗曟�诲崟
-                var notice = Db.Queryable<BllExportNotice>().First(a => a.IsDel == "0" && a.SONo == noticeDetail.SONo);
-                if (notice == null)
-                {
-                    throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍑哄簱鍗曟�诲崟淇℃伅锛岃鏍稿疄锛�");
-                }
-                //鍒嗛厤淇℃伅
-                var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.PalletNo == palletNo && a.Status == "2" || a.Status == "3");
-                if (allot == null)
-                {
-                    throw new Exception($"鏈煡璇㈠埌瀵瑰簲鍒嗛厤淇℃伅锛岃鏍稿疄锛�");
-                }
+
                 //搴撳瓨鏄庣粏
                 var detail = Db.Queryable<DataStockDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo);
                 if (detail == null)
@@ -329,8 +352,8 @@
                 {
                     SkuNo = detail.SkuNo,
                     BoxNo = detail.SkuNo,
-                    Qty = (int)allot.Qty,
-                    PickedQty = (int)allot.CompleteQty,
+                    Qty = allot == null ? (int)(detail.Qty - detail.LockQty) : (int)allot.Qty,
+                    PickedQty = allot == null ? 0 : (int)allot.CompleteQty,
                 };
 
                 pdaInfo.Add(info);
@@ -341,7 +364,6 @@
             {
                 throw new Exception(e.Message);
             }
-            throw new NotImplementedException();
         }
 
         //鍑哄簱pda鎷ｈ揣
@@ -410,6 +432,7 @@
                     throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
                 }
                 #endregion
+
                 if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
                 {
                     List<DataBoxInfo> boxInfos;
@@ -429,7 +452,7 @@
                     var comList = new List<BllCompleteDetail>();
                     foreach (var item in boxInfos)
                     {
-                        if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                        if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3) && item.BoxNo3 != null)
                         {
                             throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
                         }
@@ -470,6 +493,7 @@
                     //淇敼鍑哄簱鍒嗛厤淇℃伅
                     allot.CompleteQty += pickQty;
                     allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                    allot.UpdateTime = DateTime.Now;
                     Db.Updateable(allot).ExecuteCommand();
                     //鍒犻櫎搴撳瓨鏄庣粏
                     Db.Deleteable(stockDetail).ExecuteCommand();
@@ -515,6 +539,8 @@
                         throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
                     }
                     boxInfos = boxInfo.ToList();
+
+                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
                     if (!string.IsNullOrWhiteSpace(boxNo3)) //鏁ｆ敮鎷ｈ揣
                     {
                         boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
@@ -536,6 +562,14 @@
                         if (boxQty > needQty)
                         {
                             throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+                        }
+
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
                         }
 
                         biaoShi = "1";
@@ -573,16 +607,20 @@
                         {
                             throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
                         }
+
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
                     }
                     var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
-                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+
                     var comList = new List<BllCompleteDetail>();
                     foreach (var item in boxInfos)
                     {
-                        if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
-                        {
-                            throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
-                        }
                         //娣诲姞鎷ｈ揣鏄庣粏
                         var completeDetail = new BllCompleteDetail()
                         {
@@ -610,7 +648,7 @@
                         if (biaoShi != "2")
                         {
                             //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
-                            Db.Deleteable(item).ExecuteCommand();                            
+                            Db.Deleteable(item).ExecuteCommand();
                         }
                         else//鏁伴噺鎷ｈ揣
                         {
@@ -643,6 +681,7 @@
                     //淇敼鍑哄簱鍒嗛厤淇℃伅
                     allot.CompleteQty += pickQty;
                     allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                    allot.UpdateTime = DateTime.Now;
                     if (allot.Status == "5")
                     {
                         //鍒ゆ柇璇ユ墭鐩樻槸鍚﹁繕瀛樺湪鐗╂枡 瀛樺湪鏀逛负寰呭洖搴� 寰呭洖搴撳畬鎴愬悗鏀逛负宸插畬鎴�
@@ -798,6 +837,7 @@
 
                 var comList = new List<BllCompleteDetail>();
                 //鍒ゆ柇鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                isComplete = 0;// 鎵�鏈夋棤绠辩爜鎴栦竴绾х鐮佹嫞璐ф椂锛屾嫞璐ф槑缁嗗簲閲嶆柊鎻掑叆鏁版嵁(浣撶幇澶氭鎷ｈ揣娴佺▼璁板綍)
                 if (isComplete == 0)
                 {
                     //娣诲姞鎷ｈ揣鏄庣粏
@@ -836,12 +876,11 @@
 
                     Db.Updateable(complete).ExecuteCommand();
                 }
-                
-
 
                 //淇敼鍑哄簱鍒嗛厤淇℃伅
                 allot.CompleteQty += int.Parse(PickQty);
                 allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                allot.UpdateTime = DateTime.Now;
                 Db.Updateable(allot).ExecuteCommand();
 
                 int isDel = 0;
@@ -896,7 +935,7 @@
                     pallet.Status = "0";
                     Db.Updateable(pallet).ExecuteCommand();
                 }
-                
+
                 //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
                 noticeDetail.CompleteQty += int.Parse(PickQty);
                 Db.Updateable(noticeDetail).ExecuteCommand();
@@ -1284,6 +1323,2035 @@
             }
         }
 
+        //鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨�
+        public string GetSampleType(string palletNo)
+        {
+            try
+            {
+                var type = "";
+                var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                if (detail == null)
+                {
+                    throw new Exception("褰撳墠鎵樼洏鏈湪搴撳瓨涓�");
+                }
+                //鎬庝箞鍒ゆ柇褰撳墠鎵樼洏鏄簱澶栬鍙栨牱鐨勬墭鐩橈紝姝ｅ父鍑哄簱鍓╀綑鎵樼洏鐩墠杩欑鎯呭喌涔熻兘鎷ｈ揣鍟婏紝涔熸病鏈夊垎閰嶄俊鎭�
+                var allot = Db.Queryable<BllExportAllot>().First(m =>
+                    m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
+                if (allot != null)
+                {
+                    var soNo = Db.Queryable<BllExportNotice>()
+                        .First(m => m.IsDel == "0" && m.SONo == allot.SONo);
+                    if (soNo == null)
+                    {
+                        throw new Exception("鏈壘鍒版墭鐩樹笂鍑哄簱鍗曟嵁淇℃伅");
+                    }
+                    if (soNo.Type != "3")
+                    {
+                        throw new Exception("璇ユ墭鐩樹笉鏄彇鏍锋墭鐩�");
+                    }
+                    type = "0";//搴撳唴鍙栨牱
+                }
+                else
+                {
+                    //鍒ゆ柇褰撳墠鎵樼洏鏄惁鏄湪骞冲簱鎴栧簱澶�
+                    type = "1";//搴撳墠鍙栨牱
+                }
+                return type;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
 
+        //鏍规嵁鎵樼洏鍙疯幏鍙栧叆搴撳崟鎹�
+        public List<string> GetAsnNoByPallet(string palletNo)
+        {
+            try
+            {
+                var type = "";
+                var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                if (detail == null)
+                {
+                    throw new Exception("褰撳墠鎵樼洏鏈湪搴撳瓨涓�");
+                }
+
+                var list = new List<string>();
+                if (string.IsNullOrWhiteSpace(detail.ASNNo))
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑鍏ュ簱鍗曚俊鎭�");
+                }
+                list.Add(detail.ASNNo);
+                return list;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+        //鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
+        public void SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string asnNo, int userId)
+        {
+            Db.BeginTran();
+            try
+            {
+                if (string.IsNullOrWhiteSpace(soType))
+                {
+                    throw new Exception("鍙栨牱鏍囪瘑涓嶈兘涓虹┖");
+                }
+
+                //soType: 0搴撳唴鍙栨牱锛屾湁鍑哄簱鍗曞強鍒嗛厤淇℃伅锛� 1搴撳墠鍙栨牱锛屽弽鍚戞坊鍔犲嚭搴撳崟鍙婂垎閰嶄俊鎭�
+                if (soType == "1")
+                {
+
+                    #region 鍒ゆ柇
+
+                    if (string.IsNullOrWhiteSpace(asnNo))
+                    {
+                        throw new Exception("鍏ュ簱鍗曚笉鑳戒负绌�");
+                    }
+                    if (string.IsNullOrWhiteSpace(palletNo))
+                    {
+                        throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+                    }
+                    if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+                    {
+                        throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
+                    }
+                    //鍏堝垽鏂槸鍚︽槸搴撳鍙栨牱鎵樼洏
+                    var allot = Db.Queryable<BllExportAllot>().First(m =>
+                        m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
+                    if (allot != null)
+                    {
+                        throw new Exception("褰撳墠鎵樼洏涓嶅睘浜庡簱鍓嶅彇鏍�");
+                    }
+
+
+                    //搴撳瓨鏄庣粏
+                    var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNNo == asnNo && m.PalletNo == palletNo);
+                    if (stockDetail == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑搴撳瓨鏄庣粏淇℃伅锛�");
+                    }
+
+                    var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == stockDetail.SkuNo);
+                    if (sku == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌褰撳墠鎵樼洏涓婄殑鐗╂枡淇℃伅");
+                    }
+                    //搴撳瓨鎬昏〃
+                    var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+                    if (stock == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+                    }
+
+                    //鍑哄簱鍗�
+                    var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.AsnSampleNo == asnNo);
+                    //鍒涘缓鍑哄簱鍗�
+                    if (notice == null || notice.Status == "6")
+                    {
+                        var billNo = "";
+                        var bl = true;
+                        do
+                        {
+                            //鑾峰彇鑷鍗曟嵁鍙�
+                            billNo = new Common().GetMaxNo("SO");
+                            var no = billNo;
+                            bl = Db.Queryable<BllExportNotice>().Any(m => m.SONo == no);
+                        } while (bl);
+
+
+                        var addNotice = new BllExportNotice()
+                        {
+                            SONo = billNo,
+                            Type = "3",
+                            Status = "4",
+                            Origin = "WMS",
+                            AsnSampleNo = asnNo,
+                            IsWave = "0",
+                            WaveNo = "",
+                            IsDespatch = "0",
+                            CompleteTime = DateTime.Now,
+                            CreateUser = userId,
+                        };
+
+                        var n = Db.Insertable(addNotice).ExecuteReturnEntity();
+                        notice = n;
+                    }
+
+                    //鍒涘缓鍑哄簱鍗曟槑缁�
+                    var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(m => m.IsDel == "0" && m.SONo == notice.SONo && m.SkuNo == stockDetail.SkuNo && m.LotNo.Contains(stockDetail.LotNo));
+                    if (noticeDetail == null)
+                    {
+                        var addNoticeDetail = new BllExportNoticeDetail()
+                        {
+                            SONo = notice.SONo,
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            LotNo = stockDetail.LotNo,
+                            LotText = "",
+                            Qty = 0,
+                            AllotQty = 0,
+                            FactQty = 0,
+                            CompleteQty = 0,
+                            PackagNo = sku.PackagNo,
+                            Price = sku.Price,
+                            //Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * pickQty,
+                            IsBale = "",
+                            IsBelt = "",
+                            SupplierLot = stock.SupplierLot,
+                            IsWave = "0",
+                            WaveNo = "",
+                            IsIssueLotNo = "0",
+                            Status = "3",
+                            CreateUser = userId,
+
+                        };
+                        var m = Db.Insertable(addNoticeDetail).ExecuteReturnEntity();
+                        noticeDetail = m;
+                    }
+                    //鍑哄簱鍒嗛厤淇℃伅
+                    var allot2 = Db.Queryable<BllExportAllot>().First(m => m.IsDel == "0" && m.Status == "5" && m.SONo == notice.SONo && m.PalletNo == palletNo);
+                    if (allot2 == null)
+                    {
+                        //娣诲姞鍒嗛厤琛ㄤ俊鎭�
+                        var addAllot = new BllExportAllot
+                        {
+                            SONo = notice.SONo,
+                            WaveNo = "",
+                            SODetailNo = noticeDetail.Id,
+                            StockId = stockDetail.Id,
+                            LotNo = stockDetail.LotNo,
+                            LotText = stockDetail.LotText,
+                            SupplierLot = stockDetail.SupplierLot,
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            PalletNo = palletNo,
+                            IsBale = "0", //鏄惁瑁瑰寘
+                            IsBelt = "0", //鏄惁鎵撳甫
+
+                            Qty = 0,
+                            CompleteQty = 0,
+
+                            Status = "5",
+                            LogisticsId = notice.LogisticsId,
+                            IsAdvance = "0",
+                            OutMode = "",//鍑哄簱鍙�
+
+                            CreateUser = userId,
+                            UpdateTime = DateTime.Now
+                        };
+
+                        var fp = Db.Insertable(addAllot).ExecuteReturnEntity();
+                        allot2 = fp;
+                    }
+
+
+                    #endregion
+
+
+                    //鍒ゆ柇鏄暎鏀嫞璐ц繕鏄暟閲忔嫞璐�
+                    var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暎鏀嫞璐с��2锛氭暟閲忔嫞璐�
+                    List<DataBoxInfo> boxInfos;
+                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+                    if (boxInfo.Count() == 0)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+                    }
+                    boxInfos = boxInfo.ToList();
+                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot2.Id && m.PalletNo == palletNo).ToList();
+                    if (!string.IsNullOrWhiteSpace(boxNo3)) //鏁ｆ敮鎷ｈ揣
+                    {
+                        boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
+
+                        if (boxInfos.Count() == 0)
+                        {
+                            throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+                        }
+                        if (boxInfos.Count() > 1)
+                        {
+                            throw new Exception("璇ヨ拷婧敮鐮佺殑淇℃伅澶т簬1鏉★紝淇℃伅閿欒锛岃鏍稿疄锛�");
+                        }
+
+                        if (boxInfos.Any(m => m.PalletNo != palletNo))
+                        {
+                            throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+                        }
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
+                        biaoShi = "1";
+                    }
+                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+                    {
+                        if (boxInfo.Count() > 1)
+                        {
+                            throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
+                        }
+                        int boxQty = boxInfo.First().Qty;
+                        if (Convert.ToInt32(pickQty1) > boxQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
+                        }
+
+                        biaoShi = "2";
+                    }
+                    else //鏁寸鎷ｈ揣
+                    {
+                        if (boxInfo.Count() == 0)
+                        {
+                            throw new Exception("鏈煡璇㈠埌璇ョ鐮佺殑淇℃伅");
+                        }
+                        if (boxInfo.Any(m => m.PalletNo != palletNo))
+                        {
+                            throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+                        }
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
+                    }
+                    var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+
+                    var comList = new List<BllCompleteDetail>();
+                    foreach (var item in boxInfos)
+                    {
+                        //if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                        //{
+                        //    throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                        //}
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        var completeDetail = new BllCompleteDetail()
+                        {
+                            SONo = notice.SONo,
+                            SODetailNo = noticeDetail.Id,
+                            ExportAllotId = allot2.Id,
+                            StockId = allot2.StockId,
+                            BoxNo = item.BoxNo,
+                            BoxNo2 = item.BoxNo2,
+                            BoxNo3 = item.BoxNo3,
+
+                            LotNo = allot2.LotNo,
+                            LotText = allot2.LotText,
+                            SupplierLot = allot2.SupplierLot,
+                            SkuNo = allot2.SkuNo,
+                            SkuName = allot2.SkuName,
+                            Standard = allot2.Standard,
+                            PalletNo = palletNo,
+                            CompleteQty = biaoShi == "2" ? int.Parse(pickQty1) : item.Qty,
+                            InspectMark = "1",
+
+                            CreateUser = userId
+                        };
+                        comList.Add(completeDetail);
+
+                        if (biaoShi != "2")
+                        {
+                            //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+                            Db.Deleteable(item).ExecuteCommand();
+                        }
+                        else//鏁伴噺鎷ｈ揣
+                        {
+                            if (int.Parse(pickQty1) == item.Qty)
+                            {
+                                //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+                                Db.Deleteable(item).ExecuteCommand();
+                            }
+                            else
+                            {
+                                item.Qty -= int.Parse(pickQty1);
+                                item.BitBoxMark = "1";//闆剁鏍囪瘑
+                                item.InspectMark = "1";//鎶芥绠辨爣璇�
+                                Db.Updateable(item).ExecuteCommand();
+                            }
+                        }
+                        pickQty += biaoShi == "2" ? int.Parse(pickQty1) : item.Qty;
+                    }
+
+
+                    //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
+                    if (biaoShi == "1")
+                    {
+                        var boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo3).ToList();
+                        foreach (var item in boxSurplusList)
+                        {
+                            item.BitBoxMark = "1";
+                            item.InspectMark = "1";
+                            Db.Updateable(item).ExecuteCommand();
+                        }
+                    }
+
+                    Db.Insertable(comList).ExecuteCommand();
+                    //淇敼鍑哄簱鍒嗛厤淇℃伅
+                    allot2.Qty += pickQty;
+                    allot2.CompleteQty += pickQty;
+                    Db.Updateable(allot2).ExecuteCommand();
+
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+                    stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+                    stockDetail.Qty -= pickQty;
+
+                    if (stockDetail.Qty <= 0)
+                    {
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                    stock.Qty -= pickQty;
+                    if (stock.Qty <= 0)
+                    {
+                        Db.Deleteable(stock).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stock).ExecuteCommand();
+                    }
+                    var num2 = Db.Queryable<DataStockDetail>().Count(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                    if (num2 <= 0)
+                    {
+                        //鏀瑰彉鎵樼洏鐘舵��
+                        var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                        if (pallet == null)
+                        {
+                            throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                        }
+                        pallet.Status = "0";
+                        Db.Updateable(pallet).ExecuteCommand();
+                    }
+                    //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                    noticeDetail.Qty += pickQty;
+                    noticeDetail.AllotQty += pickQty;
+                    noticeDetail.FactQty += pickQty;
+                    noticeDetail.CompleteQty += pickQty;
+                    noticeDetail.Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * noticeDetail.Qty;
+                    Db.Updateable(noticeDetail).ExecuteCommand();
+
+                }
+                else if (soType == "0")
+                {
+                    #region 鍒ゆ柇
+
+                    if (string.IsNullOrWhiteSpace(soNo))
+                    {
+                        throw new Exception("鍑哄簱鍗曟嵁涓嶈兘涓虹┖");
+                    }
+                    if (string.IsNullOrWhiteSpace(soDetailId))
+                    {
+                        throw new Exception("鍑哄簱鐗╂枡-鎵规涓嶈兘涓虹┖");
+                    }
+                    if (string.IsNullOrWhiteSpace(palletNo))
+                    {
+                        throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+                    }
+                    if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+                    {
+                        throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
+                    }
+
+                    //鍑哄簱鍗�
+                    var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == soNo);
+                    if (notice == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
+                    }
+                    if (notice.Status != "3")
+                    {
+                        throw new Exception("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+                    }
+                    //鍑哄簱鍗曟槑缁�
+                    var noticeDetail = Db.Queryable<BllExportNoticeDetail>()
+                        .First(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+                    if (noticeDetail == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
+                    }
+                    //鍑哄簱鍒嗛厤淇℃伅
+                    var allot = Db.Queryable<BllExportAllot>().First(m =>
+                        m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+                        m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+                    if (allot == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
+                    }
+                    //鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
+                    var needQty = allot.Qty - allot.CompleteQty;
+
+                    //搴撳瓨鏄庣粏
+                    var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == allot.StockId);
+                    if (stockDetail == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
+                    }
+                    //搴撳瓨鎬昏〃
+                    var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+                    if (stock == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+                    }
+
+                    #endregion
+
+                    var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暎鏀嫞璐с��2锛氭暟閲忔嫞璐�
+                    List<DataBoxInfo> boxInfos;
+                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+                    if (boxInfo.Count() == 0)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+                    }
+                    boxInfos = boxInfo.ToList();
+                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+                    if (!string.IsNullOrWhiteSpace(boxNo3)) //鏁ｆ敮鎷ｈ揣
+                    {
+                        boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
+
+                        if (boxInfos.Count() == 0)
+                        {
+                            throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+                        }
+                        if (boxInfos.Count() > 1)
+                        {
+                            throw new Exception("璇ヨ拷婧敮鐮佺殑淇℃伅澶т簬1鏉★紝淇℃伅閿欒锛岃鏍稿疄锛�");
+                        }
+
+                        if (boxInfos.Any(m => m.PalletNo != palletNo))
+                        {
+                            throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+                        }
+                        var boxQty = boxInfos.First().Qty;
+                        if (boxQty > needQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+                        }
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
+                        biaoShi = "1";
+                    }
+                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+                    {
+                        if (boxInfo.Count() > 1)
+                        {
+                            throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
+                        }
+                        int boxQty = boxInfo.First().Qty;
+                        if (Convert.ToInt32(pickQty1) > boxQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
+                        }
+                        if (Convert.ToInt32(pickQty1) > needQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+                        }
+
+                        biaoShi = "2";
+                    }
+                    else //鏁寸鎷ｈ揣
+                    {
+                        if (boxInfo.Count() == 0)
+                        {
+                            throw new Exception("鏈煡璇㈠埌璇ョ鐮佺殑淇℃伅");
+                        }
+                        if (boxInfo.Any(m => m.PalletNo != palletNo))
+                        {
+                            throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+                        }
+                        var boxQty = boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToList();
+                        if (boxQty[0] > needQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+                        }
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
+                    }
+                    var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+
+                    var comList = new List<BllCompleteDetail>();
+                    foreach (var item in boxInfos)
+                    {
+                        //if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                        //{
+                        //    throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                        //}
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        var completeDetail = new BllCompleteDetail()
+                        {
+                            SONo = soNo,
+                            SODetailNo = int.Parse(soDetailId),
+                            ExportAllotId = allot.Id,
+                            StockId = allot.StockId,
+                            BoxNo = item.BoxNo,
+                            BoxNo2 = item.BoxNo2,
+                            BoxNo3 = item.BoxNo3,
+
+                            LotNo = allot.LotNo,
+                            LotText = allot.LotText,
+                            SupplierLot = allot.SupplierLot,
+                            SkuNo = allot.SkuNo,
+                            SkuName = allot.SkuName,
+                            Standard = allot.Standard,
+                            PalletNo = palletNo,
+                            CompleteQty = biaoShi == "2" ? int.Parse(pickQty1) : item.Qty,
+
+                            CreateUser = userId
+                        };
+                        comList.Add(completeDetail);
+
+                        if (biaoShi != "2")
+                        {
+                            //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+                            Db.Deleteable(item).ExecuteCommand();
+                        }
+                        else//鏁伴噺鎷ｈ揣
+                        {
+                            if (int.Parse(pickQty1) == item.Qty)
+                            {
+                                //鍒犻櫎搴撳瓨绠辩爜鏄庣粏
+                                Db.Deleteable(item).ExecuteCommand();
+                            }
+                            else
+                            {
+                                item.Qty -= int.Parse(pickQty1);
+                                item.BitBoxMark = "1";//闆剁鏍囪瘑
+                                Db.Updateable(item).ExecuteCommand();
+                            }
+                        }
+                        pickQty += item.Qty;
+                    }
+                    //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
+                    if (biaoShi == "1")
+                    {
+                        var boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo3).ToList();
+                        foreach (var item in boxSurplusList)
+                        {
+                            item.BitBoxMark = "1";
+                            Db.Updateable(item).ExecuteCommand();
+                        }
+                    }
+
+                    Db.Insertable(comList).ExecuteCommand();
+                    //淇敼鍑哄簱鍒嗛厤淇℃伅
+                    allot.CompleteQty += pickQty;
+                    allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                    allot.UpdateTime = DateTime.Now;
+                    if (allot.Status == "5")
+                    {
+                        //鍒ゆ柇璇ユ墭鐩樻槸鍚﹁繕瀛樺湪鐗╂枡 瀛樺湪鏀逛负寰呭洖搴� 寰呭洖搴撳畬鎴愬悗鏀逛负宸插畬鎴�
+                    }
+                    Db.Updateable(allot).ExecuteCommand();
+
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+                    stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+                    stockDetail.Qty -= pickQty;
+                    stockDetail.LockQty -= pickQty;
+                    if (stockDetail.Qty == stockDetail.LockQty)
+                    {
+                        stockDetail.Status = "2";
+                    }
+                    else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+                    {
+                        stockDetail.Status = "1";
+                    }
+                    else
+                    {
+                        stockDetail.Status = "0";
+                    }
+
+                    if (stockDetail.Qty <= 0)
+                    {
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                    stock.Qty -= pickQty;
+                    stock.LockQty -= pickQty;
+                    if (stock.Qty <= 0)
+                    {
+                        Db.Deleteable(stock).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stock).ExecuteCommand();
+                    }
+                    var num2 = Db.Queryable<DataStockDetail>().Count(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                    if (num2 <= 0)
+                    {
+                        //鏀瑰彉鎵樼洏鐘舵��
+                        var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                        if (pallet == null)
+                        {
+                            throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                        }
+                        pallet.Status = "0";
+                        Db.Updateable(pallet).ExecuteCommand();
+                    }
+                    //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                    noticeDetail.CompleteQty += pickQty;
+                    Db.Updateable(noticeDetail).ExecuteCommand();
+
+                    var num = Db.Queryable<BllExportNoticeDetail>()
+                        .Count(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+                    if (num <= 0)
+                    {
+                        notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+                    }
+                    //淇敼鍑哄簱鍗曚俊鎭�
+                    Db.Updateable(notice).ExecuteCommand();
+                }
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
+                Db.CommitTran();
+            }
+            catch (Exception e)
+            {
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+
+        //鍙栨牱鍑哄簱鎷ｈ揣(鏃犳爣绛�)
+        public void SampleSoSetQtyPick(string soType, string soNo, string soDetailId, string palletNo, string PickQty, string asnNo, int userId)
+        {
+            Db.BeginTran();
+            try
+            {
+                if (string.IsNullOrWhiteSpace(soType))
+                {
+                    throw new Exception("鍙栨牱鏍囪瘑涓嶈兘涓虹┖");
+                }
+
+                if (soType == "1")
+                {
+                    if (string.IsNullOrWhiteSpace(asnNo))
+                    {
+                        throw new Exception("鍏ュ簱鍗曟嵁涓嶈兘涓虹┖");
+                    }
+                    if (string.IsNullOrWhiteSpace(palletNo))
+                    {
+                        throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+                    }
+                    //鍏堝垽鏂槸鍚︽槸搴撳鍙栨牱鎵樼洏
+                    var allot = Db.Queryable<BllExportAllot>().First(m =>
+                        m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
+                    if (allot != null)
+                    {
+                        throw new Exception("褰撳墠鎵樼洏涓嶅睘浜庡簱鍓嶅彇鏍�");
+                    }
+
+
+                    //搴撳瓨鏄庣粏
+                    var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNNo == asnNo && m.PalletNo == palletNo);
+                    if (stockDetail == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑搴撳瓨鏄庣粏淇℃伅锛�");
+                    }
+
+                    var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == stockDetail.SkuNo);
+                    if (sku == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌褰撳墠鎵樼洏涓婄殑鐗╂枡淇℃伅");
+                    }
+                    //搴撳瓨鎬昏〃
+                    var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+                    if (stock == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+                    }
+
+                    //鍑哄簱鍗�
+                    var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.AsnSampleNo == asnNo);
+                    //鍒涘缓鍑哄簱鍗�
+                    if (notice == null || notice.Status == "6")
+                    {
+                        var billNo = "";
+                        var bl = true;
+                        do
+                        {
+                            //鑾峰彇鑷鍗曟嵁鍙�
+                            billNo = new Common().GetMaxNo("SO");
+                            var no = billNo;
+                            bl = Db.Queryable<BllExportNotice>().Any(m => m.SONo == no);
+                        } while (bl);
+
+                        var addNotice = new BllExportNotice()
+                        {
+                            SONo = billNo,
+                            Type = "3",
+                            Status = "4",
+                            Origin = "WMS",
+                            AsnSampleNo = asnNo,
+                            IsWave = "0",
+                            WaveNo = "",
+                            IsDespatch = "0",
+                            CompleteTime = DateTime.Now,
+                            CreateUser = userId,
+                        };
+
+                        var n = Db.Insertable(addNotice).ExecuteReturnEntity();
+                        notice = n;
+                    }
+
+                    //鍒涘缓鍑哄簱鍗曟槑缁�
+                    var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(m => m.IsDel == "0" && m.SONo == notice.SONo && m.SkuNo == stockDetail.SkuNo && m.LotNo.Contains(stockDetail.LotNo));
+                    if (noticeDetail == null)
+                    {
+                        var addNoticeDetail = new BllExportNoticeDetail()
+                        {
+                            SONo = notice.SONo,
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            LotNo = stockDetail.LotNo,
+                            LotText = "",
+                            Qty = 0,
+                            AllotQty = 0,
+                            FactQty = 0,
+                            CompleteQty = 0,
+                            PackagNo = sku.PackagNo,
+                            Price = sku.Price,
+                            //Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * pickQty,
+                            IsBale = "",
+                            IsBelt = "",
+                            SupplierLot = stock.SupplierLot,
+                            IsWave = "0",
+                            WaveNo = "",
+                            IsIssueLotNo = "0",
+                            Status = "3",
+                            CreateUser = userId,
+
+                        };
+                        var m = Db.Insertable(addNoticeDetail).ExecuteReturnEntity();
+                        noticeDetail = m;
+                    }
+                    //鍑哄簱鍒嗛厤淇℃伅
+                    var allot2 = Db.Queryable<BllExportAllot>().First(m => m.IsDel == "0" && m.Status == "5" && m.SONo == notice.SONo && m.PalletNo == palletNo);
+                    if (allot2 == null)
+                    {
+                        //娣诲姞鍒嗛厤琛ㄤ俊鎭�
+                        var addAllot = new BllExportAllot
+                        {
+                            SONo = notice.SONo,
+                            WaveNo = "",
+                            SODetailNo = noticeDetail.Id,
+                            StockId = stockDetail.Id,
+                            LotNo = stockDetail.LotNo,
+                            LotText = stockDetail.LotText,
+                            SupplierLot = stockDetail.SupplierLot,
+                            SkuNo = sku.SkuNo,
+                            SkuName = sku.SkuName,
+                            Standard = sku.Standard,
+                            PalletNo = palletNo,
+                            IsBale = "0", //鏄惁瑁瑰寘
+                            IsBelt = "0", //鏄惁鎵撳甫
+
+                            Qty = 0,
+                            CompleteQty = 0,
+
+                            Status = "5",
+                            LogisticsId = notice.LogisticsId,
+                            IsAdvance = "0",
+                            OutMode = "",//鍑哄簱鍙�
+
+                            CreateUser = userId,
+                            UpdateTime = DateTime.Now
+                        };
+
+                        var fp = Db.Insertable(addAllot).ExecuteReturnEntity();
+                        allot2 = fp;
+                    }
+
+                    //鑾峰彇褰撳墠鎵樼洏鎷ｈ揣鏄庣粏
+                    var complete = Db.Queryable<BllCompleteDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo && a.SONo == notice.SONo && a.ExportAllotId == allot2.Id && a.StockId == stockDetail.Id);
+
+                    //鍒よ鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                    int isComplete = 0;
+                    if (complete != null)
+                    {
+                        isComplete = 1;
+                    }
+
+                    var comList = new List<BllCompleteDetail>();
+                    //鍒ゆ柇鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                    if (isComplete == 0)
+                    {
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        var completeDetail = new BllCompleteDetail()
+                        {
+                            SONo = notice.SONo,
+                            SODetailNo = noticeDetail.Id,
+                            ExportAllotId = allot2.Id,
+                            StockId = allot2.StockId,
+                            BoxNo = "",
+                            BoxNo2 = "",
+                            BoxNo3 = "",
+
+                            LotNo = allot2.LotNo,
+                            LotText = allot2.LotText,
+                            SupplierLot = allot2.SupplierLot,
+                            SkuNo = allot2.SkuNo,
+                            SkuName = allot2.SkuName,
+                            Standard = allot2.Standard,
+                            PalletNo = palletNo,
+                            CompleteQty = int.Parse(PickQty),
+                            InspectMark = "1",
+
+                            CreateUser = userId
+                        };
+                        comList.Add(completeDetail);
+
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        Db.Insertable(comList).ExecuteCommand();
+                    }
+                    else if (isComplete == 1)
+                    {
+                        complete.CompleteQty += int.Parse(PickQty);
+                        complete.UpdateUser = userId;
+                        complete.UpdateTime = Db.GetDate();
+
+                        Db.Updateable(complete).ExecuteCommand();
+                    }
+
+
+
+                    //淇敼鍑哄簱鍒嗛厤淇℃伅
+                    allot2.Qty += int.Parse(PickQty);
+                    allot2.CompleteQty += int.Parse(PickQty);
+                    Db.Updateable(allot2).ExecuteCommand();
+
+                    int isDel = 0;
+
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+                    stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+                    stockDetail.InspectMark = "1";//淇敼涓烘娊妫�鎵樻爣璇�
+                    stockDetail.Qty -= int.Parse(PickQty);
+                    if (stockDetail.Qty == stockDetail.LockQty && stockDetail.Qty != 0)
+                    {
+                        stockDetail.Status = "2";
+                    }
+                    else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+                    {
+                        stockDetail.Status = "1";
+                    }
+                    else
+                    {
+                        stockDetail.Status = "0";
+                    }
+                    if (stockDetail.Qty <= 0)
+                    {
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        isDel = 1;
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛�
+                    stock.Qty -= int.Parse(PickQty);
+                    if (stock.Qty <= 0)
+                    {
+                        Db.Deleteable(stock).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stock).ExecuteCommand();
+                    }
+
+                    //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+                    var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                    if (pallet == null)
+                    {
+                        throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                    }
+
+                    //鍒ゆ柇鎵樼洏涓婄墿鏂欐槸鍚︽嫞璐у畬姣�
+                    if (isDel == 0)
+                    {
+                        pallet.Status = "0";
+                        Db.Updateable(pallet).ExecuteCommand();
+                    }
+
+                    //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                    noticeDetail.Qty += int.Parse(PickQty);
+                    noticeDetail.AllotQty += int.Parse(PickQty);
+                    noticeDetail.FactQty += int.Parse(PickQty);
+                    noticeDetail.CompleteQty += int.Parse(PickQty);
+                    noticeDetail.Money = string.IsNullOrWhiteSpace(sku.Price.ToString()) ? null : sku.Price * noticeDetail.Qty;
+                    Db.Updateable(noticeDetail).ExecuteCommand();
+
+                }
+                else if (soType == "0")
+                {
+                    #region 鍒ゆ柇
+
+                    if (string.IsNullOrWhiteSpace(soNo))
+                    {
+                        throw new Exception("鍑哄簱鍗曟嵁涓嶈兘涓虹┖");
+                    }
+                    //if (string.IsNullOrWhiteSpace(soDetailId))
+                    //{
+                    //    throw new Exception("鍑哄簱鐗╂枡-鎵规涓嶈兘涓虹┖");
+                    //}
+                    if (string.IsNullOrWhiteSpace(palletNo))
+                    {
+                        throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+                    }
+
+                    //鍑哄簱鍗�
+                    var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == soNo);
+                    if (notice == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
+                    }
+                    if (notice.Status != "3")
+                    {
+                        throw new Exception("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+                    }
+                    //鍑哄簱鍗曟槑缁�
+                    var noticeDetail = Db.Queryable<BllExportNoticeDetail>()
+                        .First(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+                    if (noticeDetail == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
+                    }
+                    //鍑哄簱鍒嗛厤淇℃伅
+                    var allot = Db.Queryable<BllExportAllot>().First(m =>
+                        m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+                        m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+                    if (allot == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
+                    }
+                    //鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
+                    var needQty = allot.Qty - allot.CompleteQty;
+                    if (int.Parse(PickQty) > needQty)
+                    {
+                        throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鎵樺唴鍓╀綑寰呮嫞鏁伴噺");
+                    }
+
+                    //搴撳瓨鏄庣粏
+                    var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == allot.StockId);
+                    if (stockDetail == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
+                    }
+                    //搴撳瓨鎬昏〃
+                    var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+                    if (stock == null)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+                    }
+                    #endregion
+                    //鑾峰彇褰撳墠鎵樼洏鎷ｈ揣鏄庣粏
+                    var complete = Db.Queryable<BllCompleteDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.ExportAllotId == allot.Id && a.StockId == stockDetail.Id);
+
+                    //鍒よ鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                    int isComplete = 0;
+                    if (complete != null)
+                    {
+                        isComplete = 1;
+                    }
+
+                    var comList = new List<BllCompleteDetail>();
+                    //鍒ゆ柇鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                    if (isComplete == 0)
+                    {
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        var completeDetail = new BllCompleteDetail()
+                        {
+                            SONo = soNo,
+                            SODetailNo = int.Parse(soDetailId),
+                            ExportAllotId = allot.Id,
+                            StockId = allot.StockId,
+                            BoxNo = "",
+                            BoxNo2 = "",
+                            BoxNo3 = "",
+
+                            LotNo = allot.LotNo,
+                            LotText = allot.LotText,
+                            SupplierLot = allot.SupplierLot,
+                            SkuNo = allot.SkuNo,
+                            SkuName = allot.SkuName,
+                            Standard = allot.Standard,
+                            PalletNo = palletNo,
+                            CompleteQty = int.Parse(PickQty),
+
+                            CreateUser = userId,
+                            CreateTime = Db.GetDate(),
+                        };
+                        comList.Add(completeDetail);
+
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        Db.Insertable(comList).ExecuteCommand();
+                    }
+                    else if (isComplete == 1)
+                    {
+                        complete.CompleteQty += int.Parse(PickQty);
+                        complete.UpdateUser = userId;
+                        complete.UpdateTime = Db.GetDate();
+
+                        Db.Updateable(complete).ExecuteCommand();
+                    }
+
+
+
+                    //淇敼鍑哄簱鍒嗛厤淇℃伅
+                    allot.CompleteQty += int.Parse(PickQty);
+                    allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+
+                    allot.UpdateTime = DateTime.Now;
+                    Db.Updateable(allot).ExecuteCommand();
+
+                    int isDel = 0;
+
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+                    stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+                    stockDetail.Qty -= int.Parse(PickQty);
+                    stockDetail.LockQty -= int.Parse(PickQty);
+                    if (stockDetail.Qty == stockDetail.LockQty)
+                    {
+                        stockDetail.Status = "2";
+                    }
+                    else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+                    {
+                        stockDetail.Status = "1";
+                    }
+                    else
+                    {
+                        stockDetail.Status = "0";
+                    }
+                    if (stockDetail.Qty <= 0)
+                    {
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        isDel = 1;
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛�
+                    stock.Qty -= int.Parse(PickQty);
+                    stock.LockQty -= int.Parse(PickQty);
+                    if (stock.Qty <= 0)
+                    {
+                        Db.Deleteable(stock).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stock).ExecuteCommand();
+                    }
+
+                    //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+                    var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                    if (pallet == null)
+                    {
+                        throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                    }
+
+                    //鍒ゆ柇鎵樼洏涓婄墿鏂欐槸鍚︽嫞璐у畬姣�
+                    if (isDel == 0)
+                    {
+                        pallet.Status = "0";
+                        Db.Updateable(pallet).ExecuteCommand();
+                    }
+
+                    //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                    noticeDetail.CompleteQty += int.Parse(PickQty);
+                    Db.Updateable(noticeDetail).ExecuteCommand();
+
+                    var num = Db.Queryable<BllExportNoticeDetail>()
+                        .Count(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+                    if (num <= 0)
+                    {
+                        notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+                    }
+                    //淇敼鍑哄簱鍗曚俊鎭�
+                    Db.Updateable(notice).ExecuteCommand();
+
+                }
+
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
+                Db.CommitTran();
+            }
+            catch (Exception e)
+            {
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+
+        #region 鎷ｈ揣鎷兼墭
+        /// <summary>
+        /// 鎷兼墭鍑哄簱pda鎷ｈ揣-鏍囩
+        /// </summary>
+        /// <param name="soNo"></param>
+        /// <param name="soDetailId"></param>
+        /// <param name="palletNo"></param>
+        /// <param name="boxNo"></param>
+        /// <param name="boxNo3"></param>
+        /// <param name="pickQty1"></param>
+        /// <param name="palletNoNew"></param>
+        /// <param name="userId"></param>
+        public void SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string pickQty1, string palletNoNew, int userId)
+        {
+            Db.BeginTran();
+            try
+            {
+                var nowDate = DateTime.Now;//褰撳墠鏃堕棿
+                #region 鍒ゆ柇
+
+                if (string.IsNullOrWhiteSpace(soNo))
+                {
+                    throw new Exception("鍑哄簱鍗曟嵁涓嶈兘涓虹┖");
+                }
+                if (string.IsNullOrWhiteSpace(soDetailId))
+                {
+                    throw new Exception("鍑哄簱鐗╂枡-鎵规涓嶈兘涓虹┖");
+                }
+                if (string.IsNullOrWhiteSpace(palletNo))
+                {
+                    throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+                }
+                if (!string.IsNullOrEmpty(boxNo3) && !string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)
+                {
+                    throw new Exception("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏�");
+                }
+                if (string.IsNullOrWhiteSpace(palletNoNew))
+                {
+                    throw new Exception("鏂版墭鐩樼爜涓嶈兘涓虹┖");
+                }
+                if (palletNo == palletNoNew)//鍘熸墭鐩樹笌鏂版墭鐩樹竴鑷�
+                {
+                    if (!string.IsNullOrEmpty(boxNo))
+                    {
+                        throw new Exception("鍘熸墭鐩樹笌鏂版墭鐩樹竴鑷达紝璇烽�夋嫨鏁存墭鍑哄簱");
+                    }
+                }
+
+                //鍑哄簱鍗�
+                var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == soNo);
+                if (notice == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
+                }
+                if (notice.Status != "3")
+                {
+                    throw new Exception("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+                }
+                //鍑哄簱鍗曟槑缁�
+                var noticeDetail = Db.Queryable<BllExportNoticeDetail>()
+                    .First(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+                if (noticeDetail == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
+                }
+                //鍑哄簱鍒嗛厤淇℃伅
+                var allot = Db.Queryable<BllExportAllot>().First(m =>
+                    m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+                    m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+                if (allot == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
+                }
+                //鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
+                var needQty = allot.Qty - allot.CompleteQty;
+
+                //搴撳瓨鏄庣粏
+                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == allot.StockId);
+                if (stockDetail == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
+                }
+                //搴撳瓨鎬昏〃
+                var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+                if (stock == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+                }
+
+                #endregion
+
+                #region 鎷兼墭淇℃伅
+                var sdId = 0;
+                bool isNew = false;
+                var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+                if (pinStockDetail != null)
+                {
+                    if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
+                    {
+                        if (pinStockDetail.SONo != notice.SONo)
+                        {
+                            throw new Exception("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
+                        }
+                        if (pinStockDetail.SkuName != stockDetail.SkuName || pinStockDetail.LotNo != stockDetail.LotNo)
+                        {
+                            isNew = true;
+                        }
+                    }
+                    sdId = pinStockDetail.Id;
+                }
+                else
+                {
+                    isNew = true;
+
+                    var newPalletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
+                    if (newPalletInfo == null)
+                    {
+                        throw new Exception("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
+                    }
+                    //淇敼鏂版墭鐩樼姸鎬�
+                    newPalletInfo.Status = "1";
+                    Db.Updateable(newPalletInfo).ExecuteCommand();
+                }
+                var sd = new DataStockDetail();
+                if (isNew)
+                {
+                    sd.LotNo = stockDetail.LotNo;
+                    sd.LotText = stockDetail.LotText;
+                    sd.SupplierLot = stockDetail.SupplierLot;
+                    sd.SkuNo = stockDetail.SkuNo;
+                    sd.SkuName = stockDetail.SkuName;
+                    sd.Standard = stockDetail.Standard;
+
+                    sd.FrozenQty = 0;
+                    sd.InspectQty = 0;
+                    sd.ASNNo = "";
+                    sd.ASNDetailNo = null;
+                    sd.SONo = soNo;//鍑哄簱鍗曞彿
+                    sd.WareHouseNo = "";
+                    sd.RoadwayNo = "";
+                    sd.AreaNo = "";
+                    sd.LocatNo = "";
+                    sd.PalletNo = palletNoNew;
+                    sd.PalletNo2 = "";
+                    sd.PalletNo3 = "";
+                    //PalletType = item.PalletType,
+                    sd.CompleteTime = nowDate;
+                    sd.ProductionTime = stockDetail.ProductionTime;
+                    sd.ExpirationTime = stockDetail.ExpirationTime;
+                    sd.Status = "2";//鐘舵�侊紝宸插垎閰�
+                    sd.InspectMark = stockDetail.InspectMark;
+                    sd.InspectStatus = stockDetail.InspectStatus;
+                    sd.BitPalletMark = "0";
+                    sd.PackagNo = noticeDetail.PackagNo;
+                    sd.IsBale = stockDetail.IsBale;
+                    sd.IsBelt = stockDetail.IsBelt;
+                    sd.Demo = stockDetail.Demo;
+                    sd.OwnerName = stockDetail.OwnerName;
+                    sd.OwnerNo = stockDetail.OwnerNo;
+                    sd.SupplierName = stockDetail.SupplierName;
+                    sd.SupplierNo = stockDetail.SupplierNo;
+
+                    sd.IsDel = "0";
+                    sd.CreateUser = userId;
+                    sd.CreateTime = nowDate;
+
+                    //鏂板鎷兼墭搴撳瓨鏄庣粏淇℃伅
+                    sdId = Db.Insertable(sd).ExecuteReturnIdentity();
+                }
+                #endregion
+
+                var pickQty = 0;//鎷ｈ揣鐨勬暟閲�
+                if (string.IsNullOrWhiteSpace(boxNo))//鏁存墭鎷ｈ揣
+                {
+                    List<DataBoxInfo> boxInfos;
+                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo);//鎵惧埌鎵樼洏涓婃墍鏈夌鐮�
+                    boxInfos = boxInfo.ToList();
+                    if (boxInfo.Count() <= 0)
+                    {
+                        throw new Exception("璇ユ墭鐩樹笂娌℃湁鍙嫞璐х殑绠卞瓙");
+                    }
+                    var boxQty = boxInfo.GroupBy(m => m.PalletNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToList();
+                    if (boxQty[0] > needQty)
+                    {
+                        throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+                    }
+
+                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+                    var comList = new List<BllCompleteDetail>();
+                    foreach (var item in boxInfos)
+                    {
+                        if (comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                        {
+                            throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                        }
+                        if (item.SkuNo != allot.SkuNo || item.LotNo != allot.LotNo)
+                        {
+                            throw new Exception("褰撳墠鎵樼洏涓婃湁鍏朵粬涓嶅悓鐗╂枡鎵规锛屾嫞璐уけ璐�");
+                        }
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        var completeDetail = new BllCompleteDetail()
+                        {
+                            SONo = soNo,
+                            SODetailNo = int.Parse(soDetailId),
+                            ExportAllotId = allot.Id,
+                            StockId = allot.StockId,
+                            BoxNo = item.BoxNo,
+                            BoxNo2 = item.BoxNo2,
+                            BoxNo3 = item.BoxNo3,
+
+                            LotNo = allot.LotNo,
+                            LotText = allot.LotText,
+                            SupplierLot = allot.SupplierLot,
+                            SkuNo = allot.SkuNo,
+                            SkuName = allot.SkuName,
+                            Standard = allot.Standard,
+                            PalletNo = palletNo,
+                            CompleteQty = item.Qty,
+
+                            CreateUser = userId
+                        };
+                        comList.Add(completeDetail);
+                        
+                        if (palletNo != palletNoNew)
+                        {
+                            item.StockDetailId = sdId;
+                            item.BindNo = null;//鎵樼洏缁戝畾鍙�
+                            item.PalletNo = palletNoNew;
+                        }
+                        item.Status = "5";//绠辨敮鐘舵�侊紝0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
+                        //淇敼搴撳瓨绠辩爜鏄庣粏
+                        Db.Updateable(item).ExecuteCommand();
+
+                        pickQty += item.Qty;
+                    }
+                    //娣诲姞鎷ｈ揣鏄庣粏
+                    Db.Insertable(comList).ExecuteCommand();
+                    //淇敼鍑哄簱鍒嗛厤淇℃伅
+                    allot.CompleteQty += pickQty;
+                    allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                    allot.UpdateTime = DateTime.Now;
+                    Db.Updateable(allot).ExecuteCommand();
+
+                    if (palletNo != palletNoNew)
+                    {
+                        //鍒犻櫎鍘熸墭鐩樺簱瀛樻槑缁�
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+
+                        //鏀瑰彉鍘熸墭鐩樼姸鎬佷负锛氭湭浣跨敤
+                        var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                        if (pallet == null)
+                        {
+                            throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                        }
+                        pallet.Status = "0";
+                        Db.Updateable(pallet).ExecuteCommand();
+                    }
+                    else
+                    {
+                        stockDetail.SONo = soNo;
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                   
+                    //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                    noticeDetail.CompleteQty += pickQty;
+                    Db.Updateable(noticeDetail).ExecuteCommand();
+
+                    var num = Db.Queryable<BllExportNoticeDetail>()
+                        .Count(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+                    if (num <= 0)
+                    {
+                        notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+                    }
+                    //淇敼鍑哄簱鍗曚俊鎭�
+                    Db.Updateable(notice).ExecuteCommand();
+                }
+                else
+                {
+                    var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暎鏀嫞璐с��2锛氭暟閲忔嫞璐�
+                    List<DataBoxInfo> boxInfos;
+                    var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+                    if (boxInfo.Count() == 0)
+                    {
+                        throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+                    }
+                    boxInfos = boxInfo.ToList();
+
+                    var comDetailList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allot.Id && m.PalletNo == palletNo).ToList();
+                    if (!string.IsNullOrWhiteSpace(boxNo3)) //鏁ｆ敮鎷ｈ揣
+                    {
+                        boxInfos = boxInfos.Where(m => m.BoxNo3 == boxNo3).ToList();
+
+                        if (boxInfos.Count() == 0)
+                        {
+                            throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
+                        }
+                        if (boxInfos.Count() > 1)
+                        {
+                            throw new Exception("璇ヨ拷婧敮鐮佺殑淇℃伅澶т簬1鏉★紝淇℃伅閿欒锛岃鏍稿疄锛�");
+                        }
+
+                        if (boxInfos.Any(m => m.PalletNo != palletNo))
+                        {
+                            throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+                        }
+                        var boxQty = boxInfos.First().Qty;
+                        if (boxQty > needQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+                        }
+
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo3 == item.BoxNo3))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}涓瓄item.BoxNo3}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
+
+                        biaoShi = "1";
+                    }
+                    else if (!string.IsNullOrEmpty(pickQty1) && int.Parse(pickQty1) > 0)//鏁伴噺鎷ｈ揣
+                    {
+                        if (boxInfo.Count() > 1)
+                        {
+                            throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
+                        }
+                        int boxQty = boxInfo.First().Qty;
+                        if (Convert.ToInt32(pickQty1) > boxQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
+                        }
+                        if (Convert.ToInt32(pickQty1) > needQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
+                        }
+
+                        biaoShi = "2";
+                    }
+                    else //鏁寸鎷ｈ揣
+                    {
+                        if (boxInfo.Count() == 0)
+                        {
+                            throw new Exception("鏈煡璇㈠埌璇ョ鐮佺殑淇℃伅");
+                        }
+                        if (boxInfo.Any(m => m.PalletNo != palletNo))
+                        {
+                            throw new Exception("璇ユ墭鐩樹笌绠辩爜娌℃湁缁戝畾鍏崇郴");
+                        }
+                        var boxQty = boxInfo.GroupBy(m => m.BoxNo).Select(m => SqlFunc.AggregateSum(m.Qty)).ToList();
+                        if (boxQty[0] > needQty)
+                        {
+                            throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鍓╀綑寰呮嫞鏁伴噺");
+                        }
+
+                        foreach (var item in boxInfos)
+                        {
+                            if (biaoShi != "2" && comDetailList.Any(m => m.BoxNo == item.BoxNo))
+                            {
+                                throw new Exception($"褰撳墠{item.BoxNo}宸叉嫞璐у畬鎴愶紝璇峰嬁閲嶅鎷ｈ揣");
+                            }
+                        }
+                    }
+
+                    var comList = new List<BllCompleteDetail>();
+                    foreach (var item in boxInfos)
+                    {
+                        //娣诲姞鎷ｈ揣鏄庣粏
+                        var completeDetail = new BllCompleteDetail()
+                        {
+                            SONo = soNo,
+                            SODetailNo = int.Parse(soDetailId),
+                            ExportAllotId = allot.Id,
+                            StockId = allot.StockId,
+                            BoxNo = item.BoxNo,
+                            BoxNo2 = item.BoxNo2,
+                            BoxNo3 = item.BoxNo3,
+
+                            LotNo = allot.LotNo,
+                            LotText = allot.LotText,
+                            SupplierLot = allot.SupplierLot,
+                            SkuNo = allot.SkuNo,
+                            SkuName = allot.SkuName,
+                            Standard = allot.Standard,
+                            PalletNo = palletNo,
+                            CompleteQty = biaoShi == "2" ? int.Parse(pickQty1) : item.Qty,
+
+                            CreateUser = userId
+                        };
+                        comList.Add(completeDetail);
+
+                        if (biaoShi == "0")//鏁寸鎷ｈ揣
+                        {
+                            //淇敼搴撳瓨绠辩爜鏄庣粏
+                            item.StockDetailId = sdId;
+                            item.BindNo = null;//鎵樼洏缁戝畾鍙�
+                            item.PalletNo = palletNoNew;
+                            item.Status = "5";//绠辨敮鐘舵�侊紝0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
+                            Db.Updateable(item).ExecuteCommand();
+
+                            pickQty += item.Qty;
+                        }
+                        else if (biaoShi == "1")//鏁ｆ敮鎷ｈ揣
+                        {
+                            //淇敼搴撳瓨绠辩爜鏄庣粏
+                            item.StockDetailId = sdId;
+                            item.BindNo = null;//鎵樼洏缁戝畾鍙�
+                            item.PalletNo = palletNoNew;
+                            item.BoxNo = item.BoxNo3;//灏嗘敮鐮佽祴缁欑鐮�
+                            item.BitBoxMark = "1";//闆剁鏍囪
+                            item.Status = "5";//绠辨敮鐘舵�侊紝0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
+                            Db.Updateable(item).ExecuteCommand();
+
+                            pickQty += item.Qty;
+                        }
+                        else//鏁伴噺鎷ｈ揣
+                        {
+                            if (int.Parse(pickQty1) == item.Qty)
+                            {
+                                //淇敼搴撳瓨绠辩爜鏄庣粏
+                                item.StockDetailId = sdId;
+                                item.BindNo = null;//鎵樼洏缁戝畾鍙�
+                                item.PalletNo = palletNoNew;
+                                item.Status = "5";//绠辨敮鐘舵�侊紝0锛氭湭缁勬墭  1锛氬凡缁勬墭 2锛氬凡鍏ュ簱 3锛氬凡鍑哄簱 4:宸插垎閰� 5锛氬凡鎷ｈ揣
+                                Db.Updateable(item).ExecuteCommand();
+                            }
+                            else
+                            {
+                                item.Qty -= int.Parse(pickQty1);
+                                item.BitBoxMark = "1";//闆剁鏍囪瘑
+                                Db.Updateable(item).ExecuteCommand();
+                            }
+
+                            pickQty += int.Parse(pickQty1);
+                        }
+                    }
+                    //鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
+                    if (biaoShi == "1")
+                    {
+                        var boxSurplusList = boxInfo.Where(m => m.BoxNo3 != boxNo3).ToList();
+                        foreach (var item in boxSurplusList)
+                        {
+                            item.BitBoxMark = "1";
+                            Db.Updateable(item).ExecuteCommand();
+                        }
+                    }
+
+                    Db.Insertable(comList).ExecuteCommand();
+                    //淇敼鍑哄簱鍒嗛厤淇℃伅
+                    allot.CompleteQty += pickQty;
+                    allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                    allot.UpdateTime = DateTime.Now;
+                    if (allot.Status == "5")
+                    {
+                        //鍒ゆ柇璇ユ墭鐩樻槸鍚﹁繕瀛樺湪鐗╂枡 瀛樺湪鏀逛负寰呭洖搴� 寰呭洖搴撳畬鎴愬悗鏀逛负宸插畬鎴�
+                    }
+                    Db.Updateable(allot).ExecuteCommand();
+
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+                    stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+                    stockDetail.Qty -= pickQty;
+                    stockDetail.LockQty -= pickQty;
+                    if (stockDetail.Qty == stockDetail.LockQty)
+                    {
+                        stockDetail.Status = "2";
+                    }
+                    else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+                    {
+                        stockDetail.Status = "1";
+                    }
+                    else
+                    {
+                        stockDetail.Status = "0";
+                    }
+
+                    if (stockDetail.Qty <= 0)
+                    {
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                    var num2 = Db.Queryable<DataStockDetail>().Count(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                    if (num2 <= 0)
+                    {
+                        //鏀瑰彉鎵樼洏鐘舵��
+                        var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                        if (pallet == null)
+                        {
+                            throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                        }
+                        pallet.Status = "0";
+                        Db.Updateable(pallet).ExecuteCommand();
+                    }
+                    //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                    noticeDetail.CompleteQty += pickQty;
+                    Db.Updateable(noticeDetail).ExecuteCommand();
+
+                    var num = Db.Queryable<BllExportNoticeDetail>()
+                        .Count(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+                    if (num <= 0)
+                    {
+                        notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+                    }
+                    //淇敼鍑哄簱鍗曚俊鎭�
+                    Db.Updateable(notice).ExecuteCommand();
+                }
+
+                if (isNew)
+                {
+                    sd.Qty = pickQty;
+                    sd.LockQty = pickQty;
+                }
+                else
+                {
+                    if (palletNo != palletNoNew)
+                    {
+                        //淇敼鎷兼墭鎵樼洏搴撳瓨鏄庣粏
+                        pinStockDetail.Qty += pickQty;
+                        pinStockDetail.LockQty += pickQty;
+                        Db.Updateable(pinStockDetail).ExecuteCommand();
+                    }
+                }
+                
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鎷兼墭", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勫師鎵樼洏鐮佷负锛歿palletNo}锛屾柊鎵樼洏鐮佷负锛歿palletNoNew}鐨勬嫞璐ф嫾鎵樻搷浣�", userId);
+                Db.CommitTran();
+            }
+            catch (Exception e)
+            {
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+        /// <summary>
+        /// 鎷兼墭鍑哄簱pda鎷ｈ揣-鏁伴噺
+        /// </summary>
+        /// <param name="soNo"></param>
+        /// <param name="soDetailId"></param>
+        /// <param name="palletNo"></param>
+        /// <param name="PickQty"></param>
+        /// <param name="palletNoNew"></param>
+        /// <param name="userId"></param>
+        public void SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId)
+        {
+            Db.BeginTran();
+            try
+            {
+                var nowDate = DateTime.Now;//褰撳墠鏃堕棿
+                #region 鍒ゆ柇
+
+                if (string.IsNullOrWhiteSpace(soNo))
+                {
+                    throw new Exception("鍑哄簱鍗曟嵁涓嶈兘涓虹┖");
+                }
+                //if (string.IsNullOrWhiteSpace(soDetailId))
+                //{
+                //    throw new Exception("鍑哄簱鐗╂枡-鎵规涓嶈兘涓虹┖");
+                //}
+                if (string.IsNullOrWhiteSpace(palletNo))
+                {
+                    throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+                }
+                if (string.IsNullOrWhiteSpace(palletNoNew))
+                {
+                    throw new Exception("鏂版墭鐩樼爜涓嶈兘涓虹┖");
+                }
+
+                //鍑哄簱鍗�
+                var notice = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == soNo);
+                if (notice == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
+                }
+                if (notice.Status != "3")
+                {
+                    throw new Exception("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+                }
+                //鍑哄簱鍗曟槑缁�
+                var noticeDetail = Db.Queryable<BllExportNoticeDetail>()
+                    .First(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
+                if (noticeDetail == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ュ嚭搴撳崟鏄庣粏鐨勪俊鎭�");
+                }
+                //鍑哄簱鍒嗛厤淇℃伅
+                var allot = Db.Queryable<BllExportAllot>().First(m =>
+                    m.IsDel == "0" && (m.Status == "2" || m.Status == "3") && m.SONo == soNo &&
+                    m.SODetailNo == int.Parse(soDetailId) && m.PalletNo == palletNo);
+                if (allot == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑鍒嗛厤淇℃伅");
+                }
+                //鍓╀綑鎷ｈ揣鏁伴噺锛堝緟鎷ｅ噺鍘诲凡鎷ｏ級
+                var needQty = allot.Qty - allot.CompleteQty;
+                if (int.Parse(PickQty) > needQty)
+                {
+                    throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鎵樺唴鍓╀綑寰呮嫞鏁伴噺");
+                }
+
+                //搴撳瓨鏄庣粏
+                var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == allot.StockId);
+                if (stockDetail == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨鏄庣粏淇℃伅锛�");
+                }
+                //搴撳瓨鎬昏〃
+                var stock = Db.Queryable<DataStock>().First(a => a.IsDel == "0" && a.SkuNo == stockDetail.SkuNo && a.LotNo == stockDetail.LotNo);
+                if (stock == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樺垎閰嶇殑搴撳瓨淇℃伅锛�");
+                }
+                if (palletNo == palletNoNew)//鍘熸墭鐩樹笌鏂版墭鐩樹竴鑷�
+                {
+                    if (int.Parse(PickQty) != stockDetail.Qty)
+                    {
+                        throw new Exception("鍘熸墭鐩樹笌鏂版墭鐩樹竴鑷达紝闇�瑕佹妸鎵樼洏涓婃墍鏈夋暟閲忔嫞璐�");
+                    }
+                }
+                #endregion
+
+                #region 鎷兼墭淇℃伅
+                bool isNew = false;
+                var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+                if (pinStockDetail != null)
+                {
+                    if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
+                    {
+                        if (pinStockDetail.SONo != notice.SONo)
+                        {
+                            throw new Exception("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
+                        }
+                        if (pinStockDetail.SkuName != stockDetail.SkuName || pinStockDetail.LotNo != stockDetail.LotNo)
+                        {
+                            isNew = true;
+                        }
+                    }
+                }
+                else
+                {
+                    isNew = true;
+
+                    var newPalletInfo = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
+                    if (newPalletInfo == null)
+                    {
+                        throw new Exception("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
+                    }
+                    //淇敼鏂版墭鐩樼姸鎬�
+                    newPalletInfo.Status = "1";
+                    Db.Updateable(newPalletInfo).ExecuteCommand();
+                }
+
+                if (isNew)
+                {
+                    var sd = new DataStockDetail();
+
+                    sd.LotNo = stockDetail.LotNo;
+                    sd.LotText = stockDetail.LotText;
+                    sd.SupplierLot = stockDetail.SupplierLot;
+                    sd.SkuNo = stockDetail.SkuNo;
+                    sd.SkuName = stockDetail.SkuName;
+                    sd.Standard = stockDetail.Standard;
+
+                    sd.Qty = int.Parse(PickQty);
+                    sd.LockQty = int.Parse(PickQty);
+
+                    sd.FrozenQty = 0;
+                    sd.InspectQty = 0;
+                    sd.ASNNo = "";
+                    sd.ASNDetailNo = null;
+                    sd.SONo = soNo;//鍑哄簱鍗曞彿
+                    sd.WareHouseNo = "";
+                    sd.RoadwayNo = "";
+                    sd.AreaNo = "";
+                    sd.LocatNo = "";
+                    sd.PalletNo = palletNoNew;
+                    sd.PalletNo2 = "";
+                    sd.PalletNo3 = "";
+                    //PalletType = item.PalletType,
+                    sd.CompleteTime = nowDate;
+                    sd.ProductionTime = stockDetail.ProductionTime;
+                    sd.ExpirationTime = stockDetail.ExpirationTime;
+                    sd.Status = "2";//鐘舵�侊紝宸插垎閰�
+                    sd.InspectMark = stockDetail.InspectMark;
+                    sd.InspectStatus = stockDetail.InspectStatus;
+                    sd.BitPalletMark = "0";
+                    sd.PackagNo = noticeDetail.PackagNo;
+                    sd.IsBale = stockDetail.IsBale;
+                    sd.IsBelt = stockDetail.IsBelt;
+                    sd.Demo = stockDetail.Demo;
+                    sd.OwnerName = stockDetail.OwnerName;
+                    sd.OwnerNo = stockDetail.OwnerNo;
+                    sd.SupplierName = stockDetail.SupplierName;
+                    sd.SupplierNo = stockDetail.SupplierNo;
+
+                    sd.IsDel = "0";
+                    sd.CreateUser = userId;
+                    sd.CreateTime = nowDate;
+
+                    //鏂板鎷兼墭搴撳瓨鏄庣粏淇℃伅
+                    Db.Insertable(sd).ExecuteReturnIdentity();
+                }
+                else
+                {
+                    if (palletNo != palletNoNew)
+                    {
+                        //淇敼鎷兼墭鎵樼洏搴撳瓨鏄庣粏
+                        pinStockDetail.Qty += int.Parse(PickQty);
+                        pinStockDetail.LockQty += int.Parse(PickQty);
+                        Db.Updateable(pinStockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        pinStockDetail.SONo = soNo;
+                        Db.Updateable(pinStockDetail).ExecuteCommand();
+                    }
+                }
+                #endregion
+
+                //鑾峰彇褰撳墠鎵樼洏鎷ｈ揣鏄庣粏
+                var complete = Db.Queryable<BllCompleteDetail>().First(a => a.IsDel == "0" && a.PalletNo == palletNo && a.SONo == notice.SONo && a.SODetailNo == noticeDetail.Id && a.ExportAllotId == allot.Id && a.StockId == stockDetail.Id);
+
+                //鍒よ鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                int isComplete = 0;
+                if (complete != null)
+                {
+                    isComplete = 1;
+                }
+
+                var comList = new List<BllCompleteDetail>();
+                //鍒ゆ柇鏄惁瀛樺湪鎷ｈ揣鏄庣粏
+                isComplete = 0;//鎵�鏈夋棤绠辩爜鎴栦竴绾х鐮佹嫞璐ф椂锛屾嫞璐ф槑缁嗗簲閲嶆柊鎻掑叆鏁版嵁(浣撶幇澶氭鎷ｈ揣娴佺▼璁板綍)
+                if (isComplete == 0)
+                {
+                    //娣诲姞鎷ｈ揣鏄庣粏
+                    var completeDetail = new BllCompleteDetail()
+                    {
+                        SONo = soNo,
+                        SODetailNo = int.Parse(soDetailId),
+                        ExportAllotId = allot.Id,
+                        StockId = allot.StockId,
+                        BoxNo = "",
+                        BoxNo2 = "",
+                        BoxNo3 = "",
+
+                        LotNo = allot.LotNo,
+                        LotText = allot.LotText,
+                        SupplierLot = allot.SupplierLot,
+                        SkuNo = allot.SkuNo,
+                        SkuName = allot.SkuName,
+                        Standard = allot.Standard,
+                        PalletNo = palletNo,
+                        CompleteQty = int.Parse(PickQty),
+
+                        CreateUser = userId,
+                        CreateTime = Db.GetDate(),
+                    };
+                    comList.Add(completeDetail);
+
+                    //娣诲姞鎷ｈ揣鏄庣粏
+                    Db.Insertable(comList).ExecuteCommand();
+                }
+                else if (isComplete == 1)
+                {
+                    complete.CompleteQty += int.Parse(PickQty);
+                    complete.UpdateUser = userId;
+                    complete.UpdateTime = Db.GetDate();
+
+                    Db.Updateable(complete).ExecuteCommand();
+                }
+
+                //淇敼鍑哄簱鍒嗛厤淇℃伅
+                allot.CompleteQty += int.Parse(PickQty);
+                allot.Status = allot.Qty == allot.CompleteQty ? "5" : "3";
+                allot.UpdateTime = DateTime.Now;
+                Db.Updateable(allot).ExecuteCommand();
+
+                int isDel = 0;
+
+                if (palletNo != palletNoNew)
+                {
+                    //鍒犻櫎鎴栦慨鏀瑰簱瀛樻槑缁�
+                    stockDetail.BitPalletMark = "1";//淇敼涓洪浂鎵樻爣璇�
+                    stockDetail.Qty -= int.Parse(PickQty);
+                    stockDetail.LockQty -= int.Parse(PickQty);
+                    if (stockDetail.Qty == stockDetail.LockQty)
+                    {
+                        stockDetail.Status = "2";
+                    }
+                    else if (stockDetail.Qty > stockDetail.LockQty && stockDetail.LockQty > 0)
+                    {
+                        stockDetail.Status = "1";
+                    }
+                    else
+                    {
+                        stockDetail.Status = "0";
+                    }
+                    if (stockDetail.Qty <= 0)
+                    {
+                        Db.Deleteable(stockDetail).ExecuteCommand();
+                    }
+                    else
+                    {
+                        isDel = 1;
+                        Db.Updateable(stockDetail).ExecuteCommand();
+                    }
+                }
+                else
+                {
+                    isDel = 1;
+                }
+                //鍒ゆ柇鎵樼洏涓婄墿鏂欐槸鍚︽嫞璐у畬姣�
+                if (isDel == 0)
+                {
+                    //鏀瑰彉鎵樼洏鐘舵�佷负锛氭湭浣跨敤
+                    var pallet = Db.Queryable<SysPallets>().First(m => m.PalletNo == palletNo && m.IsDel == "0");
+                    if (pallet == null)
+                    {
+                        throw new Exception("鏈湪鎵樼洏琛ㄤ腑鏌ヨ鍒版墭鐩樹俊鎭�");
+                    }
+
+                    pallet.Status = "0";
+                    Db.Updateable(pallet).ExecuteCommand();
+                }
+
+                //淇敼鍑哄簱鍗曟槑缁嗘嫞璐ф暟閲�
+                noticeDetail.CompleteQty += int.Parse(PickQty);
+                Db.Updateable(noticeDetail).ExecuteCommand();
+
+                var num = Db.Queryable<BllExportNoticeDetail>()
+                    .Count(m => m.IsDel == "0" && m.SONo == soNo && m.CompleteQty < m.Qty);
+                if (num <= 0)
+                {
+                    notice.Status = "4"; //鏇存敼涓烘墽琛屽畬鎴�
+                }
+                //淇敼鍑哄簱鍗曚俊鎭�
+                Db.Updateable(notice).ExecuteCommand();
+
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鎷兼墭", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}锛屾柊鎵樼洏鐮佷负锛歿palletNoNew}鐨勬嫞璐ф搷浣�", userId);
+                Db.CommitTran();
+            }
+            catch (Exception e)
+            {
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+        #endregion
     }
 }

--
Gitblit v1.8.0