From 1fec2f9ed5f7a8b1c4a6feddc585dba88ed6b3c9 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 19 十一月 2021 08:22:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index df9c210..fc9384c 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -35,7 +35,7 @@
bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, true, user);
if (!isCgjl)
{
- sWhere += " and HEmpID in (select HEmpID from Gy_Czygl where Czymc='Admin' )";
+ sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
}
string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
@@ -113,6 +113,34 @@
}
+ /// <summary>
+ /// 閲囪喘璁㈠崟 鎾ら攢
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cg_POOrderBill/Back")]
+ [HttpGet]
+ public object Back(string Hmainid)
+ {
+ try
+ {
+ string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 2 where HInterID in ({Hmainid})";
+ oCN.RunProc(sql);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 閲囪喘璁㈠崟 浼樺厛绾�
@@ -144,7 +172,44 @@
}
+ [Route("POOrderBack")]
+ [HttpGet]
+ /// <summary>
+ /// 璁㈠崟鍙嶉鐘舵��
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ public object POOrderBack(string HmainidList, string OrderBackId)
+ {
+ try
+ {
+ string sql = "";
+ for (int i = 0; i < HmainidList.Split(',').Length; i++)
+ {
+ var Hmainid = HmainidList.Split(',')[i];
+ sql = string.Format(@"
+ update Cg_POOrderBillSub set
+ HFeedback ='{0}'
+ where HInterID = '{1}' and HEntryID = '{2}' ", OrderBackId, Hmainid.Split('-')[0], Hmainid.Split('-')[1]);
+ oCN.RunProc(sql);
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ //objJsonResult.Message = string.Join(",", HmainidList.ToArray());
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
//鍒ゆ柇鏄惁瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇�
public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName)
--
Gitblit v1.9.1