From f5bb218bb36f37445d06451f51795d131f85badb Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 20 十月 2021 08:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 18d6907..6b49370 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -25,18 +25,18 @@
/// </summary>
[Route("Gy_Warehouse/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string Organization)
{
try
{
+ string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_WareHouseList " + sWhere, "h_v_IF_WareHouseList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_WareHouseList");
}
else
{
- string sql1 = "select * from h_v_IF_WareHouseList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -338,9 +338,9 @@
oCN.BeginTran();
oCN.RunProc("Insert into Gy_Warehouse " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
- "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID.ToString() + ",'" + HAddress + "','" + HPhone + "','"+ HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Warehouse set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -361,6 +361,7 @@
",HEmpID=" + HEmpID.ToString() +
",HAddress='" + HAddress + "'" +
",HPhone='" + HPhone + "'" +
+ ",HUSEORGID='" + HUSEORGID + "'" +
",HUpdater='" + HUpDater + "'" +
",HUpdateDate= getdate()" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
--
Gitblit v1.9.1