20230830

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

@@ -4,9 +4,9 @@
 <div>
   <div class="tabs1-header">
     <div class="btn-group">
-      <Button type="info" size="small" icon="md-add-circle" ghost @click="addfile">添加</Button>
+      <Button type="info" size="small" icon="md-add-circle" ghost v-show="!hidechange" @click="addfile">添加</Button>
-      <Button type="info" size="small" icon="md-remove-circle" ghost @click="delfile">删除</Button>
+      <Button type="info" size="small" icon="md-remove-circle" v-show="!hidechange" ghost @click="delfile">删除</Button>
-      <Button type="info" size="small" icon="md-document" ghost @click="savefile">保存</Button> 
+      <Button type="info" size="small" icon="md-document" ghost v-show="!hidechange" @click="savefile">保存</Button> 
       <Button type="info" size="small" icon="md-download" ghost @click="downloadselected">下载选中</Button>
       <Button type="info" size="small" icon="md-refresh" ghost @click="$refs.tab_infofiles.load()">{{this.$t('refrash')}}</Button>
     </div>
@@ -124,7 +124,8 @@ export default {
       headid:"",
       pbsno:"",
       listHead:{},
-      bodyHead:{}
+      bodyHead:{},
+      hidechange:false,//
     };
   },
   created() {
@@ -150,15 +151,6 @@ export default {
       }
     },
 
-    setTruckinfo(trucknolist){
-      this.columns.forEach((x)=>{
-        if(x.field=="FILENAME"){
-          x.title=this.$t('truckinfocolumn.TRUCKNO');
-          x.bind={ key:'blankdic',data:trucknolist};
-          x.edit={type:'select',keep:true};
-        }
-      })
-    },
 
     getforminfo(){
       let headforminfo = this.bodyHead.getforminfo();
@@ -167,9 +159,29 @@ export default {
       this.filename = headforminfo.filename;
       this.headid = headforminfo.headid;
       this.pbsno = headforminfo.pbsno;
+
+      if(headforminfo.hidechange){
+        this.hidechange=true;
+
+        this.columns.forEach((x)=>{
+          if(x.field=="上传图片"){
+            x.hidden=true;
+          }
+          if(x.field=="photopic"){
+            x.hidden=true;
+          }
+          if(x.field=="上传文件"){
+            x.hidden=true;
+          }
+        })
+        
+      }
     },
 
     loadBefore_Infofile(param, callBack){
+
+      this.getforminfo();
+      
       this.bodyHead.loadTableBefore_Infofile(param,callBack);
       callBack(callBack);
 

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

@@ -1,5 +1,6 @@
 //author:jxx
 //此处是对表单的方法，组件，权限操作按钮等进行任意扩展(方法扩展可参照SellOrder.js)
+import AsyncLoading from "@/components/basic/AsyncLoading.vue";
 let extension = {
     components: {//动态扩充组件或组件路径
         //表单header、content、footer对应位置扩充的组件
@@ -7,12 +8,26 @@ let extension = {
         gridBody: '',
         gridFooter: '',
         //弹出框(修改、编辑、查看)header、content、footer对应位置扩充的组件
-        modelHeader: '',
+        modelHeader: () => import("./Uploadform/UPLOADFILE.vue"),
-        modelBody: '',
+        modelBody: () => ({ component: import("./OP_WMS_PROJECTModelBody.vue"), loading: AsyncLoading }),
-        modelFooter: ''
+        modelFooter: () => import("./Uploadform/UPLOADPIC.vue"),
     },
-    buttons: {view: [], box:[],  detail:[]},//扩展的按钮
+    buttons: {
+        view: [], box: [
+        
+        ], detail: [
+        
+    ]},//扩展的按钮
     methods: {//事件扩展
+        onInited() {
+
+            this.height = this.height;
+
+            var _currcolumn = this.$parent._data.columns;
+
+            _currcolumn = this.getUserColumnSet("OP_WMS_PROJECT", _currcolumn);
+
+        },
         onInit() {
             this.$store.getters.data().OPPROJECT_parent_head = this;
 

Vol.Vue/src/extension/wms/OP_WMS_PROJECTModelBody.vue

@@ -0,0 +1,252 @@
+<template>
+  <div class="vol-tabs">
+     <Tabs ref="projecttabs">
+
+      <TabPane :label="this.$t('labeltitle.InfoFiles')" icon="ios-aperture">
+        <Infofiles_Table
+          ref="tab_infofiles"
+          @loadBefore="loadTableBefore_Infofile"
+          @loadAfter="loadTableAfter_Infofile"
+        ></Infofiles_Table>
+      </TabPane>
+      
+
+    </Tabs> 
+  </div>
+</template>
+<script>
+//开发一对多从表需要参照voltable与viewgrid组件api
+import VolTable from "@/components/basic/VolTable.vue";
+import Infofiles_Table from "@/components/basic/InfoFile_Table.vue";
+import InfoClientContract_Table from "@/components/basic/InfoClientContract_Table.vue";
+export default {
+  components: { VolTable,Infofiles_Table,InfoClientContract_Table,
+  VolForm: ()=> import("@/components/basic/VolForm.vue")
+  },
+  data() {
+    return {
+
+      formname_cn:"项目管理",
+    };
+  },
+  
+  created() {
+    //this.getCustName();
+    //this.IsBatchStock = false
+    // this.getConditionList();
+    //this.searchField_planlist.PLANTIME
+    window.Bodyhead = this;
+    window.Listhead = this.$store.getters.data().OPPROJECT_parent_head;    
+    // this.WanHuaHuaXue_Show=this.http.FormShow.WanHuaHuaXue_Show;
+
+    // this.isWUTONG = this.http.FormShow.isWUTONG;
+
+    // this.GoodsModelShow = this.http.GoodsModelShow;
+
+
+    //this.getPrintList();
+
+  },
+  computed:{
+    // isBatchStock:function() {
+    //     let _headform=this.$store.getters.data().OPPROJECT_parent_head;
+    //     let _data=  _headform.geteditformfield();
+    //     // console.log(_data) 
+    //     let isbatch=  _data.ISBATCHSTOCK == 0 ? false : true
+    //     this.IsBatchStock = isbatch 
+    //     console.log(this.IsBatchStock)
+    //     // this.loadTableAfter1()
+    //     return isbatch;
+    // },
+    // showwmsfee:function(){
+    //   let _headform=this.$store.getters.data().OPPROJECT_parent_head;
+    //   let _data=  _headform.geteditformfield();
+    //   // console.log(_data) 
+    //   let _Showwmsfee=  _data.BSSTATUS == "true" ? false : true
+    //   this.Showwmsfee = _Showwmsfee; 
+    //   //console.log(this.IsBatchStock)
+    //   // this.loadTableAfter1()
+    //   return _Showwmsfee;
+    // }                 
+  },
+  mounted() {
+    // let tabs= this.$refs.outplantabs.getTabs();
+    // console.log('当前标识',this.IsBatchStock)
+    // tabs.forEach((x)=>{
+    //   if(!this.isFEST){
+    //     if(x.label=="费用"){
+    //       x.disabled=true;
+    //       if(this.http.FormShow.isJGWL){
+    //         x.disabled=false;
+    //       }
+    //     }
+    //   }
+    // });
+
+
+  },
+  methods: {
+    // refreshplan(param, callBack) {
+    //   this.$refs.table1.reset();
+    // },
+    getheadid(){
+      let _headform=this.$store.getters.data().OPPROJECT_parent_head;
+      let _data=  _headform.geteditformfield();
+      let searchvalue=_data.GID;
+
+      if(_headform.isNullorEmpty(searchvalue)){searchvalue="00000000-0000-0000-0000-000000000000"}
+      return searchvalue;
+    },
+    
+    loadTableBefore_Infofile(param) {
+      param.wheres=[]; 
+      //let headid =this.getheadid();
+
+      let _this=this.$store.getters.data().OPPROJECT_parent_head;
+      let MBLNO= _this.geteditformfield().PROJECTNAME;
+
+      param.wheres.push({ Name:"MBLNO",Value:MBLNO,displayType:'='});
+    },
+    loadTableAfter_Infofile(data, callBack) {
+      
+
+
+      
+      return true;
+    },  
+
+
+    // remoteLoad() {
+    // },
+    // setFormData(formData){
+    //   let extra = {
+    //       // table1List: this.$refs.table1.rowData,
+    //       // tab_truckList: this.$refs.tab_truck.rowData,
+    //   }
+    //   formData.extra = JSON.stringify(extra);
+    //   return formData;
+    // },
+
+    // selectBlur(e) {
+    //   this.Customer = e.target.value;
+    // },
+    // getOption(field) {
+    //   let option;
+    //   let _headform=this.$store.getters.data().OPPROJECT_parent_head;
+    //   _headform.editFormOptions.forEach(x => {
+    //       x.forEach(item => {
+    //           if (item.field == field) {
+    //               option = item;
+    //           }
+    //       })
+    //   })
+    //   return option;
+    // },
+
+    getforminfo() {
+      let headid =this.getheadid();
+      let _headform=this.$store.getters.data().OPPROJECT_parent_head;
+      let _data=  _headform.geteditformfield();
+      let CUSTOMERNAME = _data.CUSTOMERNAME;
+      let MBLNO = _data.MBLNO;
+
+
+
+      return {formname:this.formname,formname_cn:this.formname_cn,headid:headid
+        ,filetype:"项目管理",filename:"项目管理",mblno:MBLNO 
+        ,customername:CUSTOMERNAME
+        ,hidechange:true
+      };
+    },
+    
+
+    // getPrintList() {
+
+    //   let GetPrintInfoUrl= "api/SYS_PRINTINFO/GetPrintList";
+    //   let _headform = this.$store.getters.data().OPPROJECT_parent_head;  
+    //   let _this=this;
+    //   let userInfo = this.$store.getters.getUserInfo();
+      
+    //   let printparam = {
+    //     order: "asc",
+    //     page: 1,
+    //     rows: 30,
+    //     sort:"",
+    //     wheres:  [{name:"MODNAME",value:this.formname_cn},{name:"CORPID",value:userInfo.companyId}], //查询条件，格式为[{ name: "字段", value: "xx" }]
+
+    //   };
+
+    //   if (printparam.wheres && printparam.wheres instanceof Array) {
+    //     printparam.wheres = JSON.stringify(printparam.wheres);
+    //   }
+      
+    //   this.http.post(GetPrintInfoUrl,  printparam ).then(response => {
+    //     var redata=response.rows;
+    //     _this.PRINTINFOList=redata;
+    //   })
+    //   .catch(function (error) {
+    //     console.log(error);
+    //   });  
+
+
+    // },
+    // doprint(){
+    //     //return this.$Message.error(this.PrintInfo.PRINTID);
+    //     let headid=this.getheadid();
+
+    //     let rows2 = this.$refs.table1.getSelected();
+    //     let printkeys2 = rows2.map(x => {
+    //         return "'" + x['WMSOUTDETAILID'] + "'";
+    //     });
+    //     var keystr2=""
+
+    //     if(printkeys2.length>0){
+    //       printkeys2.forEach(x => {
+    //           if (keystr2 != "") keystr2+=","
+    //           keystr2 += x;
+    //       });
+    //     }else{
+    //       //
+    //       keystr2="''";
+    //     }
+
+    //     let PrintInfo = {
+    //       PRINTTYPE: this.PrintMessage.PRINTTYPE,
+    //       MODNAME: this.formname_cn,
+    //       PRINTNAME: this.PrintMessage.printname,
+    //       TITLE: "",
+    //       headid:headid,
+    //       BILLGID:headid,
+    //       param1:"" + keystr2
+    //     };
+    //     let $http = this.http;
+    //     let tigger = false;
+    //     if (tigger) return;
+    //     tigger = true;   
+    //     let url = "api/SYS_PRINTINFO/FastReportPrint_back";
+    //     this.http.post(url, PrintInfo, this.$t('MSG.MakingPrintFile')).then(x => {
+    //       if (!x.status) return this.$error(x.message);
+    //       tigger = false;
+    //       //this.$refs.table1.delRow(rows);
+    //       let url=x.data;//下载地址
+    //       window.open($http.ipAddress+'/'+url);
+    //     });
+    // },
+
+
+  }
+};
+</script>
+<style lang="less" scoped>
+.vol-tabs {
+  background: white;
+}
+.tabs1-header {
+  display: flex;
+  text-align: right;
+  padding: 10px;
+  .btn-group {
+    flex: 1;
+  }
+}
+</style>

Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit.vue

@@ -205,17 +205,17 @@ export default {
         {field:'WMSINDATE',title:this.$t('DODATE_IN'),type:'date',width:90,align:'left',sort:true},
         {field:'FEESTARTDATE',title:this.$t('FEESTARTDATE'),type:'date',width:90,align:'left',sort:true},
         {field:'FEERATESTARTDATE',title:this.$t('FEERATESTARTDATE'),type:'date',width:90,align:'left',sort:true},
-        {field:'KGS',title:this.$t('KGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'KGS',title:this.$t('KGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'NETWEIGHT',title:this.$t('NETWEIGHT'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'NETWEIGHT',title:this.$t('NETWEIGHT'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'CBM',title:this.$t('CBM'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'CBM',title:this.$t('CBM'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'PKGS',title:this.$t('PKGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'PKGS',title:this.$t('PKGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'SMALLPKGS',title:this.$t('SMALLPKGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'SMALLPKGS',title:this.$t('SMALLPKGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'MINPKGS',title:this.$t('MINPKGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'MINPKGS',title:this.$t('MINPKGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
         {field:'KINDPKGS',title:this.$t('KINDPKGS'),type:'string',width:90,align:'left',sort:true},
         {field:'STORAGEUNIT',title:this.$t('STORAGEUNIT'),type:'string',width:90,align:'left',sort:true},
-        {field:'STORAGEUNITCOUNT',title:this.$t('STORAGEUNITCOUNT'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'STORAGEUNITCOUNT',title:this.$t('STORAGEUNITCOUNT'),type:'decimal',width:90,align:'left',summary:true,sort:true},
         {field:'RULEUNIT',title:this.$t('RULEUNIT'),type:'string',width:90,align:'left',sort:true},
-        {field:'RULEUNITCOUNT',title:this.$t('RULEUNITCOUNT'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'RULEUNITCOUNT',title:this.$t('RULEUNITCOUNT'),type:'decimal',width:90,align:'left',summary:true,sort:true},
         {field:'REMARK',title:this.$t('REMARK'),type:'string',width:120,align:'left',edit:{type:'text',keep:true}},
         {field:'GOODSMODEL',title:this.$t('GOODSMODEL'),type:'string',width:140,align:'left'},
         {field:'AREANAME',title:this.$t('AREACODE'),type:'string',width:120,align:'left'},

Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit_BEFORE.vue

@@ -205,17 +205,17 @@ export default {
         {field:'WMSINDATE',title:this.$t('DODATE_IN'),type:'date',width:90,align:'left',sort:true},
         {field:'FEESTARTDATE',title:this.$t('FEESTARTDATE'),type:'date',width:90,align:'left',sort:true},
         {field:'FEERATESTARTDATE',title:this.$t('FEERATESTARTDATE'),type:'date',width:90,align:'left',sort:true},
-        {field:'KGS',title:this.$t('KGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'KGS',title:this.$t('KGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'NETWEIGHT',title:this.$t('NETWEIGHT'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'NETWEIGHT',title:this.$t('NETWEIGHT'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'CBM',title:this.$t('CBM'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'CBM',title:this.$t('CBM'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'PKGS',title:this.$t('PKGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'PKGS',title:this.$t('PKGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'SMALLPKGS',title:this.$t('SMALLPKGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'SMALLPKGS',title:this.$t('SMALLPKGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
-        {field:'MINPKGS',title:this.$t('MINPKGS'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'MINPKGS',title:this.$t('MINPKGS'),type:'decimal',width:90,align:'left',summary:true,sort:true},
         {field:'KINDPKGS',title:this.$t('KINDPKGS'),type:'string',width:90,align:'left',sort:true},
         {field:'STORAGEUNIT',title:this.$t('STORAGEUNIT'),type:'string',width:90,align:'left',sort:true},
-        {field:'STORAGEUNITCOUNT',title:this.$t('STORAGEUNITCOUNT'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'STORAGEUNITCOUNT',title:this.$t('STORAGEUNITCOUNT'),type:'decimal',width:90,align:'left',summary:true,sort:true},
         {field:'RULEUNIT',title:this.$t('RULEUNIT'),type:'string',width:90,align:'left',sort:true},
-        {field:'RULEUNITCOUNT',title:this.$t('RULEUNITCOUNT'),type:'decimal',width:90,align:'left',sort:true},
+        {field:'RULEUNITCOUNT',title:this.$t('RULEUNITCOUNT'),type:'decimal',width:90,align:'left',summary:true,sort:true},
         {field:'REMARK',title:this.$t('REMARK'),type:'string',width:120,align:'left',edit:{type:'text',keep:true}},
         {field:'GOODSMODEL',title:this.$t('GOODSMODEL'),type:'string',width:140,align:'left'},
         {field:'AREANAME',title:this.$t('AREACODE'),type:'string',width:120,align:'left'},

Vue.Net/ConvertHelper/ConvertJsonExtension.cs

@@ -418,6 +418,15 @@ namespace ConvertHelper
             return result + 1;
         }
 
+        public static string FileNameDeal( string fileName) {
+            try
+            {
+                var result = fileName.Replace("+", "_").Replace("-", "_").Replace("%", "_").Replace("&", "_").Replace("<", "_").Replace(">", "_").Replace("#", "_");
+                return result;
+            }
+            catch (Exception e) { return fileName; }
+        } 
+
         #region 内存回收
         [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize")]
         public static extern int SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize);

Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs

@@ -533,6 +533,11 @@ namespace VOL.Core.BaseProvider
                 for (i = 0; i < files.Count; i++)
                 {
                     string fileName = files[i].FileName;
+
+                    //20230830 增加处理 如果文件名称中带有+ - % & < > / # 则将其替换为_
+
+                    fileName = BasicDALRef.FileNameDeal(fileName);
+
                     //if (fileNames.Contains(fileName))
                     //{
                     //    fileName += $"({i}){fileName}";

Vue.Net/VOL.WMS/Services/WMS/INFO_FILES/Partial/INFO_FILESService.cs

@@ -84,6 +84,11 @@ namespace VOL.WMS.Services
                 }
             }
 
+            foreach (var item in FileList) {
+
+                item.FILEPATH=BasicDALRef.FileNameDeal(item.FILEPATH);
+            }
+
             var dealedbodylist = DealBodyList(BSNO, FileList);
 
             INFO_FILESRepository.Instance.AddRange(dealedbodylist[0]);

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

@@ -23,6 +23,23 @@ namespace VOL.WMS.Services
     {
         public override PageGridData<VW_OP_WMS_TRANSFERGOODS_DETAIL> GetPageData(PageDataOptions options)
         {
+            SummaryExpress = (IQueryable<VW_OP_WMS_TRANSFERGOODS_DETAIL> queryable) =>
+            {
+                return queryable.GroupBy(x => 1).Select(x => new
+                {
+                    //AvgPrice = x.Average(o => o.AvgPrice),
+                    PKGS = x.Sum(o => o.PKGS),
+                    KGS = x.Sum(o => o.KGS),
+                    NETWEIGHT = x.Sum(o => o.NETWEIGHT),
+                    CBM = x.Sum(o => o.CBM),
+                    STORAGEUNITCOUNT = x.Sum(o => o.STORAGEUNITCOUNT),
+                    RULEUNITCOUNT = x.Sum(o => o.RULEUNITCOUNT),
+                    SMALLPKGS = x.Sum(o => o.SMALLPKGS),
+                    MINPKGS = x.Sum(o => o.MINPKGS)
+                })
+                .FirstOrDefault();
+            };
+
             QueryRelativeExpression = (IQueryable<VW_OP_WMS_TRANSFERGOODS_DETAIL> queryable) =>
             {
                 //如果该用户被限制于本公司 则必须

Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs

@@ -1410,6 +1410,46 @@ namespace VOL.WMS.Services
 
                 _r.Data = GetHead(WMSDOID, "[入库审核]成功");
 
+                //20230830 如果审核成功 增加一个项目信息 用于金港物流的附件审核
+
+                if (AppSetting.CompanySetting.COMPANYNAME == "JGWL")
+                {
+
+                    //看是否有提单号与当前项目当中的项目一致的 如果没有 则新建
+
+                    var currproject = OP_WMS_PROJECTRepository.Instance.FindAsIQueryable(x => x.PROJECTNAME == 入库执行.MBLNO).ToList();
+
+                    if (currproject == null || currproject.Count > 0) {
+
+                        var billno = base.GetBillNo("大宗商品项目");//base.GetBillNo("海运进口","委托编号")
+                        if (string.IsNullOrWhiteSpace(billno))
+                        {
+                            return WebResponseContent.Instance.Error("请设置编码规则【大宗商品项目.委托编号】");
+                        }
+
+
+                        var newrec = new OP_WMS_PROJECT
+                        {
+                            WMSPROJECTID = Guid.NewGuid(),
+                            BSNO = billno,
+                            PROJECTNAME = 入库执行.MBLNO,
+                            INDATE = 入库执行.DODATE,
+                            GOODSNAME = 入库执行.GOODSNAME,
+                            BILLSTATUS = "1000",
+                            CORPID = 入库执行.CORPID
+
+                        };
+                        newrec.SetCreateDefaultVal();
+
+                        OP_WMS_PROJECTRepository.Instance.Add(newrec, true);
+                    }
+                    else {
+
+                        
+                    }
+
+                }
+
 
 
                 return _r.OK("[入库审核]成功", ((SaveResult)_r.Data).data);

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

@@ -2011,6 +2011,7 @@ namespace VOL.WMS.Services
                 if (AppSetting.CompanySetting.COMPANYNAME == "YULONG" || AppSetting.CompanySetting.COMPANYNAME == "JGWL")
                 {
                     //裕龙由于前期数据的原因 必须允许不同库的货物同时发出
+                    //金港物流将仓库的由不同人管理的库区定义成了不同库，以适应权限设置
                 }
                 else
                 {
@@ -2022,7 +2023,6 @@ namespace VOL.WMS.Services
                 }
                 #endregion
 
-
                 var wmsplanid = Guid.NewGuid();
                 if (!(saveModel.MainData["WMSPLANID"].ToString() == "")) {
                     wmsplanid = new Guid(saveModel.getMainDataValueStr("WMSPLANID"));

Vue.Net/VOL.WebApi/appsettings.json

@@ -65,9 +65,9 @@
     //"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_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;",