From 5f2e686a12b4d915c8fd4ab1f522048119e8477f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 16 二月 2022 16:15:33 +0800
Subject: [PATCH] 安瑞调整
---
WebAPI/Controllers/POInStockController.cs | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 85a8bfd..4204b4c 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";
@@ -626,24 +630,28 @@
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
+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
,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
- LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
- JOIN {0}..T_PUR_POORDERENTRY_D CD ON C.FENTRYID = CD.FENTRYID
- LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
- JOIN {0}..T_PUR_POORDERENTRY_F CR ON C.FENTRYID = CR.FENTRYID
- LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
- JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
- LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
- LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
- JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
- LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
+,CU.FNUMBER AS FUNITNUMBER,D.F_XBKF_COMBO1,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER,D.F_XBKF_BASE1,isnull(T5.FNUMBER,'') AS FRECEIVEMENNUMBER
+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
+LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
+JOIN {0}..T_PUR_POORDERENTRY_D CD ON C.FENTRYID = CD.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
+JOIN {0}..T_PUR_POORDERENTRY_F CR ON C.FENTRYID = CR.FENTRYID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
+LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
+LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID
+LEFT JOIN {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
+LEFT JOIN {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
+LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
+LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
+JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
+LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID
WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
DataTable dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
@@ -660,13 +668,23 @@
DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());
JObject model = new JObject();
- model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //鍗曟嵁绫诲瀷
+ string fTypeName = "SLD01_SYS";//閲囪喘璁㈠崟绫诲瀷
+ if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+ fTypeName = "SLD03_SYS";
+ if (dr["FTYPENAME"].ToString().Contains("璧勪骇"))
+ fTypeName = "SLD04_SYS";
+
+ model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //鍗曟嵁绫诲瀷
+ if (dr["FTYPENAME"].ToString().Contains("濮斿"))
+ model.Add("FBusinessType", "WW"); //鍗曟嵁缂栧彿
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("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["FPURCHASEORGNUMBER"].ToString() });//璐т富
model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//鏄惁鏈夌エ
JArray Fentity = new JArray();
@@ -790,12 +808,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;
}
@@ -806,11 +824,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"]);
@@ -828,11 +848,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);
@@ -885,7 +905,7 @@
}
//LogService.Write("");
var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
- LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
+ //LogService.Write("api缁撴灉鍒犻櫎锛�" + result);
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
objjson.code = "0";
@@ -988,6 +1008,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