From c7a507c5d77652d5ceb722ff032f68514d369deb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 九月 2024 10:02:17 +0800
Subject: [PATCH] 收料通知单同步双计量单位；打印模板设置；json版本
---
WebAPI/Controllers/WebAPIController.cs | 81 ++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/POInStockController.cs | 7 ++-
WebAPI/WebAPI.csproj | 9 +++-
3 files changed, 92 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index 5251654..fb1547c 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -1062,6 +1062,7 @@
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber,B.HBatChNo,D.FBILLTYPEID
+,CU2.FNUMBER AS FPRICEUNITNUMBER
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
@@ -1079,6 +1080,8 @@
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
+LEFT JOIN {0}..T_PUR_POORDERENTRY_F CF ON C.FID = CF.FID AND C.FENTRYID = CF.FENTRYID
+LEFT JOIN {0}..T_BD_UNIT CU2 ON CF.FPRICEUNITID =CU2.FUNITID
WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID, CustomFields);
dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
@@ -1128,7 +1131,7 @@
FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 鐗╂枡缂栫爜
FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 鍗曚綅
FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //棰勮鍒拌揣鏃ユ湡
- FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 璁′环鍗曚綅
+ FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FPRICEUNITNUMBER"].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"])); // 渚涘簲鍟嗛�佽揣鏁伴噺锛堟彁鏂欒鍒掓暟閲� - 宸茬敓鎴愰�佽揣鍗曟暟閲忥級
@@ -1189,7 +1192,7 @@
objjson.data = null;
return objjson;
}
- //LogService.Write("jsonRoot:" + jsonRoot.ToString());
+ LogService.Write("jsonRoot:" + jsonRoot.ToString());
var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
//LogService.Write(result);
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 48f1ae6..a578e16 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -468,6 +468,87 @@
}
}
+ /// <summary>
+ /// 璁剧疆榛樿鎵撳嵃妯℃澘
+ /// </summary>
+ /// <returns></returns>
+ [Route("Open_PrintTem/DefaultOpenTmp")]
+ [HttpGet]
+ public object DefaultOpenTmp(string HNumber, string HName)
+ {
+ ClsCN oCn = new ClsCN();
+ try
+ {
+ oCn.BeginTran();
+ //鍏堟妸姝ゆā鍧椾笅鐨勬ā鏉块粯璁ゆā鏉挎爣璁伴兘鍏抽棴
+ oCn.RunProc("update SRM_OpenTmp set HStdFlag = 0 where HNumber='" + HNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鏇存柊褰撳墠妯℃澘涓洪粯璁ゆā鏉�
+ oCn.RunProc("update SRM_OpenTmp set HStdFlag = 1 where HNumber='" + HNumber + "' and HName='" + HName + "'", ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "璁剧疆鎴愬姛!";
+ objjson.data = null;
+ return objjson;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁剧疆澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ #region [鑾峰彇榛樿鎵撳嵃妯℃澘]
+ /// <summary>
+ /// 鑾峰彇鎵撳嵃妯℃澘鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Open_PrintTem/GetDefaultOpenTmp_Json")]
+ [HttpGet]
+ public object GetDefaultOpenTmp_Json(string HNumber)
+ {
+ sWhere = " Where 榛樿鏍囪=1 ";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (HNumber != "")
+ {
+ sWhere = sWhere + " and ( HNumber = '" + HNumber + "') ";
+ }
+ ClsCN oCn = new ClsCN();
+ try
+ {
+ ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触,娌℃湁璁剧疆榛樿妯℃澘" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "寮傚父" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+ #endregion
+
#region 鍩虹璧勬枡
/// <summary>
/// 鑾峰彇浠撳簱鍒楄〃
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index ff0e118..10f5154 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -100,9 +100,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\Model.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <Reference Include="Newtonsoft.Json, Version=13.0.1.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\WeChat Files\shenjie1112005\FileStorage\File\2019-12\webapi鎺ュ彛\FurjaFlatFormAPI\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\..\..\..\缃戠珯鍙戝竷\瀹夌憺渚涘簲鍟嗗钩鍙�-json鐗堟湰\SRMAPI\bin\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
@@ -154,7 +155,9 @@
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
- <Reference Include="System" />
+ <Reference Include="System">
+ <Private>True</Private>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
--
Gitblit v1.9.1