diff --git a/Vol.Vue/src/components/basic/InfoFile_Table.vue b/Vol.Vue/src/components/basic/InfoFile_Table.vue index 00883776..4037d60e 100644 --- a/Vol.Vue/src/components/basic/InfoFile_Table.vue +++ b/Vol.Vue/src/components/basic/InfoFile_Table.vue @@ -4,9 +4,9 @@
- - - + + +
@@ -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); diff --git a/Vol.Vue/src/components/basic/festwmsLogicEditmodel.vue b/Vol.Vue/src/components/basic/festwmsLogicEditmodel.vue index 28e580a3..816c2a46 100644 --- a/Vol.Vue/src/components/basic/festwmsLogicEditmodel.vue +++ b/Vol.Vue/src/components/basic/festwmsLogicEditmodel.vue @@ -258,7 +258,7 @@ export default { TYPENAME : "库存列表编辑", WMSID:_this.headid, BILLTYPE:_this.formFields.BILLTYPE, - INSPECTIONTIME:_this.formFields.INSPECTIONTIME, + INSPECTIONTIME:_this.formFields.INSPECTIONTIME, NEWSALE:_this.formFields.NEWSALE //测试内容 // TYPENAME : "付费申请审批", diff --git a/Vol.Vue/src/extension/wms/OP_WMS_PROJECT.js b/Vol.Vue/src/extension/wms/OP_WMS_PROJECT.js index f73111fc..b7b16d80 100644 --- a/Vol.Vue/src/extension/wms/OP_WMS_PROJECT.js +++ b/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: '', - modelBody: '', - modelFooter: '' + modelHeader: () => import("./Uploadform/UPLOADFILE.vue"), + modelBody: () => ({ component: import("./OP_WMS_PROJECTModelBody.vue"), loading: AsyncLoading }), + 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; diff --git a/Vol.Vue/src/extension/wms/OP_WMS_PROJECTModelBody.vue b/Vol.Vue/src/extension/wms/OP_WMS_PROJECTModelBody.vue new file mode 100644 index 00000000..90defd6f --- /dev/null +++ b/Vol.Vue/src/extension/wms/OP_WMS_PROJECTModelBody.vue @@ -0,0 +1,252 @@ + + + diff --git a/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit.vue b/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit.vue index 9a6a4c38..00093b72 100644 --- a/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit.vue +++ b/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:'NETWEIGHT',title:this.$t('NETWEIGHT'),type:'decimal',width:90,align:'left',sort:true}, - {field:'CBM',title:this.$t('CBM'),type:'decimal',width:90,align:'left',sort:true}, - {field:'PKGS',title:this.$t('PKGS'),type:'decimal',width:90,align:'left',sort:true}, - {field:'SMALLPKGS',title:this.$t('SMALLPKGS'),type:'decimal',width:90,align:'left',sort:true}, - {field:'MINPKGS',title:this.$t('MINPKGS'),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',summary:true,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',summary:true,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',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'}, diff --git a/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit_BEFORE.vue b/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit_BEFORE.vue index d0217063..ea57beb3 100644 --- a/Vol.Vue/src/extension/wms/VW_OP_WMS_TRANSFERGOODS_Edit_BEFORE.vue +++ b/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:'NETWEIGHT',title:this.$t('NETWEIGHT'),type:'decimal',width:90,align:'left',sort:true}, - {field:'CBM',title:this.$t('CBM'),type:'decimal',width:90,align:'left',sort:true}, - {field:'PKGS',title:this.$t('PKGS'),type:'decimal',width:90,align:'left',sort:true}, - {field:'SMALLPKGS',title:this.$t('SMALLPKGS'),type:'decimal',width:90,align:'left',sort:true}, - {field:'MINPKGS',title:this.$t('MINPKGS'),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',summary:true,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',summary:true,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',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'}, diff --git a/Vue.Net/ConvertHelper/ConvertJsonExtension.cs b/Vue.Net/ConvertHelper/ConvertJsonExtension.cs index ab4c3100..ecb067e9 100644 --- a/Vue.Net/ConvertHelper/ConvertJsonExtension.cs +++ b/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); diff --git a/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs b/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs index 22029618..bff019ab 100644 --- a/Vue.Net/VOL.Core/BaseProvider/ServiceBase.cs +++ b/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}"; diff --git a/Vue.Net/VOL.WMS/Services/WMS/INFO_FILES/Partial/INFO_FILESService.cs b/Vue.Net/VOL.WMS/Services/WMS/INFO_FILES/Partial/INFO_FILESService.cs index 849889ef..efccf660 100644 --- a/Vue.Net/VOL.WMS/Services/WMS/INFO_FILES/Partial/INFO_FILESService.cs +++ b/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]); diff --git 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 index 2f61ab1b..27e6e087 100644 --- 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 @@ -23,6 +23,23 @@ namespace VOL.WMS.Services { public override PageGridData GetPageData(PageDataOptions options) { + SummaryExpress = (IQueryable 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 queryable) => { //如果该用户被限制于本公司 则必须 diff --git a/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs b/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs index b8cb0151..7dd1aca5 100644 --- a/Vue.Net/VOL.WMS/Services/WMSINDO/Partial/OP_WMS_IN_DOService.cs +++ b/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); diff --git 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 index aa88ec31..d528d824 100644 --- 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 @@ -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")); diff --git a/Vue.Net/VOL.WebApi/appsettings.json b/Vue.Net/VOL.WebApi/appsettings.json index 24c602cd..002ac665 100644 --- a/Vue.Net/VOL.WebApi/appsettings.json +++ b/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;",