From 243e86af1a7c74c8bfda3bb41f29a11fef13c065 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 09 十月 2024 16:32:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index d84dd94..fe210eb 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -304,6 +304,7 @@
long HProcID = list[0].HProcID;
int HUSEORGID = list[0].HUSEORGID;
string HCompName = list[0].HCompName;
+ string HPayMentType = list[0].HPayMentType;
var HDeptNumber = "";
//var HEndFlag = 0;
long HLevel = 1;
@@ -344,10 +345,10 @@
oCN.RunProc("Insert into Gy_Group " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HEmpQty,HDeptID,HDeptNumber,HProcID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID,HCompName) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID,HCompName,HPayMentType) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
"," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ",'" + HCompName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ",'" + HCompName +"','"+ HPayMentType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -366,7 +367,8 @@
",HRemark= '" + HRemark + "'" +
",HDeptID=" + HDeptID +
",HEmpQty=" + HEmpQty +
- ",HCompName='"+ HCompName+
+ ",HCompName='"+ HCompName+"'"+
+ ",HPayMentType='" + HPayMentType +
"',HBarCodeForBase='" + HBarCodeForBase + "' " +
", HProcID = '" + HProcID + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1