From aa609ae65ccea4c78934a1f41f92a5ef3733fe64 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 03 一月 2022 19:01:46 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/POInStockController.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 4169748..27433ac 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -628,8 +628,9 @@
string sql = string.Format(@"
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,D.F_xbkf_Combo1 FROM
- CG_POINSTOCKBILLSUB B
+E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
+,CU.FNUMBER AS FUNITNUMBER,D.F_xbkf_Combo1,c.F_XBKF_DECIMAL3,c.F_XBKF_DECIMAL4,CR.FTAXRATE
+ 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
LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
@@ -687,6 +688,9 @@
FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//婧愬崟鍗曞彿
FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//婧愬崟鍒嗗綍鍐呯爜
FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
+ FentityModel.Add("FPrice", item["F_XBKF_DECIMAL3"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["F_XBKF_DECIMAL4"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTaxRate"].ToString());//绋庣巼
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
@@ -715,9 +719,9 @@
["IsVerifyBaseDataField"] = "false",
["Model"] = model
};
- LogService.Write(JsonConvert.SerializeObject(jsonRoot));
+ LogService.Write(JsonConvert.SerializeObject(jsonRoot.ToString()));
var loginRet = InvokeHelper.Login();
- LogService.Write("loginRet:" + loginRet);
+ //LogService.Write("loginRet:" + loginRet);
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
@@ -727,9 +731,9 @@
objjson.data = null;
return objjson;
}
- LogService.Write(jsonRoot.ToString());
+ //LogService.Write(jsonRoot.ToString());
var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
- LogService.Write(result);
+ //LogService.Write(result);
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
{
//鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
@@ -878,9 +882,9 @@
objjson.data = null;
return objjson;
}
- LogService.Write("");
+ //LogService.Write("");
var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
- LogService.Write(result);
+ LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
objjson.code = "0";
--
Gitblit v1.9.1