From 76ffaf6c0b670ca779523ff22fbfb536bb45bf71 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 19 一月 2022 08:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs b/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
index 9606b19..09b5cc9 100644
--- a/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
@@ -17,34 +17,34 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- /// <summary>
- /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
- [Route("Gy_Department/cx")]
- [HttpGet]
- public object cx(long HInterID)
- {
- try
- {
- ds = oCN.RunProcReturn("select * from Gy_Department where hitemid = " + HInterID, "Gy_Department");
+ ///// <summary>
+ ///// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ /////鍙傛暟锛歴tring sql銆�
+ /////杩斿洖鍊硷細object銆�
+ ///// </summary>
+ //[Route("Gy_Department/cx")]
+ //[HttpGet]
+ //public object cx(long HInterID)
+ //{
+ // try
+ // {
+ // ds = oCN.RunProcReturn("select * from Gy_Department where hitemid = " + HInterID, "Gy_Department");
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "Sucess锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
/// <summary>
/// 閮ㄩ棬鍒楄〃鍒犻櫎鎸夐挳
@@ -59,7 +59,7 @@
DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true,User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false,User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -288,7 +288,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_Department/AddBill1")]
+ [Route("Gy_StockPlaceController/AddBill1")]
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
@@ -332,7 +332,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1