From 1d97bffe5449a6b3e29d619f5a45400483fb6748 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 01 十二月 2025 15:41:59 +0800
Subject: [PATCH] 1

---
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index de0a660..880faae 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1808,12 +1808,12 @@
                 }
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏉$爜缂栧彿 desc", "h_v_Gy_MouldFileList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
-                    string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+                    string sql = sql1 + sWhere + "order by 鏉$爜缂栧彿 desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                 }
 
@@ -2918,8 +2918,7 @@
                 }
                 //=========================================================
 
-                //涓昏〃
-                oCN.RunProc("UpDate Gy_MouldFileMain set  " +
+                string sql = "UpDate Gy_MouldFileMain set  " +
                 " HBillNo='" + HBillNo + "'" +  //鍥哄畾璧嬪��===============
                 ",HDate='" + HDate + "'" +
                 ",HYear='" + HYear.ToString() + "'" +
@@ -2972,10 +2971,13 @@
                 ",HMadeSupID=" + HMadeSupID +
                 ",HNowWHID=" + HNowWHID +
                 ",HNowSPID=" + HNowSPID +
-                ",HInitLife='" + HInitLife +
-                "',HNextMainDate='" + HNextMainDate +
+                ",HInitLife='" + HInitLife + "'" +
+                ",HNextMainDate='" + HNextMainDate +
                 "',HMouldUseStatus='" + HMouldUseStatus +
-                "' where HInterID=" + HInterID.ToString());
+                "' where HInterID=" + HInterID.ToString();
+
+                //涓昏〃
+                oCN.RunProc(sql);
 
                 //淇敼瀛愰」鐩唬鐮�
                 //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -4900,5 +4902,26 @@
                 return objJsonResult;
             }
         }
+
+
+        [Route("Gy_BarCodeBillList/GetBarCodeBillPermission")]
+        [HttpGet]
+        public object GetBarCodeBillPermission(string user)
+        {
+            if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Print", 1, false, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+                objJsonResult.data = 0;
+                return objJsonResult;
+            }
+            else
+            {
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+                
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1