From 0ecb3de2e8c6f26848b0891fdf28be4d98da5776 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 25 十一月 2021 16:54:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs" b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
similarity index 98%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index 8ac3bfc..d1e3917 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs"
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -326,7 +326,7 @@
         public object DeltetMouldLifeChangeBill(string HInterID)
         {
             //缂栬緫鏉冮檺
-            //if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+            //if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
             //{
             //    objJsonResult.code = "0";
             //    objJsonResult.count = 0;
@@ -357,7 +357,7 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                if (BillOld.omodel.HChecker != "")
+                if (oBill.omodel.HChecker != "")
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -420,7 +420,7 @@
             try
             {
                 //瀹℃牳鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;

--
Gitblit v1.9.1