From 88bb69435005d4fb19ac431e9d4dff851df2e1b6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 09 八月 2022 16:07:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Config/kdapi.config | 5 +++--
WebAPI/Controllers/POStockInBillController.cs | 53 ++++++++++++++++++++++++++---------------------------
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/WebAPI/Config/kdapi.config b/WebAPI/Config/kdapi.config
index 5811655..897fcfa 100644
--- a/WebAPI/Config/kdapi.config
+++ b/WebAPI/Config/kdapi.config
@@ -4,6 +4,7 @@
<add key="DbId" value="6204a70eba35fc"></add>
<add key="UserName" value="Administrator"></add>
<add key="PassWord" value="qaz!@#123"></add>
- <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>
- </appSettings>
+ <add key="KDApiUrl" value="http://47.96.97.237/K3Cloud/"></add>
+ <add key="DataBaseName" value="AIS20210811135644"></add>
+ </appSettings>
</configuration>
\ No newline at end of file
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index d59000c..17ea1cf 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -1058,7 +1058,7 @@
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
DataTable dt = new DataTable();
List<string> fidList = new List<string>();
- if (FCusName == "鐟炰笌绁�")
+ if (FCusName == "鐟炰笌绁�" || FCusName == "")
{
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
@@ -1076,7 +1076,7 @@
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}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID and FLOCALEID=2052
LEFT JOIN {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.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
@@ -1118,10 +1118,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)
{
@@ -1174,7 +1172,7 @@
};
var loginRet = InvokeHelper.Login();
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
- if (isSuccess == 0)
+ if (isSuccess <= 0)
{
objjson.code = "0";
objjson.count = 0;
@@ -1231,8 +1229,8 @@
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}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
+LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID and FLOCALEID=2052
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
@@ -1371,7 +1369,7 @@
}
}
}
- var check = Get_ReciveBillCheckDate(HBillNo);
+ var check = Exec_ReciveBillCheck(HBillNo);
if (check.code == "0")
return check;
//if(check)
@@ -1438,7 +1436,7 @@
else
{
objjson.code = "0";
- objjson.count = 0;
+ objjson.count = 0;
objjson.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
objjson.data = null;
return objjson;
@@ -1452,15 +1450,16 @@
objjson.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objjson.data = null;
return objjson;
-
+
}
}
//鏀舵枡閫氱煡鍗曞鏍� 瀹℃牳鎻愪氦
[Route("POStockInBillList/Exec_ReciveBillCheck")]
[HttpGet]
- public object Exec_ReciveBillCheck(string HBarCode)
+ public json Exec_ReciveBillCheck(string HBarCode)
{
+ json objjson = new json();
try
{
//淇敼閲戣澏鐢熶骇鍗曠殑鐘舵��
@@ -1470,11 +1469,11 @@
if (isSuccess == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
- objJsonResult.data = null;
- return objJsonResult;
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objjson.data = null;
+ return objjson;
}
var json = new
{
@@ -1499,25 +1498,25 @@
//鍒ゆ柇瀹℃牳鏄惁鎴愬姛
if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鏀舵枡閫氱煡鍗曞け璐ワ紒鍗曟嵁鍙凤細" + HBarCode;
- objJsonResult.data = null;
- return objJsonResult;
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "瀹℃牳鏀舵枡閫氱煡鍗曞け璐ワ紒鍗曟嵁鍙凤細" + HBarCode;
+ objjson.data = null;
+ return objjson;
}
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
objJsonResult.data = 1;
- return objJsonResult;
+ return objjson;
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
- objJsonResult.data = null;
- return objJsonResult;
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objjson.data = null;
+ return objjson;
}
}
--
Gitblit v1.9.1