From 55e832ca189624916a7a2e3e6cf24e513de9b1b4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 20 六月 2025 15:41:30 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/QC_ManagementController.cs |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index c5499f2..ed6c532 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -34,31 +34,20 @@
         {
             try
             {
-                List<object> a = new List<object>();
+                List<object> columnNameList = new List<object>();
                 //娣诲姞鍒楀悕
                 foreach (DataColumn col in ds.Tables[0].Columns)
                 {
                     Type dataType = col.DataType;
                     string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
-                    a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
-                }
-                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
-                //{
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }              
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "Sucess锛�";
                 objJsonResult.data = ds.Tables[0];
-                objJsonResult.list = a;
-                return objJsonResult;
-                //}
-                //else
-                //{
-                //objJsonResult.code = "0";
-                //objJsonResult.count = 0;
-                //objJsonResult.Message = "鏃犳暟鎹�";
-                //objJsonResult.data = null;
-                //return objJsonResult;
-                //}
+                objJsonResult.list = columnNameList;
+                return objJsonResult;               
             }
             catch (Exception e)
             {
@@ -137,7 +126,7 @@
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList_Main order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+                    ds = oCN.RunProcReturn("select  * from h_v_Gy_QCCheckProjectList_Main  order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
                 }
                 else
                 {
@@ -1164,6 +1153,17 @@
                 }
                 else
                 {
+                    DataSet Ds;
+                    Ds = oCN.RunProcReturn("Select * from Gy_QCCheckProjectMain Where HInterID=" + oBill.omodel.HInterID, "Gy_QCCheckProjectMain");
+                    //鍒ゆ柇鏄惁鍙紪杈�
+                    if (Ds.Tables[0].Rows[0]["HChecker"].ToString() != "" && Ds.Tables[0].Rows[0]["HChecker"].ToString() != null)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
                     bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 if (bResult)
@@ -1171,7 +1171,6 @@
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
                     objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
-                    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
                     objJsonResult.data = 1;
                     return objJsonResult;
                 }
@@ -1249,7 +1248,7 @@
                 }
 
                 //鍒犻櫎鍓嶆帶鍒�=========================================      
-                string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl  " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + UserName + "'";
+                string sql1 = "exec h_p_Gy_QCCheckProject_BeforeDelCtrl  " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + UserName + "'";
                 ds = oCN.RunProcReturn(sql1, "h_p_Gy_QCCheckProject_BeforeDelCtrl");
                 if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                 {
@@ -1271,7 +1270,7 @@
                 //==================================================================================  
 
                 //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
-                if (!oBill.DeleteBill(BillOld.omodel.HInterID, BillOld.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
+                if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterDelCtrl", UserName, ref ClsPub.sExeReturnInfo))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -1387,13 +1386,21 @@
                     //==================================================================================      
 
                     //瀹℃牳鎻愪氦
-                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    if (!oBill.CheckBill(int.Parse(HInterID), oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 1;
                         objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
                         objJsonResult.data = null;
                         return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = " 瀹℃牳鎴愬姛锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult; ;
                     }
                 }
 
@@ -1436,7 +1443,7 @@
                         //===========================================================          
 
                         //鍙嶅鏍告彁浜bandonCheck
-                        if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                        if (!oBill.AbandonCheck(int.Parse(HInterID), oBill.omodel.HBillNo, "h_p_Gy_QCCheckProject_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                         {
                             objJsonResult.code = "0";
                             objJsonResult.count = 1;
@@ -1444,6 +1451,14 @@
                             objJsonResult.data = null;
                             return objJsonResult;
                         }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = " 鍙嶅鏍告垚鍔燂紒";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
                     }
                 }
 

--
Gitblit v1.9.1