From 83d9ed975c0747feaebb9ca7505193f2c8c17897 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期五, 15 三月 2024 13:38:20 +0800
Subject: [PATCH] 修改质检想想

---
 Wms/WMS.Entity/DataEntity/DataStockDetail.cs         |    2 +-
 Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs |   30 +++++++++++++++---------------
 Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs         |   18 ++++++++++++++----
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index f265c9a..bfa4cdf 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -563,16 +563,16 @@
 
         #region 鎸囧畾鍌ㄤ綅
         //鎸囧畾鍌ㄤ綅鏁版嵁婧愶紙姝e父鐨勭┖鍌ㄤ綅锛�
-        public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer, 
+        public List<LocatDto> GetLocateList(string houseNo, string roadwayNo, string row, string column, string layer,
             string locateNo, string BindId, int page, int limit, out int count)
         {
             try
             {
                 //鑾峰彇鎵樼洏缁戝畾
-                var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0" 
+                var bindASNDetailNo = Db.Queryable<BllPalletBind>().Where(a => a.IsDel == "0" && a.Status == "0"
                 && a.Id == int.Parse(BindId)).Select(a => a.ASNDetailNo).First();
                 //鑾峰彇鍗曟嵁鏄庣粏
-                var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo 
+                var noticeDetailSkuNo = Db.Queryable<BllArrivalNoticeDetail>().Where(a => a.Id == bindASNDetailNo
                 && a.IsDel == "0").Select(a => a.SkuNo).First();
                 //鑾峰彇鐗╂枡
                 var skuCategoryNo = Db.Queryable<SysMaterials>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetailSkuNo)
@@ -1632,7 +1632,17 @@
                             }
 
                             //鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
-                            var quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                            BllQualityInspect quality = new BllQualityInspect();
+                            //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+                            if (notice.Type == "3")
+                            {
+                                quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.ASNNo == noticeDetail.ASNNo && a.SkuNo == noticeDetail.SkuNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                            }
+                            else
+                            {
+                                quality = Db.Queryable<BllQualityInspect>().Where(a => a.IsDel == "0" && a.SkuNo == noticeDetail.SkuNo && a.LotNo == noticeDetail.LotNo).OrderByDescending(a => a.CreateTime).First();
+                            }
+
                             #region 搴撳瓨鏄庣粏
                             var sd = new DataStockDetail()
                             {
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index b1e8968..8c1d696 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -105,7 +105,7 @@
             {
                 throw new Exception("鎵规鍙蜂笉鍙负绌猴紝璇锋牳鏌ワ紒");
             }
-            int isTui = 0;
+            //int isTui = 0;
             //楠岃瘉鍏ュ簱鍗曞彿鏄惁涓虹┖
             if (!string.IsNullOrEmpty(model.ASNNo))
             {
@@ -122,24 +122,24 @@
                 {
                     throw new Exception("杈撳叆鐨勬壒娆℃垨鐗╂枡淇℃伅涓庡叆搴撳崟鎹笉绗︼紝璇锋牳鏌ワ紒");
                 }
-                isTui = 1;
+                //isTui = 1;
             }
 
             //鏌ユ壘璐ㄦ淇℃伅涓槸鍚﹀瓨鍦ㄥ悓鎵规璐ㄦ褰曞叆璁板綍
-            BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
+            //BllQualityInspect quality = Db.Queryable<BllQualityInspect>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo && m.LotNo == model.LotNo);
 
-            if (quality != null)
-            {
-                //鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
-                if (isTui == 1)
-                {
-                    if (quality.ASNNo == model.ASNNo)
-                    {
-                        throw new Exception("褰撳墠閫�璐у叆搴撳崟宸插垱寤鸿川妫�淇℃伅锛岃鍕块噸澶嶅垱寤猴紒");
-                    }
-                }
-                throw new Exception("褰撳墠鎵规宸茶繘琛岃川妫�锛岃鏍告煡锛�");
-            }
+            //if (quality != null)
+            //{
+                ////鍒ゆ柇鏄惁涓洪��璐у叆搴撳崟
+                //if (isTui == 1)
+                //{
+                //    if (quality.ASNNo == model.ASNNo)
+                //    {
+                //        throw new Exception("褰撳墠閫�璐у叆搴撳崟宸插垱寤鸿川妫�淇℃伅锛岃鍕块噸澶嶅垱寤猴紒");
+                //    }
+                //}
+            //    throw new Exception("褰撳墠鐗╂枡鍜屾壒娆″凡杩涜璐ㄦ锛岃鏍告煡锛�");
+            //}
 
             ////鏌ユ壘鍚屾壒娆� 鍚屽崟鎹� 鍏ュ簱鍗曚俊鎭��
             //BllArrivalNoticeDetail arrivalDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo && m.LotNo == model.LotNo);
diff --git a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
index e839ce4..cf2e213 100644
--- a/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
+++ b/Wms/WMS.Entity/DataEntity/DataStockDetail.cs
@@ -216,7 +216,7 @@
 
         /// <summary>
         /// Desc:璐ㄩ噺鐘舵��
-        /// Default:
+        /// Default: 1锛氬悎鏍� 2锛氫笉鍚堟牸
         /// Nullable:True
         /// </summary>           
         public string InspectStatus {get;set;}

--
Gitblit v1.8.0