From 51705f1dc5802b25bc350b518272f1b068aa72b9 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 22:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
index 99cf3b4..a62889f 100644
--- a/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairSendWorkBillController.cs
@@ -230,7 +230,7 @@
try
{
//鍒ゆ柇鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -248,14 +248,15 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != "")
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //涓嶉渶瑕�
+ //if (oBill.omodel.HChecker != "")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鍗曟嵁褰撳墠宸插鏍�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
@@ -294,7 +295,7 @@
try
{
//鍒ゆ柇鏄惁鏈夊鏍告潈闄�
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -313,6 +314,7 @@
return objJsonResult;
}
+
//杞崲id
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
--
Gitblit v1.9.1