From 99660c0a8a0532cbec865dbd86aff2d15ca80fdb Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 07 九月 2022 13:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_DotCheckBillController.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
index 562e9ca..3d13ce5 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
@@ -159,7 +159,7 @@
msg2 = "[" + msg2.ToString() + "]";
List<Models.ClsGy_DotCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_DotCheck>>(msg2);
- long HItemID = int.Parse(msg3);
+ long HItemID = int.Parse(msg4);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
@@ -169,7 +169,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg4))
+ if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -188,14 +188,14 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -284,9 +284,9 @@
//涓昏〃
oCN.RunProc("Insert into Gy_DotCheck " +
" (HNumber,HName,HHelpCode,HShortNumber" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
- +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ +HLevel + ",1," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
--
Gitblit v1.9.1