From 7797383d4df8e2d5842f794b0ef3c6dec05c7b63 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 06 七月 2022 14:16:23 +0800
Subject: [PATCH] api可配置
---
WebAPI/Controllers/POInStockController.cs | 189 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 175 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index cf532bf..e11572c 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -156,8 +156,7 @@
objjson.data = null;
return objjson;
}
- DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
- ds = oClsCg_POInStockBill.ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ ds = ShowNewBillMainTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
@@ -215,8 +214,7 @@
objjson.data = null;
return objjson;
}
- DAL.ClsCg_POInStockBill oClsCg_POInStockBill = new DAL.ClsCg_POInStockBill();
- ds = oClsCg_POInStockBill.ShowNewBillSubTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg2), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
+ ds = ShowNewBillSubTo(DBUtility.ClsPub.isLong(sMsg), DBUtility.ClsPub.isStrNull(sMsg2), DBUtility.ClsPub.isStrNull(sMsg3), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
@@ -350,6 +348,10 @@
int i = 0;
foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
{
+ //鍒ゆ柇閲囪喘璁㈠崟鐘舵��
+ objJsonResult = TestPOOrder(oItemSub.HPOOrderEntryID.ToString());
+ if (objJsonResult.code == "0")
+ return objJsonResult;
//澧炲姞鍒ゆ柇 閫佽揣鏁伴噺瓒呭嚭閲囪喘璁㈠崟鏁伴噺
i++;
if (oItemSub.HQty <= 0)
@@ -668,15 +670,20 @@
DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
JObject model = new JObject();
- string fTypeName = "SLD01_SYS";//閲囪喘璁㈠崟绫诲瀷
+ string fTypeName = "SLD01_SYS";//鏍囧噯閲囪喘璁㈠崟绫诲瀷
+ string ywTypeName = "CG";//鏍囧噯涓氬姟绫诲瀷
if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+ {
fTypeName = "SLD03_SYS";
+ ywTypeName = "WW";
+ }
if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+ {
fTypeName = "SLD04_SYS";
-
+ ywTypeName = "ZCCG";
+ }
model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
- if (dr["FTYPENAME"].ToString().Contains("濮斿"))
- model.Add("FBusinessType", "WW"); //鍗曟嵁缂栧彿
+ model.Add("FBusinessType", ywTypeName); //涓氬姟绫诲瀷
model.Add("FBILLNO", dr["HBillNo"].ToString()); //鍗曟嵁缂栧彿
model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //閫氱煡鏃ユ湡
model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // 鏀舵枡缁勭粐
@@ -684,8 +691,8 @@
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_OwnerOrg");// 璐т富绫诲瀷
- model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].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)
@@ -999,15 +1006,17 @@
[Route("TestSaverPOInStock")]
- [HttpPost]
+ [HttpGet]
/// <summary>
/// 鐢熸垚閫佽揣鍗曞墠楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁鍒犻櫎鍜屽叧闂紝鐒跺悗鏇存柊鍏宠仈鏁伴噺
/// </summary>
/// <param name="HInterID"></param>
/// <returns></returns>
- public object TestSaverPOInStock([FromBody] string[] ids)
+ public object TestSaverPOInStock(string ids, string entryids)
{
- List<string> mylist = new List<string>(ids.Distinct());
+ List<string> mylist = new List<string>(ids.Split(',').Distinct());
+ List<string> entryList = new List<string>(entryids.Split(',').Distinct());
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
if (mylist.Count > 1)
{
objJsonResult.code = "0";
@@ -1018,14 +1027,32 @@
}
try
{
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ objJsonResult = TestPOOrder(entryids);
+ if (objJsonResult.code == "0")
+ return objJsonResult;
+
string HinterID = "";
for (int i = 0; i < mylist.Count; i++)
{
- SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
//鏇存柊鍏宠仈鏁伴噺
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");
+ if (ds != null || ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["鏈叧鑱旀暟閲�"].ToString() == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + ds.Tables[0].Rows[0]["鍗曟嵁鍙�"].ToString() + "宸插叏閮ㄧ敓鎴愰�佽揣鍗曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鎿嶄綔鎴愬姛!";
@@ -1042,5 +1069,139 @@
}
}
+ /// <summary>
+ /// 楠岃瘉 閲囪喘璁㈠崟
+ /// </summary>
+ /// <param name="entryids">閲囪喘璁㈠崟FENTRYID</param>
+ /// <returns></returns>
+ public JsonResult TestPOOrder(string entryids)
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ try
+ {
+ //楠岃瘉閲戣澏閲囪喘璁㈠崟鏄惁瀛樺湪
+ string sql = string.Format(@"
+select M.HBillNo,B.HMaterID,E.HNumber,E.HName
+FROM Cg_POOrderBillSub B
+JOIN Cg_POOrderBillMAIN M ON B.HINTERID = M.HINTERID
+JOIN Gy_Material E ON B.HMaterID = E.HItemID
+LEFT JOIN AIS20211130140219..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+WHERE ISNULL(C.FENTRYID,0) = 0
+AND B.HEntryID in ({0})"
+, entryids);
+ DataSet 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() + "锛屽搴旂殑閲戣澏閲囪喘璁㈠崟宸插垹闄わ紝涓嶈兘涓嬫帹閫佽揣鍗曪紒";
+ 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 AIS20211130140219..T_PUR_POORDERENTRY C ON B.HInterID = C.FID AND B.HEntryID = C.FENTRYID
+LEFT join AIS20211130140219..T_PUR_POCHANGEENTRY D ON C.FENTRYID = D.FOFENTRYID
+LEFT join AIS20211130140219..T_PUR_POCHANGE F ON D.FID = F.FID
+where b.HEntryID in ({0})
+and F.FDOCUMENTSTATUS <> 'C'"
+, entryids);
+ 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;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.Message.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟鐢熸垚閫佽揣鍗曟寜閽� 鏄剧ず鍗曟嵁澶�
+ /// </summary>
+ /// <param name="lngBillKey"></param>
+ /// <param name="HBillType"></param>
+ /// <param name="sShowItem"></param>
+ /// <param name="sReturn"></param>
+ /// <returns></returns>
+ public DataSet ShowNewBillMainTo(Int64 lngBillKey, string HBillType, string sShowItem, ref string sReturn)
+ {
+ try
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillMain_ForWeb " + lngBillKey.ToString() + ",'" + HBillType + "'", "h_p_SRM_POInStockBillMain_ForWeb");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁澶存湭鎵惧埌锛�";
+ return null;
+ }
+ sReturn = "鏄剧ず鍗曟嵁澶存垚鍔燂紒";
+ return Ds;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ return null;
+ }
+ }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟鐢熸垚閫佽揣鍗曟寜閽� 鏄剧ず鍗曟嵁浣�
+ /// </summary>
+ /// <param name="lngBillKey"></param>
+ /// <param name="lngBillKey2"></param>
+ /// <param name="HBillType"></param>
+ /// <param name="sShowItem"></param>
+ /// <param name="sReturn"></param>
+ /// <returns></returns>
+ public DataSet ShowNewBillSubTo(Int64 lngBillKey, string lngBillKey2, string HBillType, string sShowItem, ref string sReturn)
+ {
+ string s = "";
+ try
+ {
+ SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn(" exec h_p_SRM_POInStockBillSub_ForWeb '" + lngBillKey2 + "','" + HBillType + "'", "h_p_SRM_POInStockBillSub_ForWeb");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁浣撴湭鎵惧埌锛�";
+ return null;
+ }
+ sReturn = "鏄剧ず鍗曟嵁浣撴垚鍔燂紒";
+ return Ds;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message; //+ s
+ return null;
+ }
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1