| WebAPI/Controllers/BarCodeController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/WebAPIController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/DLL.zip | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Global.asax.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Web.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/bin.zip | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/packages.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/BarCodeController.cs
@@ -1768,14 +1768,18 @@ } [Route("DeltetBarCodeBill")] [HttpGet] public object DeltetBarCodeBill(string HInterID, string HUserName) [HttpPost] public object DeltetBarCodeBill([FromBody] JObject msg) { string HInterID = String.Empty; string HUserName = String.Empty; HInterID = msg["msg"].ToString().Split(';')[0]; HUserName = msg["msg"].ToString().Split(';')[1]; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); try { string sql = "select HBarCode,HSourceInterID,HSourceEntryID,HQty,HBarCodeType,HSourceBillType from Gy_BarCodeBill where HItemID in(" + HInterID + ") "; LogService.Write("删除sql:" + sql); //LogService.Write("删除sql:" + sql); oCN.BeginTran(); DataTable dt = oCN.RunProcReturn(sql, "deleteTable").Tables[0]; if (dt.Rows.Count > 0) WebAPI/Controllers/WebAPIController.cs
@@ -180,14 +180,15 @@ { try { LogService.Write("测试登录错误"); DataSet ds = null; ClsCNSRM oCnLoc = new ClsCNSRM(); DAL.ClsUser oUser = new DAL.ClsUser(); Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); //LogService.Write("测试1："+ DBUtility.ClsPub.sExeReturnInfo); LogService.Write("测试1：" + DBUtility.ClsPub.sExeReturnInfo); string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo); //LogService.Write("测试2：" + DBUtility.ClsPub.sExeReturnInfo); //LogService.Write(FCusName); LogService.Write("测试2：" + DBUtility.ClsPub.sExeReturnInfo); LogService.Write(FCusName); if (FCusName == "夏宝电器") ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim())); else @@ -202,6 +203,7 @@ } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "登录成功！"; @@ -213,6 +215,7 @@ catch (Exception e) { LogService.Write("异常" + e.Message.ToString()); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "登录异常！" + e.ToString(); @@ -823,7 +826,13 @@ public object linteridSession([FromBody] JObject linterid) { var _linterid = linterid["linterid"].ToString(); HttpHelper.PostData("http://localhost:8082/AR-SRMLAYUI/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", _linterid); var _huserName = linterid["HUserName"].ToString(); var postMesseege = _linterid + ";" + _huserName; //HttpHelper.PostData("http://localhost:8082/AR-SRMLAYUI/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege); HttpHelper.PostData("http://60.191.21.116:9090/srmui/layuiAdmin.std-v1.2.1/src/views/SRM/Api/SRM_Web_PoBarCodeBillApi.ashx", postMesseege); SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM(); string sql = $"Update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0) + 1 where HItemID in ({_linterid})"; oCn.RunProc(sql); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = ""; @@ -835,6 +844,6 @@ } #endregion } } WebAPI/DLL.zipBinary files differ
WebAPI/Global.asax.cs
@@ -4,7 +4,6 @@ using System.Web; using System.Web.Http; using System.Web.Routing; using System.Web.SessionState; namespace WebAPI { @@ -14,14 +13,5 @@ { GlobalConfiguration.Configure(WebApiConfig.Register); } /// <summary> /// 开始session会话 /// </summary> protected void Application_PostAuthorizeRequest() { HttpContext.Current.SetSessionStateBehavior(SessionStateBehavior.Required); } } } WebAPI/Web.config
@@ -48,7 +48,7 @@ <!--<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/> <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>--> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> </dependentAssembly> <dependentAssembly> <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" /> WebAPI/WebAPI.csproj
@@ -103,8 +103,8 @@ <SpecificVersion>False</SpecificVersion> <HintPath>DLL\Model.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL"> <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath> @@ -214,6 +214,9 @@ <Compile Include="Controllers\PublicPageMethodController.cs" /> <Compile Include="Controllers\ReportController.cs" /> <Compile Include="DLL\ClsCg_POInStockBills.cs" /> <Compile Include="Global.asax.cs"> <DependentUpon>Global.asax</DependentUpon> </Compile> <Compile Include="HttpClient.cs" /> <Compile Include="InvokeHelper.cs" /> <Compile Include="ListModels.cs" /> @@ -223,9 +226,6 @@ <Compile Include="Models\ClsCg_POInStockBillSubs.cs" /> <Compile Include="Models\json.cs" /> <Compile Include="Controllers\WebAPIController.cs" /> <Compile Include="Global.asax.cs"> <DependentUpon>Global.asax</DependentUpon> </Compile> <Compile Include="Models\JsonResult.cs" /> <Compile Include="Models\Message.cs" /> <Compile Include="Models\Pensen.cs" /> WebAPI/bin.zipBinary files differ
WebAPI/packages.config
@@ -30,7 +30,7 @@ <package id="Microsoft.Owin.zh-Hans" version="4.2.0" targetFramework="net45" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" /> <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" /> <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" /> <package id="Owin" version="1.0" targetFramework="net45" /> <package id="Swashbuckle" version="5.0.0" targetFramework="net45" /> <package id="Swashbuckle.Core" version="5.0.0" targetFramework="net45" />
