From 0a20d7aa20c8b1a6503ad18ceff60213c777a474 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 11 一月 2022 13:29:39 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/POInStockController.cs | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 4169748..33ba1f4 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -289,7 +289,9 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ //LogService.Write("msg1:" + msg1);
+ //LogService.Write("msg2:" + msg2);
+ //LogService.Write("msg3:" + msg3);
string UserName = "";
ListModels oListModels = new ListModels();
@@ -343,10 +345,12 @@
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>();
+
ls = oListModels.getObjectByJson_POInStockSub(msg3);
int i = 0;
foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
{
+ //澧炲姞鍒ゆ柇 閫佽揣鏁伴噺瓒呭嚭閲囪喘璁㈠崟鏁伴噺
i++;
if (oItemSub.HQty <= 0)
{
@@ -612,7 +616,7 @@
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
//閲囪喘璁㈠崟 鐢熸垚閫佽揣鍗曞垪琛�
if (!String.IsNullOrEmpty(HBillNo))
- HInterID = GetHinterIDByBillNo(HBillNo).ToString();
+ HInterID = GetHinterIDByBillNo(HBillNo, "Aduit").ToString();
if (HInterID == "0")
{
objjson.code = "0";
@@ -628,8 +632,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,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
@@ -687,6 +692,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();
@@ -715,9 +723,7 @@
["IsVerifyBaseDataField"] = "false",
["Model"] = model
};
- LogService.Write(JsonConvert.SerializeObject(jsonRoot));
var loginRet = InvokeHelper.Login();
- LogService.Write("loginRet:" + loginRet);
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
@@ -727,9 +733,9 @@
objjson.data = null;
return objjson;
}
- LogService.Write(jsonRoot.ToString());
+ LogService.Write("jsonRoot:" + 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涓诲唴鐜�
@@ -788,12 +794,12 @@
[HttpGet]
public object GetHinterID(string HBillNo)
{
- int HinterID = GetHinterIDByBillNo(HBillNo);
+ int HinterID = GetHinterIDByBillNo(HBillNo, "Print");
if (HinterID == 0)
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鎿嶄綔澶辫触,璇峰厛淇濆瓨璁㈠崟";
+ objjson.Message = "鎿嶄綔澶辫触,璇峰厛淇濆瓨骞跺鏍歌鍗�";
objjson.data = HinterID;
return objjson;
}
@@ -804,11 +810,13 @@
return objjson;
}
- public int GetHinterIDByBillNo(string HBillNo)
+ public int GetHinterIDByBillNo(string HBillNo, string type)
{
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
int HInterID = 0;
string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
+ if (type == "Print")
+ sql += " and HBillStatus = '2' ";//鎵撳嵃鍒ゆ柇鏄惁瀹℃牳
DataTable dt = oCn.RunProcReturn(sql, "HInterID").Tables[0];
if (dt.Rows.Count > 0)
HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
@@ -826,11 +834,11 @@
DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
//鍏堝垹闄� 閲戣澏鏁版嵁
objjson = DeleteKingDee(HInterID);
- LogService.Write(objjson.ToString());
+ //LogService.Write(objjson.ToString());
if (objjson.code == "0")
return objjson;
- WebAPIController.Add_Log("閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + HBillNo, HUserName, "閫佽揣鍗曞垹闄�");
+ WebAPIController.Add_Log("閫佽揣鍗曞垹闄�", HUserName, "閫佽揣鍗曞垹闄わ紝鍗曞彿锛�" + HBillNo);
oCN.BeginTran();
oBill.DeleteRelation(ref DBUtility.ClsPub.sExeReturnInfo, Convert.ToInt32(HInterID));
oCN.RunProc("Delete From Cg_POInStockBillMain where HInterID = " + HInterID);
@@ -858,6 +866,9 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format("select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain where HERPInterID>0 and hinterid in (" + hinterid + ")");
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (FCusName == "澶忓疂鐢靛櫒")
+ sql = "select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join AIS20211130140219..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
DataTable dt = oCN.RunProcReturn(sql, "deleteDt").Tables[0];
if (dt.Rows.Count > 0)
{
@@ -878,9 +889,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";
@@ -983,6 +994,14 @@
public object TestSaverPOInStock([FromBody] string[] ids)
{
List<string> mylist = new List<string>(ids.Distinct());
+ if (mylist.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触锛佽閫夋嫨鐩稿悓閲囪喘璁㈠崟鏁版嵁琛屼笅鎺紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
try
{
string HinterID = "";
--
Gitblit v1.9.1