From 99e41064f7a5ac3f5a70c9d80637318a6e3ee45d Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 31 十二月 2021 20:10:39 +0800
Subject: [PATCH] nn
---
WebAPI/Controllers/WebAPIController.cs | 13 +++---
WebAPI/Controllers/POInStockController.cs | 27 ++++++++-----
WebAPI/InvokeHelper.cs | 1
WebAPI/Controllers/BarCodeController.cs | 29 ++++++++++++++
4 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 63817c5..c8bb13e 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1735,6 +1735,35 @@
return objjson;
}
}
+
+ [Route("DeltetBarCodeBill")]
+ [HttpGet]
+ public object DeltetBarCodeBill(string HInterID, string HUserName)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ try
+ {
+ WebAPIController.Add_Log("鏉＄爜妗ｆ鍒犻櫎", HUserName, "鏉＄爜妗ｆ鍒犻櫎");
+ oCN.BeginTran();
+ //LogService.Write("Delete From Gy_BarCodeBill where HItemID in(" + HInterID + ")") ;
+ oCN.RunProc("Delete From Gy_BarCodeBill where HItemID in(" + 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;
+ }
+ }
#endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 5f387b3..1af2161 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -295,6 +295,8 @@
ListModels oListModels = new ListModels();
try
{
+ //鑾峰彇瀹㈡埛鍚嶇О
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
List<Model.ClsCg_POInStockBillMain> lsmain = new List<Model.ClsCg_POInStockBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -312,7 +314,7 @@
oItem.HMainSourceInterID = oItem.HInterID;
oItem.HInterID = 0;
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
- if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if (FCusName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
if (DBUtility.ClsPub.isStrNull(oItem.HDHDate) == "")
{
@@ -362,7 +364,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ if (FCusName == "瀹夌憺鍖荤枟") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
{
@@ -621,8 +623,10 @@
}
string kdTbaleName = "AIS20211209082932";
+ //string kdTbaleName = "AIS20211130140219";//澶忓疂姝ｅ紡
+
string sql = string.Format(@"
- SELECT B.HINTERID,c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER FROM
+ SELECT M.HBillNo,B.HINTERID,B.HENTRYID,c.FID,c.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER AS FSETTLEORGNUMBER,E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID ,CU.FNUMBER AS FUNITNUMBER FROM
CG_POINSTOCKBILLSUB B
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -654,6 +658,7 @@
JObject model = new JObject();
model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
+ model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁绫诲瀷
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐
model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
@@ -678,7 +683,7 @@
FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
-
+ FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
@@ -810,7 +815,7 @@
[Route("DeltetPOInStockBill")]
[HttpGet]
- public object DeltetPOInStockBill(string HInterID)
+ public object DeltetPOInStockBill(string HInterID, string HUserName, string HBillNo)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
try
@@ -818,9 +823,11 @@
DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
//鍏堝垹闄� 閲戣澏鏁版嵁
objjson = DeleteKingDee(HInterID);
- if (objJsonResult.code == "0")
- return objJsonResult;
-
+ LogService.Write(objjson.ToString());
+ if (objjson.code == "0")
+ return objjson;
+
+ WebAPIController.Add_Log("閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + HBillNo, HUserName, "閫佽揣鍗曞垹闄�");
oCN.BeginTran();
oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
@@ -868,9 +875,9 @@
objjson.data = null;
return objjson;
}
-
+ LogService.Write("");
var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
- //LogService.Write(result);
+ LogService.Write(result);
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
objjson.code = "0";
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index df1ca51..2fc61d1 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -181,10 +181,10 @@
ClsCNSRM oCnLoc = new ClsCNSRM();
DAL.ClsUser oUser = new DAL.ClsUser();
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);
+ //LogService.Write("娴嬭瘯1锛�"+ DBUtility.ClsPub.sExeReturnInfo);
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ //LogService.Write("娴嬭瘯2锛�" + DBUtility.ClsPub.sExeReturnInfo);
+ LogService.Write(FCusName);
if (FCusName == "澶忓疂鐢靛櫒")
ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
else
@@ -241,12 +241,13 @@
return objJsonResult; ;
}
//===========
- oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czymc='" + UserName + "'", "Gy_Czygl");
+ LogService.Write("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
+ oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'", "Gy_Czygl");
if (oDs == null || oDs.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩欎釜鐢ㄦ埛锛屼笉鑳戒慨鏀瑰瘑鐮侊紒";
+ objJsonResult.Message = "鍘熷瘑鐮侀敊璇紒";
objJsonResult.data = null;
return objJsonResult; ;
}
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 92f9c6a..62b7c1d 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -26,6 +26,7 @@
httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
//var loginResult = client.ValidateLogin("61b14ea86f5c8a", "Administrator", "sharbo@2012", 2052); 澶忓疂澶囦唤娴嬭瘯璐﹀
+ //var loginResult = client.ValidateLogin("61a5bea53ffc61", "Administrator", "1234.com", 2052);澶忓疂姝ｅ紡璐﹀
List<object> Parameters = new List<object>();
Parameters.Add("61b14ea86f5c8a");//璐﹀鏍囩ず
Parameters.Add("Administrator");//鐢ㄦ埛鍚�
--
Gitblit v1.9.1