1

Vol.Vue/src/extension/wms/VW_OP_WMS_IN_DO_ACCEPT.js

@@ -279,4 +279,4 @@ let extension = {
         }
     }
 };
-export default extension;
+export default extension;

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=="现结");
+                    }
 
                 }
 

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);
+                            }
+                        }
                     }
                     
 

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;
 

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;",
 
     //全盛时代