From 6f23b2a6ae7f1776816de64ca25d7c05ba5a8d6e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 22 十月 2021 13:49:13 +0800
Subject: [PATCH] 采购经理权限Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 0249ff2..e783b85 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1,6 +1,8 @@
锘縰sing DAL;
using DBUtility;
using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
using SQLHelper;
using System;
@@ -371,7 +373,7 @@
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (Warehouse != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' ) ";
+ sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' or HUSEORGID like '%" + Warehouse + "%' ) ";
}
try
{
@@ -713,14 +715,8 @@
/// <returns></returns>
[Route("Web/GetMaterialList_Json")]
[HttpGet]
- public object GetMaterialList_Json(string Material)
+ public object GetMaterialList_Json(string sWhere)
{
- sWhere = " Where HStopFlag=0 and HEndFlag=1";
- //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (Material != "")
- {
- sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) ";
- }
try
{
ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo);
@@ -1243,22 +1239,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- if (HStopflag)
- {
- oCN.RollBack();//鍥炴粴浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
- oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -2201,6 +2197,55 @@
}
}
+
+ #region [鏌ヨ鑿滃崟鍒楄〃]
+ [Route("Web/MenuList")]
+ [HttpGet]
+ public object MenuList()
+ {
+ try
+ {
+ List<Menu> mu = new List<Menu>();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ ds = oCn.RunProcReturn("Select * from Gy_Menu Order by HItemID ", "Gy_Menu");
+ //List<Menu> mu1 = ds.Tables[0].AsEnumerable().Select(t => new Menu()).ToList();
+ //List<Menu> users = ModelConvertHelper<Menu>.ConvertToModel(ds.Tables[0]);
+ //var dd = ToHierarchy.ToHierarchyList(users);
+ //string json = JsonConvert.SerializeObject(dd);
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
+ {
+ if (ds.Tables[0].Rows[i]["HPartentID"].ToString()=="0" || ds.Tables[0].Rows[i]["HitemID"].ToString() == ds.Tables[0].Rows[i]["HPartentID"].ToString()) //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+ {
+ Menu tbj = new Menu();
+ tbj.HitemID = ds.Tables[0].Rows[i]["HitemID"].ToString();
+ tbj.HNumber = ds.Tables[0].Rows[i]["HNumber"].ToString();
+ tbj.HName = ds.Tables[0].Rows[i]["HName"].ToString();
+ tbj.HPartentID =ds.Tables[0].Rows[i]["HPartentID"].ToString();
+ tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
+ tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
+ mu.Add(tbj);
+ }
+ }
+ ToHierarchy.digui(ds.Tables[0], mu);
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data =Newtonsoft.Json.JsonConvert.SerializeObject(mu);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = e.ToString();
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1