From 338a7ef46eddc9f2f0f8f40d17a37a9ef4a844bb Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 31 十二月 2021 01:08:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/WebAPIController.cs | 21 +++++--
WebAPI/Controllers/POInStockController.cs | 129 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 141 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 6d0c08d..959253c 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -289,7 +289,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+
string UserName = "";
ListModels oListModels = new ListModels();
@@ -331,7 +331,7 @@
return objJsonResult;
}
}
-
+
oBill.omodel = oItem;
}
//琛ㄤ綋鏁版嵁
@@ -602,12 +602,23 @@
[Route("AuditPOInStockBill")]
[HttpGet]
- public object AuditPOInStockBill(string HInterID, string CurUserName)
+ public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
{
json objjson = new json();
try
{
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //閲囪喘璁㈠崟 鐢熸垚閫佽揣鍗曞垪琛�
+ if (!String.IsNullOrEmpty(HBillNo))
+ HInterID = GetHinterIDByBillNo(HBillNo).ToString();
+ if (HInterID == "0")
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触,璇峰厛淇濆瓨璁㈠崟";
+ objjson.data = null;
+ return objjson;
+ }
string kdTbaleName = "AIS20211209082932";
string sql = string.Format(@"
@@ -765,6 +776,118 @@
}
}
+ [Route("GetHinterID")]
+ [HttpGet]
+ public object GetHinterID(string HBillNo)
+ {
+ int HinterID = GetHinterIDByBillNo(HBillNo);
+ if (HinterID == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触,璇峰厛淇濆瓨璁㈠崟";
+ objjson.data = HinterID;
+ return objjson;
+ }
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鎿嶄綔鎴愬姛";
+ objjson.data = HinterID;
+ return objjson;
+ }
+
+ public int GetHinterIDByBillNo(string HBillNo)
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ int HInterID = 0;
+ string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
+ DataTable dt = oCn.RunProcReturn(sql, "HInterID").Tables[0];
+ if (dt.Rows.Count > 0)
+ HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
+ return HInterID;
+ }
+
+
+ [Route("DeltetPOInStockBill")]
+ [HttpGet]
+ public object DeltetPOInStockBill(string HInterID)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
+ //鍏堝垹闄� 閲戣澏鏁版嵁
+ objjson = DeleteKingDee(HInterID);
+ if (objJsonResult.code == "0")
+ return objJsonResult;
+
+ oCN.BeginTran();
+ oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
+ oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
+ oCN.RunProc("Delete From Cg_POInStockBillSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //瀹℃牳 鍒犻櫎 鍒犻櫎閲戣澏鏁版嵁搴撳搴� 鏀舵枡閫氱煡鍒版暟鎹�
+ public json DeleteKingDee(string hinterid)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
+ DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ var sJson = new
+ {
+ Numbers = dr["HERPBillNO"].ToString(),
+ Ids = ""
+ };
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objjson.data = null;
+ return objjson;
+ }
+
+ var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
+ //LogService.Write(result);
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀵瑰簲閲戣澏鏀舵枡閫氱煡鍗曞垹闄ゅけ璐� 锛�" + result;
+ objjson.data = null;
+ return objjson;
+ }
+
+ }
+ }
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "Sucess锛�";
+ objjson.data = null;
+ return objjson;
+ }
//[Route("POInStockAccept")]
//[HttpGet]
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e15b8b0..df1ca51 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -180,7 +180,15 @@
DataSet ds = null;
ClsCNSRM oCnLoc = new ClsCNSRM();
DAL.ClsUser oUser = new DAL.ClsUser();
- ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "娴嬭瘯";
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref sReturn);
+ //LogService.Write(sReturn);
+ //LogService.Write(FCusName);
+ if (FCusName == "澶忓疂鐢靛櫒")
+ ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ else
+ ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -776,7 +784,8 @@
objJsonResult.Message = "杩斿洖鏁版嵁鎴愬姛锛�";
objJsonResult.data = oDs;
}
- else {
+ else
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "杩斿洖鏁版嵁澶辫触锛�";
@@ -789,17 +798,17 @@
#region[鏇存敼鍏憡鐘舵�乚
[Route("UpdateMessage")]
[HttpGet]
- public object UpdateMessage(string UserName, string HInterID,string HEntryID)
+ public object UpdateMessage(string UserName, string HInterID, string HEntryID)
{
ClsCNSRM oCn = new ClsCNSRM();
oCn.BeginTran();
- oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='"+ UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='"+ HEntryID + "'", ref ClsPub.sExeReturnInfo);
+ oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='" + UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'", ref ClsPub.sExeReturnInfo);
oCn.Commit();
objjson.code = "1";
objjson.count = 1;
- objjson.Message =ClsPub.sExeReturnInfo;
+ objjson.Message = ClsPub.sExeReturnInfo;
objjson.data = null;
- return objjson;;
+ return objjson; ;
}
#endregion
}
--
Gitblit v1.9.1