From d077c84b9a62a6c148198232154591f0cbd578f5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 18 十月 2023 13:35:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/EntrustOrderController.cs | 139 +++++++++++++++++++++++++--------------------
1 files changed, 77 insertions(+), 62 deletions(-)
diff --git a/WebAPI/Controllers/EntrustOrderController.cs b/WebAPI/Controllers/EntrustOrderController.cs
index 71eb83b..630e611 100644
--- a/WebAPI/Controllers/EntrustOrderController.cs
+++ b/WebAPI/Controllers/EntrustOrderController.cs
@@ -18,6 +18,7 @@
{
private JsonResult objJsonResult = new JsonResult();
private json objjson = new json();
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
/// <summary>
/// 閲囪喘鍗曞垪琛�
@@ -27,34 +28,22 @@
/// <param name="OnePage"></param>
/// <returns></returns>
[Route("GetEntrustOrderBill")]
- [HttpGet]
- //閲囪喘璁㈠崟鍒楄〃
- public object GetEntrustOrderBill(string HSupNo, string sqlWhere)
+ [HttpPost]
+ public object GetEntrustOrderBill([FromBody] JObject msg)
{
- string msg = "";
+ string HSupNo = msg["HSupNo"].ToString(); string sqlWhere = msg["sqlWhere"].ToString();
try
{
string VsWhere = "";
string PcWhere = "";
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
DataSet ds;
- //鍏朵粬杩囨护
- if (msg.Trim() == "")
- {
- msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
- // msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
- }
- else
- {
- msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
- // msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
- }
- //杞崲鐗规畩瀛楃
- if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
+ string sql = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ if (Common.SQLtoChange(sql, ref VsWhere, ref PcWhere) == false)
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触";
+ objjson.Message = "杞崲鐗规畩瀛楃澶辫触";
objjson.data = null;
return objjson;
}
@@ -62,22 +51,11 @@
Int64 RowTotal = Common.GetRowTotal("H_v_SRM_EntrustOrderBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
//鑾峰彇杩斿洖鏁版嵁
ds = oCn.RunProcReturn("exec H_p_SRM_EntrustOrderBillList '" + PcWhere + "'", "H_p_SRM_EntrustOrderBillList");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objjson.code = "0";
- objjson.count = 0;
- objjson.Message = "鑾峰彇澶辫触";
- objjson.data = null;
- return objjson;
- }
- else
- {
- objjson.code = "0";
- objjson.count = 10000;
- objjson.Message = "鑾峰彇鎴愬姛";
- objjson.data = ds.Tables[0];
- return objjson;
- }
+ objjson.code = "0";
+ objjson.count = 10000;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
}
catch (Exception e)
{
@@ -224,48 +202,85 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎺ュ彈澶辫触锛�"+e.ToString();
+ objJsonResult.Message = "鎺ュ彈澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
- [Route("EntrustOrderRefuse")]
- [HttpGet]
- /// <summary>
- /// 璁㈠崟鎷掔粷
- /// </summary>
- /// <param name="HInterID"></param>
- /// <returns></returns>
+ [Route("EntrustOrderRefuse")]
+ [HttpGet]
+ /// <summary>
+ /// 璁㈠崟鎷掔粷
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <returns></returns>
public object EntrustOrderRefuse(string HInterID, string HBillNo, string HUser, string HBackRemark)
+ {
+ try
{
- try
- {
- if (DBUtility.ClsPub.isLong(HInterID) == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "澶辫触锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- DAL.ClsWW_EntrustOrderBill oBill = new DAL.ClsWW_EntrustOrderBill();
- oBill.WebRefuse(DBUtility.ClsPub.isLong(HInterID), DBUtility.ClsPub.isStrNull(HBillNo), DBUtility.ClsPub.isStrNull(HUser), DBUtility.ClsPub.isStrNull(HBackRemark), ref DBUtility.ClsPub.sExeReturnInfo);
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鎷掔粷鎴愬姛锛�";
- objJsonResult.data = 1;
- return objJsonResult;
- }
- catch (Exception e)
+ if (DBUtility.ClsPub.isLong(HInterID) == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
+ DAL.ClsWW_EntrustOrderBill oBill = new DAL.ClsWW_EntrustOrderBill();
+ oBill.WebRefuse(DBUtility.ClsPub.isLong(HInterID), DBUtility.ClsPub.isStrNull(HBillNo), DBUtility.ClsPub.isStrNull(HUser), DBUtility.ClsPub.isStrNull(HBackRemark), ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎷掔粷鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
}
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ [Route("EntrustOrderBack")]
+ [HttpGet]
+ /// <summary>
+ /// 璁㈠崟鍙嶉鐘舵��
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ public object EntrustOrderBack(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 WW_EntrustOrderBillSub 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;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1