From 3e98b38563ce8700d9207cf57e8a77566a6d9327 Mon Sep 17 00:00:00 2001 From: dengyu Date: Wed, 9 Aug 2023 18:02:19 +0800 Subject: [PATCH] 1 --- Vol.Vue/src/extension/wms/VW_OP_WMS_IN_DO_ACCEPT.js | 2 +- .../Services/WMS/FEE/Partial/Ch_feeService.cs | 12 ++++++++++++ .../WMSINPLAN/Partial/OP_WMS_IN_PLANService.cs | 8 ++++++++ .../Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs | 6 ++++++ Vue.Net/VOL.WebApi/appsettings.json | 4 ++-- 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Vol.Vue/src/extension/wms/VW_OP_WMS_IN_DO_ACCEPT.js b/Vol.Vue/src/extension/wms/VW_OP_WMS_IN_DO_ACCEPT.js index 42aad4a3..1b284a4a 100644 --- a/Vol.Vue/src/extension/wms/VW_OP_WMS_IN_DO_ACCEPT.js +++ b/Vol.Vue/src/extension/wms/VW_OP_WMS_IN_DO_ACCEPT.js @@ -279,4 +279,4 @@ let extension = { } } }; -export default extension; \ No newline at end of file +export default extension; diff --git a/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs b/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs index 860a781b..b99af65d 100644 --- a/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs +++ b/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/Ch_feeService.cs @@ -19,6 +19,8 @@ using System.Collections.Generic; using System; using VOL.Core.ManageUser; using ConvertHelper; +using VOL.Core.Infrastructure; +using VOL.Core.Configuration; namespace VOL.WMS.Services { @@ -51,6 +53,16 @@ namespace VOL.WMS.Services { queryable = queryable.Where(x => namearray.Contains(x.FEENAME)); } + } + + if (AppSetting.CompanySetting.COMPANYNAME == "JGWL") + { + var 不允许看月结费用的角色名称 = DictionaryManager.GetDictionary("NOMONTHFEEROLE").Sys_DictionaryList; + var 当前用户角色 = UserContext.Current.UserInfo.RoleName; + if (不允许看月结费用的角色名称.Exists(x => x.DicValue == 当前用户角色)) + { + queryable = queryable.Where(x => x.INPUTMODE=="现结"); + } } diff --git a/Vue.Net/VOL.WMS/Services/WMSINPLAN/Partial/OP_WMS_IN_PLANService.cs b/Vue.Net/VOL.WMS/Services/WMSINPLAN/Partial/OP_WMS_IN_PLANService.cs index 9c6e840c..887e8244 100644 --- a/Vue.Net/VOL.WMS/Services/WMSINPLAN/Partial/OP_WMS_IN_PLANService.cs +++ b/Vue.Net/VOL.WMS/Services/WMSINPLAN/Partial/OP_WMS_IN_PLANService.cs @@ -788,6 +788,14 @@ namespace VOL.WMS.Services item.XH = XH; } } + foreach (var item in CurrDetail) + { + if (string.IsNullOrWhiteSpace(item.XH)) + { + item.XH = XH; + OP_WMS_IN_PLAN_GOODSRepository.Instance.Update(item); + } + } } diff --git a/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs b/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs index 97dbfd30..84c97d60 100644 --- a/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs +++ b/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs @@ -350,6 +350,12 @@ namespace VOL.WMS.Services var now = DateTime.Now; result.DODATE = new DateTime(now.Year, now.Month, now.Day); + + if (AppSetting.CompanySetting.COMPANYNAME == "JGWL") + { + result.DODATE = outplan.PLANTIME; + } + //result.DODATE = outplan.PLANTIME; result.TRUCKNO = truck.TRUCKNO; diff --git a/Vue.Net/VOL.WebApi/appsettings.json b/Vue.Net/VOL.WebApi/appsettings.json index 2f5aa09f..0d9b0fa3 100644 --- a/Vue.Net/VOL.WebApi/appsettings.json +++ b/Vue.Net/VOL.WebApi/appsettings.json @@ -64,8 +64,8 @@ //"DbConnectionString": "Data Source=36.112.133.3,53076;Initial Catalog=ShippingWeb_JLWL;Persist Security Info=True;User ID=JLWLsa;Password=Ds20040201;Connect Timeout=500;", //金港 - "DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", - //"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_QDHGTY;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", + //"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", + "DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_QDHGTY;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", //"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_CS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;", //全盛时代