消除一些升级旧版本时可能出现的问题

1 year ago · 3a246dca59
parent a02c8c8a01
commit 3a246dca59
16 changed files with 699 additions and 786 deletions
--- a/Vol.Vue/index.html
+++ b/Vol.Vue/index.html
@ -7,7 +7,7 @@
   content="width=device-width,initial-scale=1,minimum-scale=1,
   maximum-scale=1,user-scalable=no,viewport-fit=cover"> -->
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <title>东胜软件_仓储</title>
+  <title>嘉里物流</title>
  <style type="text/css">
    #loading-container {
      position: absolute;
--- a/Vol.Vue/src/api/http.js
+++ b/Vol.Vue/src/api/http.js
@ -11,24 +11,26 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
 //'application/json;charset=utf-8';//
 if (process.env.NODE_ENV == 'development') {
  axios.defaults.baseURL = 'http://localhost:9991/';
-  axios.defaults.ds7URL = 'http://118.190.210.123:8081/login.aspx';
+  axios.defaults.ds7URL = 'http://47.104.102.13:8081/login.aspx';
 }
 else if (process.env.NODE_ENV == 'debug') {
  axios.defaults.baseURL = 'http://127.0.0.1:8990/';
-  axios.defaults.ds7URL = 'http://118.190.210.123:8081/login.aspx';
+  axios.defaults.ds7URL = 'http://47.104.102.13:8081/login.aspx';
 }
 else if (process.env.NODE_ENV == 'production') {
-  axios.defaults.baseURL = 'http://47.104.253.169:9991/';
-  axios.defaults.ds7URL = 'http://47.104.253.169:8088/login.aspx';
-  //金港物流
+  axios.defaults.baseURL = 'http://36.112.133.3:9991/';
+  axios.defaults.ds7URL = 'http://36.112.133.3:8099/login.aspx';
+  //axios.defaults.baseURL = 'http://114.215.87.197:9991/';
+  //axios.defaults.ds7URL = 'http://114.215.87.197:8099/login.aspx';
+  //axios.defaults.baseURL = 'http://123.234.180.6:9991/';
+  //axios.defaults.ds7URL = 'http://123.234.180.6:8098/login.aspx';
 }
 let ipAddress = axios.defaults.baseURL;

 let ds7ipAddress = axios.defaults.ds7URL;
-
 let FormShow = {
-  INDO_CONFIRM: false,//入库执行页面是否显示录入状态业务等。false时不显示 用于菲尔斯特 入库执行 分受理 确认 两步时设为true
-  INDO_FeerateShow: true,//入库执行的费率页面是否显示
+  INDO_CONFIRM: true,//入库执行页面是否显示录入状态业务等。false时不显示 用于菲尔斯特 入库执行 分受理 确认 两步时设为true
+  INDO_FeerateShow: false,//入库执行的费率页面是否显示
  MOVE_FeerateShow: true,//移库的费率页面是否显示

  WanHuaHuaXue_Show: false,//入库模块中 万华化学入口按钮是否显示
@ -37,20 +39,19 @@ let FormShow = {
  isWUTONG: false,//标记 用户 五通
  isPROJECT: false,//标记 用户 项目
  isHGTY: false,//标记 用户 华港通运
-  isJLWL: false,//标记 用户 嘉里物流
-  isJGWL: true,//标记 用户 金港物流
+  isJLWL: true,//标记 用户 嘉里物流
  WMSFEE_TYPE: 'showAll',// 取值 showAll showCurr 两者之一 用于限制自定义账单的形式
  FeeRateSourceName: "非协议客户",//入库计划中 采用什么默认的费率来源名称
  InplanRulenumByNetweight: false,//入库计划中 如果净重修改 则同时修改申报数量
-  INDO_SAMEWMS: true,//入库执行 "合并入库"选项默认值 如true则默认为合并入库
+  INDO_SAMEWMS: false,//入库执行 "合并入库"选项默认值 如true则默认为合并入库
 }

 //用于控制新增加的goodsmodel2-20字段是否显示
 //不同公司所需的goodsmodel不同，因此这些字段的名字通过多语言模块进行控制，是否显示通过GoodsModelShow控制
 let GoodsModelShow = {
-  GOODSMODEL2: true,
-  GOODSMODEL3: true,
-  GOODSMODEL4: true,
+  GOODSMODEL2: false,
+  GOODSMODEL3: false,
+  GOODSMODEL4: false,
  GOODSMODEL5: true,
  GOODSMODEL6: false,
  GOODSMODEL7: false,
@ -110,14 +111,12 @@ let FormShowBase = {

 let FestShow = JSON.parse(JSON.stringify(FormShowBase));
 FestShow.显示入库计划的生成入库受理按钮 = true;
-FestShow.入库计划导入明细时用毛重填充为0的净重 = false;
+FestShow.入库计划导入明细时用毛重填充为0的净重 = true;

 let LocalShow = FormShowBase;

 if (FormShow.isFEST) LocalShow = FestShow;

-
-
 axios.interceptors.request.use((config) => {
  //axios.defaults.headers[_Authorization] = $httpVue.$store.getters.getToken();

--- a/Vol.Vue/src/assets/imgs/logo.png
+++ b/Vol.Vue/src/assets/imgs/logo.png
--- a/Vol.Vue/src/assets/imgs/logo1.png
+++ b/Vol.Vue/src/assets/imgs/logo1.png
--- a/Vol.Vue/src/extension/wms/OP_WMS_OUT_DOModelBody.vue
+++ b/Vol.Vue/src/extension/wms/OP_WMS_OUT_DOModelBody.vue
@ -430,6 +430,7 @@ export default {
                  row.WMSPLANDETAILID=x.wmsoutdetailid;
                  row.CNTRNO=x.cntrno;
                  //row.wmsdoid=x.wmsdoid;
+                  row.WMSID=x.wmsid;
                  row.WMSPHYSICSID=x.wmsphysicsid;
                }
              });
--- a/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit.vue
+++ b/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit.vue
@ -714,7 +714,7 @@ export default {
      }

      let workKeys = rows.map(x => {
-        return x['WMSID'];
+        return x['WMSPHYSICSID'];
      });

      let editFormFields = _headform.geteditformfield();
@ -748,7 +748,7 @@ export default {
        onOk: () => {
          if (tigger) return;
          tigger = true;   
-          let url = "api/OP_WMS_TRANSFERGOODS/MakeDo";
+          let url = "api/OP_WMS_TRANSFERGOODS/MakeDo_Physics";
          this.http.post(url, formData, "正在引入数据....").then(x => 
          {
            let result=x;
--- a/Vol.Vue/src/lang/en.js
+++ b/Vol.Vue/src/lang/en.js
--- a/Vol.Vue/src/lang/zh.js
+++ b/Vol.Vue/src/lang/zh.js
@ -9,7 +9,7 @@ module.exports = {
    SEALNO: '封号',
    CUSTOMNO: '报关单号',
    ETA: '到港日',
-    CORPID: '业务归属',
+    CORPID: '分公司',
    ACCDATE: '会计期间',
    CUSTNO: '客户订单号',
    MBLNOCNTRNO:'提单号/箱号',
@ -33,25 +33,6 @@ module.exports = {
    BSSOURCE: '业务来源',
    MASTERBSNO: '业务来源编码',
    GOODSMODEL: '规格型号',
-    GOODSMODEL2: '幅宽/规格',
-    GOODSMODEL3: '克重',
-    GOODSMODEL4: '品牌',
-    GOODSMODEL5: '等级',
-    GOODSMODEL6: '规格型号6',
-    GOODSMODEL7: '规格型号7',
-    GOODSMODEL8: '规格型号8',
-    GOODSMODEL9: '规格型号9',
-    GOODSMODEL10: '规格型号10',
-    GOODSMODEL11: '规格型号11',
-    GOODSMODEL12: '规格型号12',
-    GOODSMODEL13: '规格型号13',
-    GOODSMODEL14: '规格型号14',
-    GOODSMODEL15: '规格型号15',
-    GOODSMODEL16: '规格型号16',
-    GOODSMODEL17: '规格型号17',
-    GOODSMODEL18: '船名',
-    GOODSMODEL19: '航次',
-    GOODSMODEL20: '核注清单号',
    MATERIALNO: '物料号',
    PALLET: '托盘',
    GOODSLABEL: '标签',
@ -60,41 +41,6 @@ module.exports = {
    DIZHANGID: '底账ID',
    GOODSHSCODE: '商品编码',

-    GOODSMODEL_BOOL_1: 'GOODSMODEL_BOOL_1',
-    GOODSMODEL_BOOL_2: 'GOODSMODEL_BOOL_2',
-    GOODSMODEL_BOOL_3: 'GOODSMODEL_BOOL_3',
-    GOODSMODEL_BOOL_4: 'GOODSMODEL_BOOL_4',
-    GOODSMODEL_BOOL_5: 'GOODSMODEL_BOOL_5',
-    GOODSMODEL_BOOL_6: 'GOODSMODEL_BOOL_6',
-    GOODSMODEL_BOOL_7: 'GOODSMODEL_BOOL_7',
-    GOODSMODEL_BOOL_8: 'GOODSMODEL_BOOL_8',
-    GOODSMODEL_BOOL_9: 'GOODSMODEL_BOOL_9',
-    GOODSMODEL_BOOL_10: 'GOODSMODEL_BOOL_10',
-
-    GOODSMODEL_NUMERIC_1: '厚度',
-    GOODSMODEL_NUMERIC_2: '宽度',
-    GOODSMODEL_NUMERIC_3: '长度',
-    GOODSMODEL_NUMERIC_4: 'GOODSMODEL_NUMERIC_4',
-    GOODSMODEL_NUMERIC_5: 'GOODSMODEL_NUMERIC_5',
-    GOODSMODEL_NUMERIC_6: 'GOODSMODEL_NUMERIC_6',
-    GOODSMODEL_NUMERIC_7: 'GOODSMODEL_NUMERIC_7',
-    GOODSMODEL_NUMERIC_8: 'GOODSMODEL_NUMERIC_8',
-    GOODSMODEL_NUMERIC_9: 'GOODSMODEL_NUMERIC_9',
-    GOODSMODEL_NUMERIC_10: 'GOODSMODEL_NUMERIC_10',
-
-    GOODSMODEL_DATE_1: 'GOODSMODEL_DATE_1',
-    GOODSMODEL_DATE_2: 'GOODSMODEL_DATE_2',
-    GOODSMODEL_DATE_3: 'GOODSMODEL_DATE_3',
-    GOODSMODEL_DATE_4: 'GOODSMODEL_DATE_4',
-    GOODSMODEL_DATE_5: 'GOODSMODEL_DATE_5',
-    GOODSMODEL_DATE_6: 'GOODSMODEL_DATE_6',
-    GOODSMODEL_DATE_7: 'GOODSMODEL_DATE_7',
-    GOODSMODEL_DATE_8: 'GOODSMODEL_DATE_8',
-    GOODSMODEL_DATE_9: 'GOODSMODEL_DATE_9',
-    GOODSMODEL_DATE_10: 'GOODSMODEL_DATE_10',
-
-
-
    ////
    PKGS_FIRST: '入库件数',
    PKGS_TOTAL: '总件数',
@ -106,8 +52,6 @@ module.exports = {
    RULEAMOUNT: '申报金额',
    
    STOREHOUSE: '仓库',
-    STOREHOUSE_2: '备选仓库1',
-    STOREHOUSE_3: '备选仓库2',
    AREACODE: '库位',
    STOREHOUSENAME: '仓库',
    AREANAME: '库位',
@ -227,17 +171,7 @@ module.exports = {
    QUANTITY: '数量',
    QUANTITY_DUNTIAN:'计费单位.天(吨天)',
    AMOUNT: '金额',
-    PRICE: '单价',
-    
-    SPE_PKGS: '计划指定件数',
-    SPE_SMALLPKGS: '计划指定件数2',
-    SPE_MINPKGS: '计划指定件数3',
-    SPE_KGS: '计划指定毛重(千克)',
-    SPE_CBM: '计划指定体积(立方米)',
-    SPE_NETWEIGHT: '计划指定净重(千克)',
-    SPE_STORAGEUNITCOUNT: '计划指定计费数量',
-    SPE_KGS_TON: '计划指定毛重(吨)',
-    SPE_NETWEIGHT_TON: '计划指定净重(吨)',
+    PRICE:'单价',
    
    TRUCKNO: '车号',
    DRIVERNAME:'司机',
@ -252,30 +186,84 @@ module.exports = {
    WORKNUM: '车次',
    WORKTYPE: '项目',
    WORKERTYPE: '角色',
-    WORKTOTAL:'',
+    WORKTOTAL: '工作总量',
+
+    CUSTNO_OUT: '出库交货单号',
+    BOOLFIELD_01: '是否换标签',
+    BOOLFIELD_02: '是否贴小标签',
+    BOOLFIELD_03: '是否打托',
+    BOOLFIELD_04: '是否取样',
+    STRFIELD_01: '出库订单号',
+
+    GOODSMODEL2: 'GOODSMODEL2',
+    GOODSMODEL3: 'GOODSMODEL3',
+    GOODSMODEL4: 'GOODSMODEL4',
+    GOODSMODEL5: '料号',
+    GOODSMODEL6: 'GOODSMODEL6',
+    GOODSMODEL7: 'GOODSMODEL7',
+    GOODSMODEL8: 'GOODSMODEL8',
+    GOODSMODEL9: 'GOODSMODEL9',
+    GOODSMODEL10: 'GOODSMODEL10',
+    GOODSMODEL11: 'GOODSMODEL11',
+    GOODSMODEL12: 'GOODSMODEL12',
+    GOODSMODEL13: 'GOODSMODEL13',
+    GOODSMODEL14: 'GOODSMODEL14',
+    GOODSMODEL15: 'GOODSMODEL15',
+    GOODSMODEL16: 'GOODSMODEL16',
+    GOODSMODEL17: 'GOODSMODEL17',
+    GOODSMODEL18: '船名',
+    GOODSMODEL19: '航次',
+    GOODSMODEL20: '核注清单号',
+
+    GOODSMODEL_BOOL_1: 'GOODSMODEL_BOOL_1',
+    GOODSMODEL_BOOL_2: 'GOODSMODEL_BOOL_2',
+    GOODSMODEL_BOOL_3: 'GOODSMODEL_BOOL_3',
+    GOODSMODEL_BOOL_4: 'GOODSMODEL_BOOL_4',
+    GOODSMODEL_BOOL_5: 'GOODSMODEL_BOOL_5',
+    GOODSMODEL_BOOL_6: 'GOODSMODEL_BOOL_6',
+    GOODSMODEL_BOOL_7: 'GOODSMODEL_BOOL_7',
+    GOODSMODEL_BOOL_8: 'GOODSMODEL_BOOL_8',
+    GOODSMODEL_BOOL_9: 'GOODSMODEL_BOOL_9',
+    GOODSMODEL_BOOL_10: 'GOODSMODEL_BOOL_10',
+
+    GOODSMODEL_NUMERIC_1: '厚度',
+    GOODSMODEL_NUMERIC_2: '宽度',
+    GOODSMODEL_NUMERIC_3: '长度',
+    GOODSMODEL_NUMERIC_4: 'GOODSMODEL_NUMERIC_4',
+    GOODSMODEL_NUMERIC_5: 'GOODSMODEL_NUMERIC_5',
+    GOODSMODEL_NUMERIC_6: 'GOODSMODEL_NUMERIC_6',
+    GOODSMODEL_NUMERIC_7: 'GOODSMODEL_NUMERIC_7',
+    GOODSMODEL_NUMERIC_8: 'GOODSMODEL_NUMERIC_8',
+    GOODSMODEL_NUMERIC_9: 'GOODSMODEL_NUMERIC_9',
+    GOODSMODEL_NUMERIC_10: 'GOODSMODEL_NUMERIC_10',
+
+    GOODSMODEL_DATE_1: 'GOODSMODEL_DATE_1',
+    GOODSMODEL_DATE_2: 'GOODSMODEL_DATE_2',
+    GOODSMODEL_DATE_3: 'GOODSMODEL_DATE_3',
+    GOODSMODEL_DATE_4: 'GOODSMODEL_DATE_4',
+    GOODSMODEL_DATE_5: 'GOODSMODEL_DATE_5',
+    GOODSMODEL_DATE_6: 'GOODSMODEL_DATE_6',
+    GOODSMODEL_DATE_7: 'GOODSMODEL_DATE_7',
+    GOODSMODEL_DATE_8: 'GOODSMODEL_DATE_8',
+    GOODSMODEL_DATE_9: 'GOODSMODEL_DATE_9',
+    GOODSMODEL_DATE_10: 'GOODSMODEL_DATE_10',

    TRADETYPE: '贸易方式',
-    SALE: '销售',
    WMSWORKTYPE: '装卸方式',

-    RMBNODR: 'RMB未收',
-    USDNODR: 'USD未收',
-    OTNODR: '其它未收',
-    TTLNODR: '未收(合RMB)',
-    //WMSPLANID: '装卸方式',
-    PKGS_REMAIN: '剩余件数',
-    KGS_REMAIN: '剩余毛重(千克)',
-    CBM_REMAIN: '剩余体积(立方米)',
-    NETWEIGHT_REMAIN: '剩余净重(千克)',
-    RULEUNITCOUNT_REMAIN: '剩余申报数量',
-    STORAGEUNITCOUNT_REMAIN: '剩余计费数量',
-    RULEAMOUNT_REMAIN: '剩余申报金额',
-    KGS_TON_REMAIN: '剩余毛重(吨)',
-    NETWEIGHT_TON_REMAIN: '剩余净重(吨)',
+    SPE_PKGS: '计划指定件数',
+    SPE_SMALLPKGS: '计划指定件数2',
+    SPE_MINPKGS: '计划指定件数3',
+    SPE_KGS: '计划指定毛重(千克)',
+    SPE_CBM: '计划指定体积(立方米)',
+    SPE_NETWEIGHT: '计划指定净重(千克)',
+    SPE_STORAGEUNITCOUNT: '计划指定计费数量',
+    SPE_KGS_TON: '计划指定毛重(吨)',
+    SPE_NETWEIGHT_TON: '计划指定净重(吨)',

    WEIGHTTYPE: '过磅方式',
    INSPECTIONTIME: '查验时间',
-    
+
    labeltitle: {//this.$t('labeltitle.')
        fee: '费用',
        GroupByBill: '按票汇总',
@ -304,9 +292,7 @@ module.exports = {
        SelectOutPlan: '选择出库计划',
        SelectAcceptDetail: '选择受理明细',

-        GoodsInfo: '商品信息',
-        CustAreagoodsNodr: '客户库存与欠费',
-        op_wms_fee: '费用临时模板',
+        GoodsInfo:'商品信息',
    },
    feetitle: {
        CUSTOMERNAME: '结算对象',
@ -334,7 +320,6 @@ module.exports = {
        UNITPRICE: '不含税单价',
        TAXRATE: '税率(%)',
        NOTAXAMOUNT: '不含税金额',
-        NOTAXPRICE: '不含税单价',
        TAX: '税额',
        UNIT: '单位',
        F_NO:'来源业务编号',
@ -360,26 +345,25 @@ module.exports = {
        货权转移: '货权转移',
        货权转移计划: '货权转移计划',
        货权转移确认: '货权转移确认',
-        移库: '移库',
-        移库操作: '移库操作',
+        移库: '移库操作',
        移库操作计划: '移库操作计划',
        移库操作确认: '移库操作确认',
        仓库盘点: '仓库盘点',
        仓库盘点计划: '仓库盘点计划',
        仓库盘点确认: '仓库盘点确认',
-
+        
+        
+        
+        
        出库管理:'出库管理',
        出库计划: '出库计划',
-        出库受理: '出库计划',
+        出库受理: '出库受理',
        出库确认: '出库确认',
        出库统计表: '出库统计表',

        库存管理: '库存管理',
        库存初始化: '库存初始化',
        库位示意图: '库位示意图',
-        库存查询表_1: '库存查询表_1',
-        业务编码表: '业务编码表',
-        工作量系数表: '工作量系数表',
        库存查询汇总: '库存查询汇总',
        库存查询明细: '库存查询明细',
        历史库存查询: '历史库存查询',
@ -432,18 +416,26 @@ module.exports = {
        任务状态表: '任务状态表',
        打印格式列表: '打印格式列表',
        个人列表设置: '个人列表设置',
+        
+        库存查询表: '库存查询表_1',
+        业务编码表: '业务编码表',
+        工作量系数表: '工作量系数表',
+        货权转移_待取用: '货权转移_待取用',
+        货权转移_明细: '货权转移_明细',
+        出库计划_待取用: '出库计划_待取用',
+        移库_待取明细: '移库_待取明细',
+        入库通知_明细: '入库通知_明细',
+        出库前置计划_明细: '出库前置计划_明细',
+        出库计划_待取用_明细: '出库计划_待取用_明细',        

        无菜单子窗口: '无菜单子窗口',
-
-
        入库计划_明细: '入库计划_明细',
        入库受理_明细: '入库受理_明细',
        入库执行_明细: '入库执行_明细',
-        出库前置计划_明细: '出库前置计划_明细',
        出库计划_明细: '出库计划_明细',
-        出库受理_明细: '出库计划_明细',
+        出库受理_明细: '出库受理_明细',
        出库执行_明细: '出库执行_明细',
-        出库计划_待取用_明细: '出库计划_待取用_明细',
+        

        综合费用管理: '综合费用管理',
        //入库通知: '入库通知'
@ -452,8 +444,7 @@ module.exports = {
        入库商品:'入库商品',
        自定义字段: '自定义字段',
        
-        当前库存信息: '当前库存信息',
-        当前剩余库存汇总: '当前剩余库存汇总',
+        当前库存信息: '当前剩余库存汇总',
        工作量表: '工作量表',
        
        大宗散货管理: '大宗散货管理',
@ -470,7 +461,8 @@ module.exports = {
        进口核注清单: '进口核注清单',
        出口核注清单: '出口核注清单',
        综合业务管理: '综合业务管理',
-        入库通知执行情况:'入库通知执行情况',
+        入库通知执行情况: '入库通知执行情况',
+        商品与客户部门关系: '商品与客户部门关系',
    },
    MSG: {
        请先填写入库商品: '请先填写入库商品',
@ -562,13 +554,11 @@ module.exports = {
        OUTPLANDOBEFORE_CALLBACK: '重新录入',
        OUTPLANDOBEFORE_END: '计划完成',
        OUTPLANDOBEFORE_UNEND: '取消完成',
-        OUTPLANDO: '提交审核',
-        OUTPLANDO_ACCESS: '审核通过',
-        OUTPLANDO_ACCESS2: '审核通过',
-        OUTPLANDO_CALLBACK: '取消审核',
-        
-        LoadingFinish: '费用确认',
-        LoadingUndo: '取消费用确认',
+        OUTPLANDO: '提交受理',
+        OUTPLANDO_ACCESS: '出库受理',
+        OUTPLANDO_CALLBACK:'取消受理',
+        LoadingFinish: '生成费用',
+        LoadingUndo: '取消生成费用',
        CarryoutFinish: '审核完毕',
        CarryoutUndo: '取消审核',
        
@ -618,9 +608,6 @@ module.exports = {
        ReportPrint: '打印报表',
        AddPic: '添加图片1',

-        Jingang_bancaiIndetify: '识别板材明细表',
-        Jingang_normalIndetify: '识别入库明细表',
-
        Fenleijianguan_Post: '库存申报',
        Fenleijianguan_CangkuPost: '仓库库位申报',
        WMSPrint: '打印库存明细',
@ -664,7 +651,7 @@ module.exports = {
        REINFORCE:'加固数量',
    },
    OUT_PLAN: {
-        title: '出库计划',
+        title: '出库受理',
        WMSNO: '出库计划编号',
        PLANTIME:'计划出库日期',
    },
@ -673,7 +660,7 @@ module.exports = {
    },
    OUT_DO: {
        title: '出库确认',
-        LoadingFinish: '费用确认'//LoadingFinish: '费用确认',//生成费用
+        LoadingFinish: '生成费用'
    },
    OUT_DO_PROJECT: {
        title: '货物出库'
--- a/Vol.Vue/src/views/Home.vue
+++ b/Vol.Vue/src/views/Home.vue
@ -32,12 +32,12 @@
                <div class="bottom">平均增长趋势{{item.up}}%</div>
          </div>-->
          <div class="ivu-col ivu-col-span-6">
-            <li class="item-name">超期货物</li>
-            <li class="rate"  v-for="(wmsinfo, infoindex) in WMSOVERTIMEINFO">{{wmsinfo.mblno}} {{wmsinfo.indate.replace("0:00:00","")}} 天数 {{wmsinfo.days}}</li>
+            <li class="item-name">未开始入库通知</li>
+            <li class="rate" v-if="planinfo.itemname=='未开始入库计划'" v-for="(planinfo, infoindex) in PLANSTATUSINFO">{{planinfo.CUSTOMERNAME}}-{{planinfo.GOODSNAME}}-{{planinfo.MBLNO}}-{{planinfo.CNTRCOUNT}}</li>
          </div>   
          <div class="ivu-col ivu-col-span-6">
-            <li class="item-name">执行中的入库通知</li>
-            <li class="rate" v-if="planinfo.itemname=='未开始入库通知'||planinfo.itemname=='正在入库'" v-for="(planinfo, infoindex) in PLANSTATUSINFO">{{planinfo.CUSTOMERNAME}}-{{planinfo.GOODSNAME}}-{{planinfo.MBLNO}}-{{planinfo.CNTRCOUNT}}</li>
+            <li class="item-name">正在入库</li>
+            <li class="rate" v-if="planinfo.itemname=='执行中的入库计划'" v-for="(planinfo, infoindex) in PLANSTATUSINFO">{{planinfo.CUSTOMERNAME}}-{{planinfo.GOODSNAME}}-{{planinfo.MBLNO}}-{{planinfo.CNTRCOUNT}}</li>
          </div>   
          <div class="ivu-col ivu-col-span-6">
            <li class="item-name">未开始出库计划</li>
@ -178,7 +178,6 @@ export default {
      // chukuliang:[10, 150, 1, 250,20, 100, 10,150],
      // churukudate:['2020.06.15', '2020.06.16', '2020.06.17',
      //       '2020.06.18', '2020.06.19', '2020.06.20', '2020.06.21','2020.06.22']
-      WMSOVERTIMEINFO:[],
      rukuliang:[],
      chukuliang:[],
      huozhuanliang:[],
@ -214,9 +213,7 @@ export default {
        _this.PLANSTATUSINFO=result.rows;
      });

-      this.http.post("/api/VW_OP_WMS_HOMESHOW_PLANSTATUS/GetWMSOVERTIMEINFO",param).then(result => {
-        _this.WMSOVERTIMEINFO=result.rows;
-      });
+      
    },

    DoSearch_1(){    
--- a/Vol.Vue/src/views/Index.vue
+++ b/Vol.Vue/src/views/Index.vue
@ -1,17 +1,17 @@
 <template>
  <div id="vol-container"
       :class="['vol-theme-' + theme]">
-     <div class="vol-aside"  v-show="!hidepath"
-         :style=" { width:menuWidth+'px'}">
-      <div class="header" 
+     <div class="vol-aside"
+         :style="{width:menuWidth+'px'}">
+      <div class="header"
           :style="{width:menuWidth-1+'px'}">
-        <img v-show="!isCollapse " 
+        <img v-show="!isCollapse"
             v-bind:src="logo" />
-        <Icon type="ios-list" 
+        <Icon type="ios-list"
              @click="toggleLeft"
              class="collapse-menu" />
      </div>
-      <div class="vol-menu" >
+      <div class="vol-menu">
        <el-scrollbar style="height:100%;">
          <VolMenu :onSelect="onSelect"
                   :isCollapse="isCollapse"
@ -19,7 +19,7 @@
        </el-scrollbar>
      </div>
    </div>
-    <div class="vol-container" 
+    <div class="vol-container"
         :style="{left:menuWidth-1+'px'}">

    <!-- <div class="vol-aside">
@ -38,7 +38,7 @@



-      <div class="vol-header" v-show="!hidepath">
+      <div class="vol-header">
        <span class="header-text"><!--支持业务代码扩展的快速开发框架--></span>
        <div class="header-info">
          <div class="h-link">
@ -72,7 +72,7 @@
          </div>
        </div>
      </div>
-      <div class="vol-path" v-show="!hidepath">
+      <div class="vol-path">
        <!-- 2020.05.31增加顶部导tabs超出后滚动 -->
        <Tabs @on-click="selectNav"
              :before-remove="removeNav"
@ -89,8 +89,9 @@
                   :label="item.name"></TabPane>
        </Tabs>
      </div>
-      <div :class="hidepath?'vol-mainhide':'vol-main'"  id="vol-main" >
-        <el-scrollbar style="height:100%;" >
+      <div class="vol-main"
+           id="vol-main">
+        <el-scrollbar style="height:100%;">
          <!-- 2020.06.03增加路由切换时加载提示 -->
          <loading v-show="$store.getters.isLoading()"></loading>
          <!-- 2020.10.09增加路由keepAlive属性设置不缓存组件(默认缓存组件) -->
@ -124,7 +125,6 @@ export default {
  data() {
    return {
      menuWidth: 200,
-
      isCollapse: false,
      menu_theme: "light",
      theme_moel: false,
@ -153,8 +153,6 @@ export default {
        { text: "安全退出", path: "/login", id: -4 },
      ],
      menuOptions: [],
-      hidepath:false,
-      mainposition:"absolute"
    };
  },
  components: {
@ -166,14 +164,6 @@ export default {
    if (theme) {
      this.theme = theme;
    }
-
-    this.hidepath=localStorage.getItem("hidepath")=="true";
-    if(this.hidepath){
-
-      this.menuWidth=0;
-      this.mainposition='revert';
-    }
-
    this.menu_theme = this.theme == "white" ? "dark" : "light";
    let userInfo = this.$store.getters.getUserInfo();
    this.userName = userInfo.userName;
@ -482,19 +472,6 @@ body {
 .vol-main {
  border-left: 1px solid #eee;
  position: absolute;
-  /*revert absolute*/
-  width: 100%;
-  /* height: 100%; */
-  bottom: 0;
-  top: 93px;
-  margin: 0;
-  /* padding: 15px; */
-  overflow: auto;
-}
-.vol-mainhide {
-  border-left: 1px solid #eee;
-  position: revert;
-  /*revert absolute*/
  width: 100%;
  /* height: 100%; */
  bottom: 0;
@ -510,9 +487,9 @@ body {
  padding: 5px;
 }
 .header img {
-    height: 77% !important;
+    height: 80% !important;
    margin-right: 20px !important;
-    margin-top: 11px;
+    margin-top: 5px;
 }
 .header-info {
  right: 20px;
--- a/Vol.Vue/src/views/Login.vue
+++ b/Vol.Vue/src/views/Login.vue
@ -46,7 +46,7 @@
                    <Icon :size="20" />公司代码：
                  </label>
                </div>
-                <el-select v-show="false"
+                <el-select
                  v-model="userInfo.userCompanycode"
                  placeholder="请选择分公司"
                  filterable
@ -61,9 +61,6 @@
                    :value="item.key"
                  ></el-option>
                </el-select>
-                <div class="f-input" v-show="true">
-                  <input type="text" v-focus v-model="userInfo.userCompanycode" placeholder="输入公司代码" />
-                </div>
                <div class="f-remove" @click="clearSelect">
                  <Icon type="ios-close-circle" />
                </div>
@ -126,7 +123,7 @@
              -->
            </div>
            <div class="loging-btn">
-              <Button size="large" :loading="loading" type="info" @click="login(true)" long>
+              <Button size="large" :loading="loading" type="info" @click="login" long>
                <span v-if="!loading">登录</span>
                <span v-else>正在登录...</span>
              </Button>
@ -140,9 +137,11 @@
      </div>
    </div>
    <div class="login-footer">
-
-
-<!--      -->
+      <!-- 企业信息
+      <p>Copyright © 2020 lanhai-tech Inc. All Rights Reserved.</p>
+      <p>青岛蓝海软通信息技术有限公司 版权所有</p>
+      -->
+<!--     --> 
      <p>Copyright © 2021 dongsheng-soft Inc. All Rights Reserved.</p>
      <p>青岛东胜软件信息技术有限公司 版权所有</p>

@ -162,10 +161,8 @@ export default {
        userCompanyName: "",
        userName: "",
        passWord: "",
-        //hideCompCMB:false
      },
-      companys: [],
-      Language:"中文",
+      companys: []
    };
  },
  directives: {
@ -177,21 +174,7 @@ export default {
  },
  created() {
    //this.getVierificationCode();
-    if(this.$route.query.companycode && this.$route.query.codename && this.$route.query.pwd){
-      //alert(this.$route.query.companycode+this.$route.query.codename+this.$route.query.pwd);
-      this.userInfo.userCompanycode=this.$route.query.companycode;
-      this.userInfo.userName=this.$route.query.codename;
-      this.userInfo.passWord=this.$route.query.pwd;
-      localStorage.setItem('hidepath',true);
-      this.login();
-      //同时让菜单和上方部分都隐藏
-    }else{
-      localStorage.setItem('hidepath',false);
-    }
-
    this.getCompany();
-
-    //this.hideCompCMB=(this.http.FormShow.isHGTY)
  },
  watch: {

@ -207,15 +190,6 @@ export default {
    //     this.userInfo.UUID = x.uuid;
    //   });
    // },
-    onInit(){
-
-      if(this.$i18n.locale=='en'){
-        this.Language='English';
-      }
-
-      
-    },
-
    getCompany() {
      //let companys = [];
      this.http.get("/api/Sys_Dictionary/getCompany").then((dic) => {
@ -231,20 +205,16 @@ export default {
    },
    loginPress(e) {
      if (event.keyCode == 13) {
-        this.login(true);
+        this.login();
      }
    },
    selectAndloginPress(e) {
      if (this.userInfo.userCompanycode.indexOf("-") != -1 || this.userInfo.userCompanycode=="")
        this.selectBlur(e);
-      this.login(true);
+      this.login();
    },

-    login(type=false) {
-      if(type==true){
-        localStorage.setItem('hidepath',false);
-      }
-
+    login() {
      if (
        this.userInfo.userCompanycode == "" ||
        this.userInfo.userCompanycode.trim() == ""
--- a/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/VW_OP_WMS_FEEDUI_STORAGE_CUSTService.cs
+++ b/Vue.Net/VOL.WMS/Services/WMS/FEE/Partial/VW_OP_WMS_FEEDUI_STORAGE_CUSTService.cs
@ -1175,13 +1175,25 @@ namespace VOL.WMS.Services
                        {
                            if (physicsitem.AREACODE == AREACODE)
                            {
-                                if (physicsitem.DODATE <= head.STARTDATE)
+                                if (physicsitem.DODATE < head.STARTDATE)
                                {
                                    //这是为了从最早到现在逐次取用物理变动日志作为第一条 如果有时间范围内的更新的 就替换掉旧的
                                    该库位此次可用的物理变动日志 = new List<Op_Wms_Physics_Change>();
                                    该库位此次可用的物理变动日志.Add(physicsitem);
                                }
                                else
+                                if (physicsitem.DODATE == head.STARTDATE)
+                                {
+                                    if (该库位此次可用的物理变动日志.Exists(x => x.DODATE < physicsitem.DODATE) || 该库位此次可用的物理变动日志.Count==0)
+                                    {
+                                        该库位此次可用的物理变动日志 = new List<Op_Wms_Physics_Change>();
+                                        该库位此次可用的物理变动日志.Add(physicsitem);
+                                    }
+                                    else {
+                                        该库位此次可用的物理变动日志.Add(physicsitem);
+                                    }
+                                }
+                                else
                                {
                                    //if (该库位此次可用的物理变动日志.Count == 0)
                                    //{
--- a/Vue.Net/VOL.WMS/Services/WMS/WMS_TRANSFER/Partial/OP_WMS_TRANSFERGOODSService.cs
+++ b/Vue.Net/VOL.WMS/Services/WMS/WMS_TRANSFER/Partial/OP_WMS_TRANSFERGOODSService.cs
@ -436,7 +436,7 @@ namespace VOL.WMS.Services
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
-        ///*
+        /*
        public WebResponseContent MakeDo(SaveModel saveModel)
        {
            try
--- a/Vue.Net/VOL.WMS/Services/WMS/WMS_TRANSFER/Partial/VW_OP_WMS_TRANSFERGOODS_DETAILService.cs
+++ b/Vue.Net/VOL.WMS/Services/WMS/WMS_TRANSFER/Partial/VW_OP_WMS_TRANSFERGOODS_DETAILService.cs
@ -15,6 +15,7 @@ using System.Linq.Expressions;
 using VOL.Core.Extensions;
 using Microsoft.EntityFrameworkCore;
 using VOL.Core.ManageUser;
+using VOL.Core.Configuration;

 namespace VOL.WMS.Services
 {
@ -26,21 +27,24 @@ namespace VOL.WMS.Services
            {
                //如果该用户被限制于本公司 则必须

-                if (UserContext.Current.UserInfo.LimitInCompany)
+                if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
                {
-                    //IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();

-                    queryable = queryable.Where(x => x.CORPID == UserContext.Current.UserInfo.CompanyId);
-                }
-                if (UserContext.Current.UserInfo.LimitBySTORAGE)
-                {
-                    //IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();
+                    if (UserContext.Current.UserInfo.LimitInCompany)
+                    {
+                        //IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();

-                    var storehosuelist = UserContext.Current.UserInfo.STOREHOUSEList;
+                        queryable = queryable.Where(x => x.CORPID == UserContext.Current.UserInfo.CompanyId);
+                    }
+                    if (UserContext.Current.UserInfo.LimitBySTORAGE)
+                    {
+                        //IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();

-                    queryable = queryable.Where(x => storehosuelist.Contains(x.STOREHOUSE));
-                }
+                        var storehosuelist = UserContext.Current.UserInfo.STOREHOUSEList;

+                        queryable = queryable.Where(x => storehosuelist.Contains(x.STOREHOUSE));
+                    }
+                }

                return queryable;
            };
--- a/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs
+++ b/Vue.Net/VOL.WMS/Services/WMSOUT/Partial/OP_WMS_OUT_PLANService.cs
@ -102,7 +102,7 @@ namespace VOL.WMS.Services
        }

        /// <summary>
-        /// 查询计划中的箱号
+        /// 查询计划中的箱号，计划中使用
        /// </summary>
        /// <param name="saveModel"></param>
        /// <returns></returns>
@ -198,6 +198,18 @@ namespace VOL.WMS.Services
                    }
                }

+                if (result != null && result.Count > 0 && result.Exists(x => x.WMSPHYSICSID == null)) {
+
+                    var detailidList = result.Select(s => s.WMSOUTDETAILID).ToList();
+
+                    var realOutPlanDetailList = OP_WMS_OUT_PLAN_DETAILRepository.Instance.FindAsIQueryable(x => detailidList.Contains(x.WMSOUTDETAILID)).ToList();
+
+                    foreach (var item in result.Where(x => x.WMSPHYSICSID == null).ToList()) {
+                        item.WMSPHYSICSID = realOutPlanDetailList.FirstOrDefault(x => x.WMSOUTDETAILID == item.WMSOUTDETAILID).WMSPHYSICSID;
+                    }
+                }
+
+

                object gridData = new { rows = result, total };
                return gridData;
@ -667,8 +679,22 @@ namespace VOL.WMS.Services
                return WebResponseContent.Instance.OK();
            };

-            var _r = base.Add(saveDataModel);
-            return _r;
+            try
+            {
+                if (!addLockKey(UserContext.Current.UserId))
+                {
+                    return _webResponse.Error("正在处理中，请稍候。如果长时间无响应可以尝试刷新");
+                }
+                var _r = base.Add(saveDataModel);
+                return _r;
+            }
+            catch (Exception e)
+            {
+                return _webResponse.Error(e.Message);
+            }
+            finally {
+                delLockKey(UserContext.Current.UserId);
+            }
        }

        /// <summary>
--- a/Vue.Net/VOL.WebApi/appsettings.json
+++ b/Vue.Net/VOL.WebApi/appsettings.json
@ -62,12 +62,12 @@
    //"DbConnectionString": "Data Source=47.104.158.21,1433;Initial Catalog=ShippingWeb_QDTZ;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",

    //嘉里物流
-    //"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=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_CS;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;",

    //全盛时代
    //"DbConnectionString": "Data Source=59.110.216.226,52431;Initial Catalog=ShippingWeb_QDQSSD;Persist Security Info=True;User ID=QSSD;Password=SL226QSsd@@;Connect Timeout=500;",
@ -100,9 +100,9 @@
    //"COMPANYNAME": "FEST",//菲尔斯特
    //"COMPANYNAME": "YULONG",//裕龙
    //"COMPANYNAME": "ZHONGPENG",//连云港中鹏
-    //"COMPANYNAME": "JLWL",//嘉里物流
+    "COMPANYNAME": "JLWL",//嘉里物流
    //"COMPANYNAME": "HUAGANG", //华港通运
-    "COMPANYNAME": "JGWL", //青岛金港物流
+    //"COMPANYNAME": "JGWL", //青岛金港物流
    //"COMPANYNAME": "QSSD",//全盛时代
    "SingleLogin": "false", //是否只允许单个登陆（是否新的登陆踢掉旧的登陆）
    "CanOutMore": "true", //出库执行时允许超量出库