From 97c43d459cb96e768948a44d9845a0b439bc2adc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 29 十二月 2022 10:07:10 +0800
Subject: [PATCH] 设备点检计划 记录 设备保养记录单
---
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 170 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 115 insertions(+), 55 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index 735c091..f1f268d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -1,4 +1,6 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -6,6 +8,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers
{
@@ -16,8 +19,6 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
-
/// <summary>
/// 杩斿洖浠撳簱鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -25,10 +26,20 @@
/// </summary>
[Route("Gy_Warehouse/list")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere,string user,string Organization)
{
try
{
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
string sql1 = string.Format(@"select * from h_v_IF_WareHouseList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
@@ -39,22 +50,21 @@
string sql = sql1 + sWhere + " order by 浠撳簱浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
}
- //if (ds == null || ds.Tables[0].Rows.Count == 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "false锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //else
- //{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- //}
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
}
catch (Exception e)
{
@@ -211,7 +221,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
bool HEndFlag = list[0].HEndFlag;
- bool HStopflag = list[0].HStopflag;
+ bool HStopflag = list[0].HStopFlag;
string HRemark = list[0].HRemark;
string HBarCode = list[0].HBarCode;
long HEmpID = list[0].HEmpID;
@@ -279,22 +289,9 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();//淇濆瓨鏁版嵁
- string user = sArray[1].ToString();//鐢ㄦ埛鍚�
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
-
- ////鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
- //if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Edit", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(msg2);
@@ -307,7 +304,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
bool HEndFlag = list[0].HEndFlag;
- bool HStopflag = list[0].HStopflag;
+ bool HStopflag = list[0].HStopFlag;
string HRemark = list[0].HRemark;
string HBarCode = list[0].HBarCode;
long HEmpID = list[0].HEmpID;
@@ -317,14 +314,14 @@
string HUpDater = list[0].HUpDater;
////鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//if (!DBUtility.ClsPub.AllowNumber(HNumber))
//{
@@ -401,27 +398,90 @@
return objJsonResult;
}
}
+
+ [Route("Gy_Warehouse/SaveGy_WarehouseListApi")]
+ [HttpPost]
+ public object SaveGy_WarehouseListApi([FromBody] JObject msg)
+ {
+ try
+ {
+ var model = msg["model"].ToString();
+ var stockplaceModel = msg["model"]["HStockplaceEntry"].ToString();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鍙嶅簭鍒楀寲
+ model = "[" + model.ToString() + "]";
+ List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(model);//浠撳簱
+ List<Gy_StockPlace> stockplaceList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_StockPlace>>(stockplaceModel);//浠撲綅
+ string sql = string.Empty;
+ //DataTable dt = DataHelper.ListToDataTable<Warehouse>(list);
+ //oCN.SqlBulkCopyByDatatable("Gy_Warehouse", dt);
+ //淇濆瓨
+ oCN.BeginTran();
+ sql = $"delete Gy_Warehouse where HItemID = {list[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_Warehouse on";
+ oCN.RunProc(sql);
+ oCN.RunProc("Insert into Gy_Warehouse " +
+ " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HCREATEORGID,HSPFlag,HSPGroupID,HUnderStock,HSTOCKPROPERTY) " +
+ " Values('" + list[0].HItemID + "','" + list[0].HNumber + "','" +list[0].HName + "','" + list[0].HHelpCode + "','" + list[0].HShortNumber + "'," + list[0].HParentID.ToString() +
+ "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopFlag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "','" + list[0].HCREATEORGID + "','" + list[0].HSPFlag + "','" + list[0].HSPGroupID + "','" + list[0].HUnderStock + "','" + list[0].HSTOCKPROPERTY + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ sql = "set identity_insert Gy_Warehouse off";
+ oCN.RunProc(sql);
+ sql = $"delete gy_stockplace where HSPGroupID in ({list[0].HItemID})";
+ oCN.RunProc(sql);
+ sql = "set identity_insert gy_stockplace on";
+ oCN.RunProc(sql);
+ foreach (var item in stockplaceList)
+ {
+ oCN.RunProc("Insert into gy_stockplace " +
+ " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HUSEORGID,HCREATEORGID,HSPGroupID,HSPType,HSrcSPType,HDesSPType) " +
+ " Values('" + item.HItemID + "','" + item.HNumber + "','" + item.HName + "','" + item.HHelpCode + "','" + item.HShortNumber + "'," + item.HParentID.ToString() +
+ "," + item.HLevel.ToString() + "," + Convert.ToString(item.HEndFlag ? 1 : 0) + "," + Convert.ToString(item.HStopFlag ? 1 : 0) + ",'" + item.HRemark + "','" + item.HUSEORGID + "','" + item.HCREATEORGID + "','" + item.HSPGroupID + "','" + item.HSPType + "','" + item.HSrcSPType + "','" + item.HDesSPType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ sql = "set identity_insert gy_stockplace off";
+ oCN.RunProc(sql);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
/// <summary>
/// 浠撳簱鍒楄〃鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("DeltetGy_Warehouse")]
[HttpGet]
- public object DeltetGy_Warehouse(string HItemID)
+ public object DeltetGy_Warehouse(string HItemID,string user)
{
DataSet ds;
DataSet ds1;
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
--
Gitblit v1.9.1