From 97e4a58f895c8b020f7dcd736fd608000b6db18b Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 12 七月 2024 16:58:27 +0800
Subject: [PATCH] 新增网页版单位换算列表所需调用方法
---
WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs | 307 +++++++++++++++++++++++++++++++++++++++++++++++++++
Model/基础资料/基础资料/ClsGy_UnitConvertRate_Model.cs | 18 +++
WebAPI/Web.config | 4
WebAPI/WebAPI.csproj.user | 2
Model/Model.csproj | 1
WebAPI/InvokeHelper.cs | 17 ++
WebAPI/WebAPI.csproj | 1
7 files changed, 344 insertions(+), 6 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index b2b2d6f..b325f43 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -465,6 +465,7 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_BarCodeCheckType_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Item30JiTai_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_User_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_UnitConvertRate_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_Work_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeMain_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsXt_FastICSchemeSub_Model.cs" />
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_UnitConvertRate_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_UnitConvertRate_Model.cs"
new file mode 100644
index 0000000..668cb8d
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_UnitConvertRate_Model.cs"
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_UnitConvertRate_Model : DBUtility.ClsGy_Base_Model
+ {
+ public string HBILLNO; // varchar(30)
+ public Int64 HMATERID; // int --物料
+ public Int64 HCURRENTUNITID; // int --当前单位
+ public Int64 HDESTUNITID; // int --目标单位
+ public string HCONVERTTYPE; // varchar(20) --类型
+ public double HCONVERTNUMERATOR; // dec(23, 10) --分子
+ public double HCONVERTDENOMINATOR; // dec(23, 10) --分母
+ public string HFORBIDSTATUS; // varchar(10) --状态
+ }
+}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
new file mode 100644
index 0000000..2d04bce
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_UnitConvertRateController.cs"
@@ -0,0 +1,307 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Gy_UnitConvertRateController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ const string ModCaption = "鍗曚綅鎹㈢畻";
+ public const string ModRightName = "Gy_UnitConvertRate";
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+
+ #region 鍗曚綅鎹㈢畻鍒楄〃
+ /// <summary>
+ /// 鑾峰彇鍗曚綅鎹㈢畻鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRateList_Json")]
+ [HttpGet]
+ public object GetGy_UnitConvertRateList_Json(string sWhere, string HMaker, string OperationType)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺 1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮� 2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
+ if (OperationType == "1")
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("select * from h_v_Gy_UnitConvertRateList where " + sWhere + " order by HItemID desc", "h_v_Gy_UnitConvertRateList");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍗曚綅鎹㈢畻鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎鍗曚綅鎹㈢畻
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRate_Delete_Json")]
+ [HttpGet]
+ public object GetGy_UnitConvertRate_Delete_Json(Int64 HItemID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCn.BeginTran();
+ //鍒ゆ柇瀛樺湪鎬�
+ ds = oCn.RunProcReturn("select HNumber,HName from Gy_UnitConvertRate with(nolock) where HItemID= " + HItemID.ToString(), "Gy_UnitConvertRate");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ崟浣嶆崲绠楋紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCn.RunProc("Delete from Gy_UnitConvertRate where HItemID= " + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆鏃ュ織
+ DBUtility.ClsPub.Add_Log("", "鍒犻櫎鍗曚綅鎹㈢畻锛屼唬鐮侊細" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HNumber"]) + ",鍚嶇О锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HName"]), HMaker);
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍗曚綅鎹㈢畻鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍗曚綅鎹㈢畻澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍗曚綅鎹㈢畻鎵归噺鍚屾
+ /// <summary>
+ /// 浠庨噾铦朵簯鎵归噺鍚屾鍗曚綅鎹㈢畻鑷虫湰鍦拌〃
+ /// </summary>
+ [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRate_BatchSync_Json")]
+ [HttpGet]
+ public object GetGy_UnitConvertRate_BatchSync_Json()
+ {
+ try
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
+ //绉佹湁浜戞ā寮忥紝閫氳繃璋冪敤瀛樺偍杩囩▼杩涜鍚屾
+ if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "Y")
+ {
+ ds = oCn.RunProcReturn("exec h_p_IFCLD_ERPDataToLocal_UnitConvertRate", "h_p_IFCLD_ERPDataToLocal_UnitConvertRate");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏湁浜戞ā寮忥紝閫氳繃璋冪敤WEBAPI鏂瑰紡杩涜鍚屾
+ else if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N")
+ {
+ //鍒ゆ柇閲戣澏浜戞槸鍚︾櫥褰曟垚鍔�
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵归噺鍚屾澶辫触锛岄噾铦朵簯鐧诲叆涓嶆垚鍔燂紝璇风‘璁鐩橀厤缃枃浠舵墍璁剧疆閲戣澏浜戝搴旂綉鍧�銆佽处濂椼�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮佹槸鍚︽纭紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var json = new
+ {
+ FormId = "BD_UNITCONVERTRATE",
+ FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
+ ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
+ ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
+ FilterString = "",
+ OrderString = "",
+ TopRowCount = 0,
+ StartRow = 0,
+ Limit = 0
+ };
+ //鏌ョ湅 鑾峰彇鏁版嵁
+ var _result = InvokeHelper.Query("BD_UNITCONVERTRATE", JsonConvert.SerializeObject(json));
+
+ //鍙嶅簭鍒楀寲
+ _result = _result.Replace("\"", "");
+ _result = _result.Replace("\n", "");
+ _result = _result.Replace(",[", "");
+ _result = _result.Replace("[", "");
+ string[] rows = _result.Split(new string[] { "]" }, StringSplitOptions.RemoveEmptyEntries); //浠�"]"鍒嗛殧姣忎竴琛屽苟绉婚櫎绌鸿
+ string[,] arr = new string[rows.Length, rows[0].Split(',').Length]; //鏍规嵁琛屽拰鍒楁暟鍒涘缓浜岀淮鏁扮粍
+ for (int i = 0; i < rows.Length; i++) //閬嶅巻姣忎竴琛�
+ {
+ string[] cols = rows[i].Split(','); //浠ラ�楀彿鍒嗛殧姣忎竴鍒�
+ for (int j = 0; j < cols.Length; j++) //閬嶅巻姣忎竴鍒�
+ {
+ arr[i, j] = cols[j]; //瀛樺叆浜岀淮鏁扮粍
+ }
+ }
+ //娓呯┖鍗曚綅鎹㈢畻琛ㄦ暟鎹�
+ oCn.RunProc("Delete from Gy_UnitConvertRate", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //杈撳嚭浜岀淮鏁扮粍
+ for (int i = 0; i < arr.GetLength(0); i++)
+ {
+ var subData = new
+ {
+ HItemID = DBUtility.ClsPub.isLong(arr[i, 0]),
+ HNumber = "",
+ HName = "",
+ HShortNumber = "",
+ HParentID = 0,
+ HLevel = 1,
+ HEndFlag = 1,
+ HStopflag = arr[i, 5].ToString() == "B" ? 1 : 0,
+ HRemark = "CLD-ERP瀵煎叆",
+ HUseFlag = "宸蹭娇鐢�",
+ HUSEORGID = DBUtility.ClsPub.isLong(arr[i, 3]),
+ HCREATEORGID = DBUtility.ClsPub.isLong(arr[i, 4]),
+ HBILLNO = DBUtility.ClsPub.isStrNull(arr[i, 1]),
+ HMATERID = DBUtility.ClsPub.isLong(arr[i, 2]),
+ HCURRENTUNITID = DBUtility.ClsPub.isLong(arr[i, 6]),
+ HDESTUNITID = DBUtility.ClsPub.isLong(arr[i, 7]),
+ HCONVERTTYPE = DBUtility.ClsPub.isStrNull(arr[i, 8]),
+ HCONVERTNUMERATOR = DBUtility.ClsPub.isDoule(arr[i, 9]),
+ HCONVERTDENOMINATOR = DBUtility.ClsPub.isDoule(arr[i, 10]),
+ HFORBIDSTATUS = DBUtility.ClsPub.isStrNull(arr[i, 5]),
+ HUnitID = DBUtility.ClsPub.isLong(arr[i, 2] == "0" ? arr[i, 6] : "-1"),
+ HMakeEmp = DBUtility.ClsPub.isStrNull(arr[i, 11]),
+ HMakeTime = DBUtility.ClsPub.isDate(arr[i, 12]),
+ HCheckEmp = DBUtility.ClsPub.isStrNull(arr[i, 15]),
+ HCheckTime = DBUtility.ClsPub.isDate(arr[i, 16]),
+ HModifyEmp = DBUtility.ClsPub.isStrNull(arr[i, 13]),
+ HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
+ HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
+ HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
+ };
+
+ //鍐欏叆鍗曚綅鎹㈢畻琛ㄦ暟鎹�
+ oCn.RunProc("set identity_insert Gy_UnitConvertRate on", ref DBUtility.ClsPub.sExeReturnInfo);
+ string sql = $@"Insert into Gy_UnitConvertRate
+ (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
+ ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
+ ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
+ ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
+ ,HMakeEmp,HMakeTime
+ ,HCheckEmp,HCheckTime
+ ,HModifyEmp,HModifyTime
+ ,HStopEmp,HStopTime)
+ Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
+ ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
+ ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
+ ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
+ ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
+ ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
+ ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
+ ,'{subData.HStopEmp}',case when '{subData.HStopTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HStopTime}' end)";
+ oCn.RunProc(sql.Replace("\r\n", ""));
+ oCn.RunProc("set identity_insert Gy_UnitConvertRate off", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓嶆敮鎸佹壒閲忓悓姝ュ姛鑳斤紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曚綅鎹㈢畻鎵归噺鍚屾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ }
+}
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 2cdb5c3..ae7824f 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -16,9 +16,17 @@
/// </summary>
public static string Login()
{
- var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
- var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
- var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
+ //浠嶤鐩橀厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo);
+ var useName = Pub_Class.ClsPub.sCLOUDUseName;
+ var pwd = Pub_Class.ClsPub.sCLOUDPsd;
+ var dbId = Pub_Class.ClsPub.sCLOUDAcc;
+ CloudUrl = Pub_Class.ClsPub.sCLOUDUrl;
+
+ //鍘熶粠Config/kdapi.config妯″潡涓幏鍙� 20240712灞忚斀
+ //var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
+ //var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
+ //var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
HttpClient httpClient = new HttpClient();
httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");
@@ -215,6 +223,9 @@
return httpClient.SyncRequest();
}
+ /// <summary>
+ /// 鍗曟嵁鏌ヨ
+ /// </summary>
public static string Query(string formId, string content)
{
HttpClient httpClient = new HttpClient();
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 9a55b72..2b3ce21 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
+ <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index dbc4db2..fa9189d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -572,6 +572,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_UnitConvertRateController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowProgressBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 048da48..2b9ac2c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\GIT浠撳簱\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1