From 1204150d723e868fe761911f877500b1aad9ab81 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 13 九月 2022 15:11:07 +0800
Subject: [PATCH] 优化
---
WebAPI/Controllers/POInStockController.cs | 61 ++++++++++--------------------
1 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 611ffa6..9b87d03 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -23,7 +23,6 @@
private json objjson = new json();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
-
/// <summary>
/// 鏇存柊鎵撳嵃娆℃暟
/// </summary>
@@ -55,7 +54,6 @@
return objJsonResult;
}
}
-
/// <summary>
/// 鐢熸垚閫佽揣鍗曞崟鎹彿銆佹棩鏈�
/// </summary>
@@ -273,7 +271,6 @@
return objJsonResult;
}
}
-
/// <summary>
/// 淇濆瓨閫佽揣鍗�
/// </summary>
@@ -580,7 +577,6 @@
return objjson;
}
}
-
[Route("AuditPOInStockBill")]
[HttpGet]
public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
@@ -609,7 +605,7 @@
var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
if (HValue == "Y")
{
- if (FCusName == "鐟炰笌绁�" || FCusName == "")
+ if (FCusName == "鐟炰笌绁�" || FCusName == "" || FCusName.Contains("鍥涚淮灏�"))
{
sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
@@ -635,21 +631,16 @@
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
- LogService.Write(sql);
- //LEFT JOIN {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
-
dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
if (dt.Rows.Count > 0)
{
foreach (DataRow dr in dt.Rows)
{
- if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
+ if (fidList.Contains(dr["HINTERID"].ToString()))
continue;
else
- fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
-
- DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
-
+ fidList.Add(dr["HINTERID"].ToString());
+ DataRow[] drs = dt.Select("HINTERID = " + dr["HINTERID"].ToString());
JObject model = new JObject();
string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
@@ -671,10 +662,8 @@
model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //閲囪喘缁勭粐
model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //渚涘簲鍟�
model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //閲囪喘鍛�
- //model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //鏀舵枡鍛�
model.Add("FOwnerTypeIdHead", "BD_Supplier");// 璐т富绫诲瀷
model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//璐т富 渚涘簲鍟�
- //model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ
JArray Fentity = new JArray();
foreach (var item in drs)
{
@@ -743,7 +732,6 @@
//鏇存柊閫佽揣鍗� 涓昏〃 ERP鍗曟嵁鍙� 浠ュ強 ERP涓诲唴鐜�
string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
string FID = JObject.Parse(result)["Result"]["Id"].ToString();
-
string updateSql = string.Format(@"
update a set
a.HERPInterID = {0} ,
@@ -764,7 +752,11 @@
objjson.data = null;
return objjson;
}
+
}
+ }
+ else {
+ LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�"+sql);
}
}
else if (FCusName == "澶忓疂鐢靛櫒")
@@ -805,7 +797,6 @@
fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());
DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
-
JObject model = new JObject();
string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
@@ -967,7 +958,6 @@
objjson.data = HinterID;
return objjson;
}
-
public int GetHinterIDByBillNo(string HBillNo, string type)
{
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
@@ -980,8 +970,6 @@
HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
return HInterID;
}
-
-
[Route("DeltetPOInStockBill")]
[HttpGet]
public object DeltetPOInStockBill(string HInterID, string HUserName)
@@ -1023,7 +1011,6 @@
return objJsonResult;
}
}
-
//瀹℃牳 鍒犻櫎 鍒犻櫎閲戣澏鏁版嵁搴撳搴� 鏀舵枡閫氱煡鍒版暟鎹�
public json DeleteKingDee(string hinterid)
{
@@ -1088,10 +1075,6 @@
return objjson;
}
-
-
-
-
//[Route("POInStockAccept")]
//[HttpGet]
///// <summary>
@@ -1164,8 +1147,6 @@
// return objJsonResult;
// }
// }
-
-
[Route("TestSaverPOInStock")]
[HttpGet]
/// <summary>
@@ -1199,20 +1180,20 @@
//鏇存柊鍏宠仈鏁伴噺
var HinterID = mylist[i].ToString();
oCn.RunProc($"exec h_p_SRM_UpDatePPBomRelationQty {HinterID}");
- //鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
- DataSet ds = oCn.RunProcReturn("select * from H_v_SRM_POOrderBillList where hmainid='" + HinterID + "'", "H_v_SRM_POOrderBillList");
- DataTable dt = ds.Tables[0];
- if (dt.Rows.Count > 0)
+ }
+ //鍒ゆ柇鏈叧鑱旀暟閲忔槸鍚︿负0
+ DataSet ds = oCn.RunProcReturn($"select * from H_v_SRM_POOrderBillList where hsubid in ({string.Join(", ", entryList)}) ", "H_v_SRM_POOrderBillList");
+ DataTable dt = ds.Tables[0];
+ if (dt.Rows.Count > 0)
+ {
+ DataRow[] dr = dt.Select("鏈叧鑱旀暟閲� = " + 0);
+ if (dr.Count() > 0)
{
- DataRow[] dr = dt.Select("鏈叧鑱旀暟閲� = " + 0);
- if (dr.Count() > 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙凤細" + dr[0]["鍗曟嵁鍙�"].ToString() + "鏈叧鑱旀暟閲忎负0锛屽凡鍏ㄩ儴鐢熸垚閫佽揣鍗曪紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"璇锋鏌ユ暟鎹紝鍗曟嵁鍙凤細{dr[0]["鍗曟嵁鍙�"]},鐗╂枡浠ｇ爜锛歿dr[0]["鐗╂枡浠ｇ爜"]},鏈叧鑱旀暟閲忎负0锛屽凡鍏ㄩ儴鐢熸垚閫佽揣鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
}
}
objJsonResult.code = "1";
--
Gitblit v1.9.1