From f3e099f52dad5b1f5aef9f62970c121b46fe612c Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 16 十一月 2022 20:37:47 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index ea4537e..8c07c4e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -7,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using System.Windows.Forms;
using WebAPI.Models;
using WebAPI.Service;
@@ -20,6 +21,36 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+
+
+ ////妫�娴� 褰撳墠閫変腑琛岀殑 椤圭洰鐘舵��
+ //[Route("Gy_Material/CheckUseStatus")]
+ //[HttpGet]
+ //public void Sub_CheckUseStatus(int grd, int IDCol, string sProcName)
+ //{
+ // SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ // Int64 sItemID;
+ // try
+ // {
+ // //寰幆褰撳墠缃戞牸閫変腑椤圭洰
+ // for (int i = 0; i < grd.SelectedRows.Count; i++)
+ // {
+ // //寰楀埌鍐呯爜
+ // sItemID = DBUtility.ClsPub.isLong(grd.Rows[grd.SelectedRows[i].Index].Cells[IDCol].Value);
+ // //璋冪敤鍌ㄥ瓨杩囩▼ h_p_Gy_CheckUseDept
+ // oCn.RunProc("exec " + sProcName + " " + sItemID.ToString(), ref ClsPub.sExeReturnInfo);
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // MessageBox.Show("妫�娴嬮敊璇紒鍘熷洜锛�" + ClsPub.sExeReturnInfo);
+ // //objJsonResult.code = "0";
+ // //objJsonResult.count = 0;
+ // //objJsonResult.Message = "妫�娴嬮敊璇紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ // //objJsonResult.data = null;
+ // //return objJsonResult;
+ // }
+ //}
/// <summary>
/// 杩斿洖鐗╂枡鍒楄〃
@@ -104,6 +135,7 @@
string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg1 = sArray[0].ToString();
string msg2 = sArray[1].ToString();
+ string msg_HUSEORGID = sArray[2].ToString();
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -253,7 +285,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+ oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //缁勭粐id
oItem.HShortNumber = sShortNumber;//鐭唬鐮�
oItem.HEndFlag = true;//鏈骇鏍囧織
oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
@@ -353,7 +385,7 @@
return objJsonResult;
}
- oCN.RunProc("update Gy_Material set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_Material where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1