增加系统参数设置；新仓储货转上家出库费计算参数为“货转时”时，于货转计算出库现结的费用，而在出库时不计算

Vol.Vue/src/components/basic/LTPhotoandUpload.vue

@@ -73,7 +73,7 @@
 			<input id="getFileBase64" type="button" value="获取文件base64"  style="display:none;" />
 			<input id="setImageProperty" type="button" value="图片保存参数"  style="display:none;" />
       <br />
-            <br />	
+      <br />	
 </tr>
 <tr>
       <div class="input-btns"

Vol.Vue/src/extension/system/Sys_Param_Set.js

@@ -0,0 +1,21 @@
+//author:jxx
+//此处是对表单的方法，组件，权限操作按钮等进行任意扩展(方法扩展可参照SellOrder.js)
+let extension = {
+    components: {//动态扩充组件或组件路径
+        //表单header、content、footer对应位置扩充的组件
+        gridHeader:'',//{ template: "<div>扩展组xx件</div>" },
+        gridBody: '',
+        gridFooter: '',
+        //弹出框(修改、编辑、查看)header、content、footer对应位置扩充的组件
+        modelHeader: '',
+        modelBody: '',
+        modelFooter: ''
+    },
+    buttons: {view: [], box:[],  detail:[]},//扩展的按钮
+    methods: {//事件扩展
+       onInit() {
+
+       }
+    }
+};
+export default extension;

Vol.Vue/src/router/viewGird.js

@@ -550,5 +550,9 @@ let viewgird = [
         path: '/VW_OP_YARD_BOOK_AREA',
         name: 'VW_OP_YARD_BOOK_AREA',
         component: () => import('@/views/yard/VW_OP_YARD_BOOK_AREA.vue')
+    }    ,{
+        path: '/Sys_Param_Set',
+        name: 'Sys_Param_Set',
+        component: () => import('@/views/system/Sys_Param_Set.vue')
     }]
 export default viewgird

Vol.Vue/src/views/system/Sys_Param_Set.vue

@@ -0,0 +1,72 @@
+<!--
+*Author：jxx
+ *Contact：283591387@qq.com
+ *代码由框架生成,任何更改都可能导致被代码生成器覆盖
+ *业务请在@/extension/system/Sys_Param_Set.js此处编写
+ -->
+<template>
+    <div>
+        <view-grid 
+                   ref="grid"
+                   :columns="columns"
+                   :detail="detail"
+                   :editFormFields="editFormFields"
+                   :editFormOptions="editFormOptions"
+                   :searchFormFields="searchFormFields"
+                   :searchFormOptions="searchFormOptions"
+                   :table="table"
+                   :extend="extend">
+        </view-grid>
+    </div>
+</template>
+
+<script>
+    import extend from "@/extension/system/Sys_Param_Set.js";
+    //ViewGrid.vue使用elementui的table控件voltable.vue
+    //ViewGrid_Vxe.vue内引用vxetable.vue
+    //import ViewGrid from "@/components/basic/ViewGrid.vue";//ViewGrid_Vxe//ViewGrid
+    import ViewGrid from "@/components/basic/ViewGrid.vue";
+    var vueParam = {
+        components: {
+            ViewGrid
+        },
+        data() {
+            return {
+                table: {
+                    key: 'GID',
+                    footer: "Foots",
+                    cnName: '系统参数设置',
+                    name: 'Sys_Param_Set',
+                    url: "/Sys_Param_Set/",
+                    sortName: "PARAMDESCRIPTION"
+                },
+                extend: extend,
+                editFormFields: {"PARAMNAME":"","PARAMDESCRIPTION":"","PARAMVALUE":"","MODIFIEDUSER":"","MODIFIEDTIME":"","PARAMTYPE":"","FIELDTYPE":""},
+                editFormOptions: [[{"title":"参数代码","required":true,"field":"PARAMNAME","type":"text"},
+                               {"title":"参数描述","required":true,"field":"PARAMDESCRIPTION","type":"text"}],
+                              [{"title":"值","field":"PARAMVALUE","type":"text"}],
+                              [{"title":"","field":"MODIFIEDUSER","type":"text"},
+                               {"title":"","field":"MODIFIEDTIME","type":"datetime"}],
+                              [{"title":"","field":"PARAMTYPE","type":"text"},
+                               {"title":"","field":"FIELDTYPE","type":"text"}]],
+                searchFormFields: {"PARAMNAME":"","PARAMDESCRIPTION":""},
+                searchFormOptions: [[{"title":"参数描述","field":"PARAMDESCRIPTION","type":"like"},{"title":"参数代码","field":"PARAMNAME","type":"like"}]],
+                columns: [{field:'GID',title:'GID',type:'string',width:90,hidden:true,readonly:true,require:true,align:'left'},
+                       {field:'PARAMNAME',title:'参数代码',type:'string',width:90,require:true,align:'left',sortable:true},
+                       {field:'PARAMDESCRIPTION',title:'参数描述',type:'string',link:true,width:90,require:true,align:'left'},
+                       {field:'PARAMVALUE',title:'值',type:'string',width:220,align:'left'},
+                       {field:'MODIFIEDUSER',title:'MODIFIEDUSER',type:'string',width:90,align:'left'},
+                       {field:'MODIFIEDTIME',title:'MODIFIEDTIME',type:'datetime',width:90,align:'left',sortable:true},
+                       {field:'PARAMTYPE',title:'PARAMTYPE',type:'string',width:90,align:'left'},
+                       {field:'FIELDTYPE',title:'FIELDTYPE',type:'string',width:90,align:'left'}],
+                detail: {
+                    cnName:"#detailCnName",
+                    columns: [],
+                    sortName: "",
+                    key:""
+                }
+            };
+        }
+    };
+    export default vueParam;
+</script>

Vue.Net/VOL.Entity/DomainModels/System/Sys_Param_Set.cs

@@ -0,0 +1,95 @@
+/*
+ *代码由框架生成,任何更改都可能导致被代码生成器覆盖
+ *如果数据库字段发生变化，请在代码生器重新生成此Model
+ */
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VOL.Entity.SystemModels;
+
+namespace VOL.Entity.DomainModels
+{
+    [Entity(TableCnName = "系统参数设置",TableName = "Sys_Param_Set")]
+    public class Sys_Param_Set:BaseEntity
+    {
+        /// <summary>
+       ///GID
+       /// </summary>
+       [Key]
+       [Display(Name ="GID")]
+       [MaxLength(36)]
+        [Column(TypeName = "varchar(36)")]
+        [Required(AllowEmptyStrings=false)]
+       public string GID { get; set; }
+
+       /// <summary>
+       ///参数代码
+       /// </summary>
+       [Display(Name ="参数代码")]
+       [MaxLength(36)]
+       [Column(TypeName="varchar(36)")]
+       [Editable(true)]
+       [Required(AllowEmptyStrings=false)]
+       public string PARAMNAME { get; set; }
+
+       /// <summary>
+       ///参数描述
+       /// </summary>
+       [Display(Name ="参数描述")]
+       [MaxLength(60)]
+       [Column(TypeName="varchar(60)")]
+       [Editable(true)]
+       [Required(AllowEmptyStrings=false)]
+       public string PARAMDESCRIPTION { get; set; }
+
+       /// <summary>
+       ///值
+       /// </summary>
+       [Display(Name ="值")]
+       [MaxLength(360)]
+       [Column(TypeName="varchar(360)")]
+       [Editable(true)]
+       public string PARAMVALUE { get; set; }
+
+       /// <summary>
+       ///
+       /// </summary>
+       [Display(Name ="MODIFIEDUSER")]
+       [MaxLength(36)]
+       [Column(TypeName="varchar(36)")]
+       [Editable(true)]
+       public string MODIFIEDUSER { get; set; }
+
+       /// <summary>
+       ///
+       /// </summary>
+       [Display(Name ="MODIFIEDTIME")]
+       [Column(TypeName="datetime")]
+       [Editable(true)]
+       public DateTime? MODIFIEDTIME { get; set; }
+
+       /// <summary>
+       ///
+       /// </summary>
+       [Display(Name ="PARAMTYPE")]
+       [MaxLength(60)]
+       [Column(TypeName="varchar(60)")]
+       [Editable(true)]
+       public string PARAMTYPE { get; set; }
+
+       /// <summary>
+       ///
+       /// </summary>
+       [Display(Name ="FIELDTYPE")]
+       [MaxLength(36)]
+       [Column(TypeName="varchar(36)")]
+       [Editable(true)]
+       public string FIELDTYPE { get; set; }
+
+       
+    }
+}

Vue.Net/VOL.Entity/MappingConfiguration/System/Sys_Param_SetMapConfig.cs

@@ -0,0 +1,16 @@
+using VOL.Entity.MappingConfiguration;
+using VOL.Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace VOL.Entity.MappingConfiguration
+{
+    public class Sys_Param_SetMapConfig : EntityMappingConfiguration<Sys_Param_Set>
+    {
+        public override void Map(EntityTypeBuilder<Sys_Param_Set>
+        builderTable)
+        {
+          //b.Property(x => x.StorageName).HasMaxLength(45);
+        }
+     }
+}
+

Vue.Net/VOL.System/IRepositories/System/ISys_Param_SetRepository.cs

@@ -0,0 +1,18 @@
+/*
+ *代码由框架生成,任何更改都可能导致被代码生成器覆盖
+ *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹ISys_Param_SetRepository编写接口
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VOL.Core.BaseProvider;
+using VOL.Entity.DomainModels;
+using VOL.Core.Extensions.AutofacManager;
+namespace VOL.System.IRepositories
+{
+    public partial interface ISys_Param_SetRepository : IDependency,IRepository<Sys_Param_Set>
+    {
+    }
+}

Vue.Net/VOL.System/IServices/System/ISys_Param_SetService.cs

@@ -0,0 +1,12 @@
+/*
+ *代码由框架生成,任何更改都可能导致被代码生成器覆盖
+ */
+using VOL.Core.BaseProvider;
+using VOL.Entity.DomainModels;
+
+namespace VOL.System.IServices
+{
+    public partial interface ISys_Param_SetService : IService<Sys_Param_Set>
+    {
+    }
+}

Vue.Net/VOL.System/IServices/System/Partial/ISys_Param_SetService.cs

@@ -0,0 +1,17 @@
+/*
+*所有关于Sys_Param_Set类的业务代码接口应在此处编写
+*/
+using VOL.Core.BaseProvider;
+using VOL.Entity.DomainModels;
+using VOL.Core.Utilities;
+using System.Linq.Expressions;
+using System;
+
+namespace VOL.System.IServices
+{
+    public partial interface ISys_Param_SetService
+    {
+        public string 获取出库费计算时机();
+
+    }
+}

Vue.Net/VOL.System/Repositories/System/Sys_Param_SetRepository.cs

@@ -0,0 +1,24 @@
+/*
+ *代码由框架生成,任何更改都可能导致被代码生成器覆盖
+ *Repository提供数据库操作，如果要增加数据库操作请在当前目录下Partial文件夹Sys_Param_SetRepository编写代码
+ */
+using VOL.System.IRepositories;
+using VOL.Core.BaseProvider;
+using VOL.Core.EFDbContext;
+using VOL.Core.Extensions.AutofacManager;
+using VOL.Entity.DomainModels;
+
+namespace VOL.System.Repositories
+{
+    public partial class Sys_Param_SetRepository : RepositoryBase<Sys_Param_Set> , ISys_Param_SetRepository
+    {
+    public Sys_Param_SetRepository(VOLContext dbContext)
+    : base(dbContext)
+    {
+
+    }
+    public static ISys_Param_SetRepository Instance
+    {
+      get {  return AutofacContainerModule.GetService<ISys_Param_SetRepository>(); } }
+    }
+}

Vue.Net/VOL.System/Services/System/Partial/Sys_Param_SetService.cs

@@ -0,0 +1,63 @@
+/*
+ *所有关于Sys_Param_Set类的业务代码应在此处编写
+*可使用repository.调用常用方法，获取EF/Dapper等信息
+*如果需要事务请使用repository.DbContextBeginTransaction
+*也可使用DBServerProvider.手动获取数据库相关信息
+*用户信息、权限、角色等使用UserContext.Current操作
+*Sys_Param_SetService对增、删、改查、导入、导出、审核业务代码扩展参照ServiceFunFilter
+*/
+using VOL.Core.BaseProvider;
+using VOL.Core.Extensions.AutofacManager;
+using VOL.Entity.DomainModels;
+using System.Linq;
+using VOL.Core.Utilities;
+using System.Linq.Expressions;
+using VOL.Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using VOL.System.IRepositories;
+using System.Collections.Generic;
+using VOL.System.Repositories;
+
+namespace VOL.System.Services
+{
+    public partial class Sys_Param_SetService
+    {
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly ISys_Param_SetRepository _repository;//访问数据库
+
+        [ActivatorUtilitiesConstructor]
+        public Sys_Param_SetService(
+            ISys_Param_SetRepository dbRepository,
+            IHttpContextAccessor httpContextAccessor
+            )
+        : base(dbRepository)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _repository = dbRepository;
+            //多租户会用到这init代码，其他情况可以不用
+            //base.Init(dbRepository);
+        }
+
+        public override PageGridData<Sys_Param_Set> GetPageData(PageDataOptions pageData)
+        {
+
+            var _r = base.GetPageData(pageData);
+            return _r;
+        }
+
+        public string 获取出库费计算时机() {
+
+            var 出库费计算时机 = Sys_Param_SetRepository.Instance.FindAsIQueryable(x => x.PARAMNAME == "DSWMSOUTFEE").ToList();
+
+            if (出库费计算时机 != null && 出库费计算时机.Count > 0)
+            {
+                return 出库费计算时机[0].PARAMVALUE;
+
+
+            }
+            return "";
+        }
+    }
+}

Vue.Net/VOL.System/Services/System/Sys_Param_SetService.cs

@@ -0,0 +1,29 @@
+/*
+ *Author：jxx
+ *Contact：283591387@qq.com
+ *代码由框架生成,此处任何更改都可能导致被代码生成器覆盖
+ *所有业务编写全部应在Partial文件夹下Sys_Param_SetService与ISys_Param_SetService中编写
+ */
+using VOL.System.IRepositories;
+using VOL.System.IServices;
+using VOL.Core.BaseProvider;
+using VOL.Core.Extensions.AutofacManager;
+using VOL.Entity.DomainModels;
+using VOL.System.IRepositories;
+
+namespace VOL.System.Services
+{
+    public partial class Sys_Param_SetService : ServiceBase<Sys_Param_Set, ISys_Param_SetRepository>
+    , ISys_Param_SetService, IDependency
+    {
+    public Sys_Param_SetService(ISys_Param_SetRepository repository)
+    : base(repository)
+    {
+    Init(repository);
+    }
+    public static ISys_Param_SetService Instance
+    {
+    get { return AutofacContainerModule.GetService<ISys_Param_SetService>
+        (); } }
+        }
+        }

Vue.Net/VOL.WMS/Services/WMS/WMS_TRANSFER/Partial/OP_WMS_TRANSFERGOODSService.cs

@@ -21,6 +21,7 @@ using VOL.Core.Enums;
 using VOL.Core.Services;
 using ConvertHelper;
 using VOL.Core.Configuration;
+using VOL.System.Services;
 
 namespace VOL.WMS.Services
 {
@@ -1530,6 +1531,19 @@ namespace VOL.WMS.Services
                             货转现结费率List = 转入费率明细.Where(x => x.FEEMAKETYPE == "货转现结").ToList();
                         }
                     }
+
+                    //20230324 对于仓储费上家承担的业务
+                    var 出库费计算时机 = Sys_Param_SetService.Instance.获取出库费计算时机();
+
+                    if (出库费计算时机 == "货转时") {
+                        //寻找该库存货转前的费率
+                        var 旧库存出库费率 = OP_WMS_FEERATE_DETAILRepository.Instance.FindAsIQueryable(x => x.FEERATEID == 货转明细.WMSID && x.FEEMAKETYPE == "出库现结").ToList();
+
+                        if (旧库存出库费率 != null && 旧库存出库费率.Count > 0) {
+                            货转现结费率List.AddRange(旧库存出库费率);
+                        }
+                    }
+
                     if (货转现结费率List.Count > 0) {
                         foreach (var feerate in 货转现结费率List) {
 

Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_DOService.cs

@@ -29,6 +29,8 @@ using OfficeOpenXml.ConditionalFormatting;
 using VOL.Core.Services;
 using ConvertHelper;
 using VOL.Core.Configuration;
+using VOL.System.Repositories;
+using VOL.System.Services;
 
 namespace VOL.WMS.Services
 {
@@ -5158,9 +5160,22 @@ namespace VOL.WMS.Services
                     }
                 }
 
+                //20230324 查看sys_param_set.PARAMNAME=DSWMSOUTFEE
+                //如值为货转时 则不算出库费
+                var 出库费计算时机= Sys_Param_SetService.Instance.获取出库费计算时机();
+
+                
+
                 //计算出库费
                 foreach (var 出库费率 in 出库费率List)
                 {
+                    //20230324 查看sys_param_set.PARAMNAME=DSWMSOUTFEE
+                    //如值为货转时 则不算出库费
+                    if ((bool)_货转.WMSOUTFEE_OLDCUST) {
+                        if (出库费计算时机 == "货转时") {
+                            continue;
+                        }
+                    } 
 
                     //if (FeeExists(出库费率, 出库费承担者)) continue;
                     if (!codefeelist.Exists(x => x.NAME == 出库费率.FEENAME)) continue;

Vue.Net/VOL.WebApi/Controllers/System/Partial/Sys_Param_SetController.cs

@@ -0,0 +1,33 @@
+/*
+ *接口编写处...
+*如果接口需要做Action的权限验证，请在Action上使用属性
+*如: [ApiActionPermission("Sys_Param_Set",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using VOL.Entity.DomainModels;
+using VOL.System.IServices;
+
+namespace VOL.System.Controllers
+{
+    public partial class Sys_Param_SetController
+    {
+        private readonly ISys_Param_SetService _service;//访问业务代码
+        private readonly IHttpContextAccessor _httpContextAccessor;
+
+        [ActivatorUtilitiesConstructor]
+        public Sys_Param_SetController(
+            ISys_Param_SetService service,
+            IHttpContextAccessor httpContextAccessor
+        )
+        : base(service)
+        {
+            _service = service;
+            _httpContextAccessor = httpContextAccessor;
+        }
+    }
+}

Vue.Net/VOL.WebApi/Controllers/System/Sys_Param_SetController.cs

@@ -0,0 +1,21 @@
+/*
+ *代码由框架生成,任何更改都可能导致被代码生成器覆盖
+ *如果要增加方法请在当前目录下Partial文件夹Sys_Param_SetController编写
+ */
+using Microsoft.AspNetCore.Mvc;
+using VOL.Core.Controllers.Basic;
+using VOL.Entity.AttributeManager;
+using VOL.System.IServices;
+namespace VOL.System.Controllers
+{
+    [Route("api/Sys_Param_Set")]
+    [PermissionTable(Name = "Sys_Param_Set")]
+    public partial class Sys_Param_SetController : ApiBaseController<ISys_Param_SetService>
+    {
+        public Sys_Param_SetController(ISys_Param_SetService service)
+        : base(service)
+        {
+        }
+    }
+}
+