From a2dde21e4f6c819d5880424d408f65462a4b4048 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 27 十月 2022 13:36:41 +0800
Subject: [PATCH] 优化
---
WebAPI/Controllers/POInStockController.cs | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 0f433f5..48a5e68 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -651,6 +651,13 @@
{
foreach (DataRow dr in dt.Rows)
{
+ //閲囪喘璁㈠崟涓嬫帹鐢熸垚閫佽揣鍗� 鏃跺�� 鍒ゆ柇鏄惁鏈夌敓鎴愰噰璐鍗曞彉鏇村崟 濡傛灉鏈変笖鍙樻洿鍗曠姸鎬佷笉涓哄凡瀹℃牳 闄愬埗涓嬫帹
+ 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
@@ -688,6 +695,7 @@
FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡
FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 搴撳瓨鍗曚綅
+ FentityModel.Add("FStockID", new JObject() { ["Fnumber"] = "BJCK-SH.01.005" }); // 搴撳瓨鍗曚綅
FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//璐т富绫诲瀷
FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//璐т富
@@ -1032,12 +1040,9 @@
{
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)
{
@@ -1071,13 +1076,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;
@@ -1267,8 +1265,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");
@@ -1276,7 +1274,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