From 50f766bdd428af1214c4b35b369695880e902137 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 14 六月 2023 13:30:59 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/Sc_ProcessMangementController.cs |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 2d82cff..ca35e9d 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -702,23 +702,40 @@
                 {
                     if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
                     {
+
+                        //鍒ゆ柇閲戣澏浜戞槸鍚﹀凡缁忔湁鍏ュ簱鐨勬暟鎹�
+                        ds = oCN.RunProcReturn($@"select * from AIS20220308151944..T_PRD_INSTOCK where FBILLNO='{BillNo}'", "T_PRD_INSTOCK");
+
+                        if (ds.Tables[0].Rows.Count > 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "褰撳墠鍑虹珯鍗曞彿宸插叆搴�,璇蜂笉瑕侀噸鏂板叆搴�!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+
                         //鍒ゆ柇閲戣澏浜戠敓浜ф眹鎶ュ崟 鏁伴噺 鏄惁 澶т簬 鏈亾鍑虹珯鏁伴噺
-                        ds = oCN.RunProcReturn($@"select sum(FFinishQty)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}') 
+                        ds = oCN.RunProcReturn($@"select sum(FFinishQty)-sum(FSTOCKINQUASELQTY)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}') 
                         from  AIS20220308151944..T_PRD_MORPT rpt3 
                         left join AIS20220308151944..T_PRD_MORPTENTRY  rpt2 on rpt3.FID = rpt2.FID
+                        left join AIS20220308151944..T_PRD_MORPTENTRY_A  rpt1 on rpt2.FID = rpt1.FID
                         where F_bsv_Text=(select HProcExchBillNo from Sc_StationOutBillMain where HBillNo='{BillNo}')", "SumCount");
+
+                        if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "閲戣澏浜戞眹鎶ユ暟閲忓皬浜庢湰鍦板嚭绔欐暟閲�!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
                     }
                 }
 
 
 
-                if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0) {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "閲戣澏浜戞眹鎶ユ暟閲忓皬浜庢湰鍦板嚭绔欐暟閲�!";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+
 
 
                 JObject model = new JObject();
@@ -1418,7 +1435,7 @@
                 return objJsonResult;
             }
         }
-    
+
 
 
 

--
Gitblit v1.9.1