From d26e95b18ba4921f7f1cc351d36e709626cc7d30 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 02 十一月 2022 13:28:10 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/POInStockController.cs | 129 ++++++++++++++++++++++++-------------------
1 files changed, 72 insertions(+), 57 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 611ffa6..9f6d4dc 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>
@@ -284,6 +281,7 @@
[HttpPost]
public object SaverPOInStock([FromBody] JObject msg)
{
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -300,6 +298,19 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_POInStockMain(msg2);
+ string billno = lsmain[0].HBillNo;
+ string yzsql = $"select count(*) as rows from Cg_POInStockBillMain where HBillNo = '{billno}'";
+ DataTable yzdt = oCn.RunProcReturn(yzsql, "yzds").Tables[0];
+ if (Convert.ToInt32(yzdt.Rows[0][0]) > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鏍规嵁鏀舵枡閫氱煡鍗曞彿鏍￠獙鏄惁宸茬敓鎴�
+ //string jysql = $"select * from ":
foreach (Model.ClsCg_POInStockBillMain oItem in lsmain)
{
//oItem.HMaker = "";
@@ -580,7 +591,6 @@
return objjson;
}
}
-
[Route("AuditPOInStockBill")]
[HttpGet]
public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
@@ -606,10 +616,11 @@
DataTable dt = new DataTable();
List<string> fidList = new List<string>();
string parameterSql = $"select HValue from Xt_SystemParameter where HKey ='Cg_POInStockBill_ErpAduit'";
- var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
+ //var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
+ string HValue = "Y";
if (HValue == "Y")
{
- if (FCusName == "鐟炰笌绁�" || FCusName == "")
+ if (FCusName == "鐟炰笌绁�" || FCusName == "" || FCusName.Contains("鍥涚淮灏�") || 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 +646,23 @@
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()))
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ objJsonResult = TestPOOrder(dr["FEntryID"].ToString());
+ if (objJsonResult.code == "0")
+ return objJsonResult;
+ }
+ foreach (DataRow dr in dt.Rows)
+ {
+ 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 +684,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 +754,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 +774,12 @@
objjson.data = null;
return objjson;
}
+
}
+ }
+ else
+ {
+ LogService.Write("鏀舵枡閫氱煡鍗曞鏍告棤鏁版嵁锛�" + sql);
}
}
else if (FCusName == "澶忓疂鐢靛櫒")
@@ -805,7 +820,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 +981,6 @@
objjson.data = HinterID;
return objjson;
}
-
public int GetHinterIDByBillNo(string HBillNo, string type)
{
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
@@ -980,8 +993,6 @@
HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
return HInterID;
}
-
-
[Route("DeltetPOInStockBill")]
[HttpGet]
public object DeltetPOInStockBill(string HInterID, string HUserName)
@@ -1023,18 +1034,14 @@
return objJsonResult;
}
}
-
//瀹℃牳 鍒犻櫎 鍒犻櫎閲戣澏鏁版嵁搴撳搴� 鏀舵枡閫氱煡鍒版暟鎹�
public json DeleteKingDee(string hinterid)
{
var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
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 {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
- else if (FCusName.Contains("鐟炰笌绁�") || FCusName == "")
- sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..T_PUR_RECEIVE t2 on t1.HERPInterID = t2.FID where HERPInterID>0 and hinterid in (" + hinterid + ")";
+ //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);
+ var sql = $"select HinterID,HERPBillNO,HERPInterID from Cg_POInStockBillMain t1 join {kdTbaleName}..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)
{
@@ -1068,13 +1075,6 @@
//LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- //var errorsList = JObject.Parse(result)["Result"]["ResponseStatus"]["Errors"];
- //List<string> errList = new List<string>();
- //foreach (var item in errorsList)
- //{
- // errList.Add(item["Message"].ToString()+ "\r\n");
- //}
- //string err = string.Join(",", errList);
objjson.code = "0";
objjson.count = 0;
objjson.Message = "瀵瑰簲閲戣澏鏀舵枡閫氱煡鍗曞垹闄ゅけ璐� 锛乗r\n" + result;
@@ -1088,10 +1088,6 @@
return objjson;
}
-
-
-
-
//[Route("POInStockAccept")]
//[HttpGet]
///// <summary>
@@ -1164,8 +1160,6 @@
// return objJsonResult;
// }
// }
-
-
[Route("TestSaverPOInStock")]
[HttpGet]
/// <summary>
@@ -1199,20 +1193,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";
@@ -1270,8 +1264,8 @@
JOIN Gy_Material E ON B.HMaterID = E.HItemID
JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
LEFT join {1}..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
-LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
-where b.HEntryID in ({0})
+LEFT join {1}..T_PUR_POCHANGE F ON D.FID = F.FID
+where b.HEntryID in ({0})
and F.FDOCUMENTSTATUS <> 'C'"
, entryids, kdTbaleName);
ds = oCn.RunProcReturn(sql, "temp");
@@ -1279,7 +1273,28 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屾湁瀵瑰簲閲囪喘璁㈠崟鍙樻洿鍗�:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "鏈鏍革紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屽瓨鍦ㄥ搴旈噰璐鍗曞彉鏇村崟:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "鏈鏍革紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曟柊鍙樻洿鍗� 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName,F.FBILLNO
+FROM Cg_POOrderBillSub B
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+JOIN {1}..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT join {1}..t_PUR_XPOOrderENTRY D ON C.FENTRYID = D.FPKIDX
+LEFT join {1}..t_PUR_XPOOrder F ON D.FID = F.FID
+where F.FDOCUMENTSTATUS <> 'C' and b.HEntryID in ({0}) "
+ , entryids, kdTbaleName);
+ ds = oCn.RunProcReturn(sql, "temp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + ",鐗╂枡缂栫爜锛�" + ds.Tables[0].Rows[0]["HNumber"].ToString() + "锛屽瓨鍦ㄥ搴旈噰璐鍗曟柊鍙樻洿鍗�:" + ds.Tables[0].Rows[0]["FBILLNO"].ToString() + "鏈鏍革紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1