From 3e6f3ed1a5fb9f98be997e8d9de63357fdd6758b Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 03 一月 2022 19:17:23 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/POInStockController.cs | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index a027ee5..a1e7d61 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -624,10 +624,13 @@
//string kdTbaleName = "AIS20211209082932";
string kdTbaleName = "AIS20211130140219";//澶忓疂姝ｅ紡
-
+
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 FROM
- CG_POINSTOCKBILLSUB B
+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,CR.FPRICE,CR.FTAXPRICE,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
@@ -658,13 +661,14 @@
JObject model = new JObject();
model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
- model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁绫诲瀷
+ 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() }); //閲囪喘缁勭粐
model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
model.Add("FOwnerTypeIdHead", "BD_OwnerOrg");// 璐т富绫诲瀷
model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富
+ model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ
JArray Fentity = new JArray();
foreach (var item in drs)
{
@@ -684,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["FPRICE"].ToString());//鍗曚环
+ FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//鍚◣鍗曚环
+ FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//绋庣巼
JArray Fentity2 = new JArray();
JObject FentityModel2 = new JObject();
@@ -712,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)
{
@@ -724,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涓诲唴鐜�
@@ -875,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";
@@ -988,7 +995,7 @@
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
//鏇存柊鍏宠仈鏁伴噺
HinterID = mylist[i].ToString();
- oCn.RunProc("exec h_p_SRM_UpDatePPBomRelationQty '"+ HinterID + "'");
+ oCn.RunProc("exec h_p_SRM_UpDatePPBomRelationQty '" + HinterID + "'");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1