From b34f4ee212f32e35809cbc875288154a39650dc0 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 八月 2024 15:08:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index d80b8e9..bfffd0d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -48,7 +48,7 @@
return objJsonResult;
}
- string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 绂佺敤鏍囪='' and 缁勭粐鍚嶇О='" + Organization + "'");
+ string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn(sql1 + sWhere + "order by 璁￠噺鍗曚綅浠ｇ爜 ", "h_v_Gy_UnitList");
@@ -476,6 +476,7 @@
{
try
{
+ LogService.Write("鍗曚綅锛�" + msg.ToString());
var _value = msg["model"].ToString();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
ListModels oListModels = new ListModels();
@@ -488,12 +489,20 @@
oCN.RunProc(sql);
sql = "set identity_insert Gy_Unit on";
oCN.RunProc(sql);
- oCN.RunProc("Insert into Gy_Unit" +
+
+ LogService.Write("鍗曚綅锛�" + "Insert into Gy_Unit" +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID,HCREATEORGID) " +
" Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID.ToString() +
"," + lsmain[0].HLevel.ToString() + "," + Convert.ToString(lsmain[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(lsmain[0].HStopflag ? 1 : 0) + ",'" + lsmain[0].HRemark +
- "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + "," + lsmain[0].HCREATEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + "," + lsmain[0].HCREATEORGID + ")");
+
+ oCN.RunProc("Insert into Gy_Unit" +
+ " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID,HCREATEORGID,HERPItemID) " +
+ " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID.ToString() +
+ "," + lsmain[0].HLevel.ToString() + "," + Convert.ToString(lsmain[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(lsmain[0].HStopflag ? 1 : 0) + ",'" + lsmain[0].HRemark +
+ "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + "," + lsmain[0].HCREATEORGID + "," + lsmain[0].HItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Unit off";
oCN.RunProc(sql);
@@ -733,7 +742,7 @@
,HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HRate,HMakeTime,HStandard,HCREATEORGID,HUSEORGID
)
values
- ({jsonData.HItemID},{jsonData.HERPItemID},'{jsonData.HNumber}','{jsonData.HName}',
+ ({jsonData.HItemID},{jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
'{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}','{jsonData.HRate}','{jsonData.HMakeTime}',{jsonData.HStandard},{jsonData.HCREATEORGID},{jsonData.HUSEORGID})";
oCN.RunProc(sql);
--
Gitblit v1.9.1