From fc90b1e47d11aa70279661d4cb8357c8d2129d79 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 29 Nov 2024 19:04:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=89=A9=E6=96=99=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7=E6=B2=A1=E6=9C=89=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/purchase/purchaseOrder/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html index 6cd8ee1d..36505a03 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html @@ -197,7 +197,7 @@ }, { title: '不含税总价', - field: 'materialNoRmbSum', + field: 'materialNormbSum', }, { title: '含税总价', From 34dccd81c0f4b93a21533bf3284b299b259bd74a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 29 Nov 2024 19:21:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[feat]=20=E7=89=A9=E6=96=99=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8A=A5=E4=BB=B7=E5=89=8D=E7=AB=AF=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=92=8C=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=8D=95=E4=BD=8D=E5=8A=A0=E4=B8=8A=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E7=89=A9=E6=96=99=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E3=80=81mapper.xml=E5=B1=82?= =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7=E5=92=8C=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/SysCustomerQuoteChild.java | 28 +++++++++++++++++++ .../system/SysCustomerQuoteChildMapper.xml | 10 ++++++- .../templates/system/customerQuote/add.html | 4 ++- .../system/customerQuote/detail.html | 1 + .../templates/system/customerQuote/edit.html | 1 + .../system/customerQuote/taskModifyApply.html | 1 + .../system/customerQuote/taskYwjlVerify.html | 1 + .../system/customerQuote/taskYwzgVerify.html | 1 + .../system/customerQuote/taskZozjVerify.html | 1 + 9 files changed, 46 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java index 4b0c5ae0..5fc915f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java @@ -44,6 +44,15 @@ public class SysCustomerQuoteChild extends BaseEntity @Excel(name = "物料的加工方式") private String processMethod; + + /** 物料的型号 */ + @Excel(name = "物料的型号") + private String materialModel; + + /** 物料的单位 */ + @Excel(name = "物料的单位") + private String unit; + /** 物料的品牌 */ @Excel(name = "物料的品牌") private String brand; @@ -370,6 +379,23 @@ public class SysCustomerQuoteChild extends BaseEntity this.recentQuotationUSD = recentQuotationUSD; } + + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -405,6 +431,8 @@ public class SysCustomerQuoteChild extends BaseEntity .append("delFlag", getDelFlag()) .append("recentQuotationUSD",getRecentQuotationUSD()) .append("recentQuotationRMB",getRecentQuotationRMB()) + .append("materialModel",getMaterialModel()) + .append("unit",getUnit()) .toString(); } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml index ff78788f..17f75aae 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -39,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl, `describe`, + select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, unit, material_model, brand, photoUrl, `describe`, countTax, usdTax, materialNum,materialSole, recentQuotation_rmb, recentQuotation_usd, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum, materialNoUsdSum, materialNoRmbSum, materialRmbSum, create_by, create_time, update_by, update_time, remark, use_status,audit_status from sys_customer_quotechild @@ -76,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" materialName, materialType, processMethod, + unit, + material_model, brand, photoUrl, `describe`, @@ -105,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialName}, #{materialType}, #{processMethod}, + #{unit}, + #{materialModel}, #{brand}, #{photoUrl}, #{describe}, @@ -138,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" materialName = #{materialName}, materialType = #{materialType}, processMethod = #{processMethod}, + unit = #{unit}, + material_model = #{materialModel}, brand = #{brand}, photoUrl = #{photoUrl}, `describe` = #{describe}, diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index 9a7d6d98..52b22364 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -323,6 +323,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) { @@ -669,8 +670,9 @@ materialName: rowData.materialName, materialType: rowData.materialType, describe: rowData.describe, - brand: rowData.brand, + materialModel: rowData.materialModel, unit: rowData.unit, + brand: rowData.brand, processMethod: rowData.processMethod, photoUrl: rowData.photoUrl, countTax: '', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html index dce53ca2..59eb77e7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html @@ -178,6 +178,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html index 02b8e8e5..530d776f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html @@ -200,6 +200,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html index 6defaf81..c4437cf0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html @@ -237,6 +237,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html index 0c1eabbd..a80e50c5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html @@ -221,6 +221,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html index c8fb80b4..ad5c03b1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html @@ -243,6 +243,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html index 7cc4f053..d3bc7032 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html @@ -224,6 +224,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', From b42642bad97056449cf55db3035de32db4d4043a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 29 Nov 2024 19:28:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[fix]=20=E6=8C=89=E7=85=A7=E4=B8=87?= =?UTF-8?q?=E6=9D=90=E8=B0=83=E6=95=B4,=E4=BF=AE=E6=94=B919=E4=B8=AA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=B8=8A=E6=AC=A1=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=8A=8A=E4=B8=8A=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4->=E4=B8=8A=E6=AC=A1=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialRequisitionBCP/materialRequisitionBCP.html | 2 +- .../materialRequisitionFL/materialRequisitionFL.html | 2 +- .../materialRequisitionYL/materialRequisitionYL.html | 2 +- .../quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html | 2 +- .../quality/returnGoodsScInfo/returnGoodsScInfo.html | 2 +- .../main/resources/templates/stock/stockInfo/stockInfo.html | 2 +- .../storehouse/warehousingInPDBcp/warehousingInPDBcp.html | 2 +- .../warehousingInPDFinishProduct.html | 2 +- .../warehousingInRGFinishProduct.html | 2 +- .../system/companyInformation/companyInformation.html | 2 +- .../main/resources/templates/system/customer/customer.html | 2 +- .../src/main/resources/templates/system/customer/detail.html | 4 ++-- .../templates/system/customerQuote/customerQuote.html | 2 +- .../src/main/resources/templates/system/item/item.html | 2 +- .../main/resources/templates/system/procedure/procedure.html | 2 +- .../templates/system/processCategory/processCategory.html | 2 +- ruoyi-admin/src/main/resources/templates/system/sop/sop.html | 2 +- .../main/resources/templates/system/supplier/supplier.html | 2 +- .../templates/system/technicalTeam/technicalTeam.html | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html index 47102caa..fbfb6d61 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html @@ -195,7 +195,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html index 4c5bf0c5..520c1da5 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html @@ -195,7 +195,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html index fa56cec7..1791eb3a 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html @@ -194,7 +194,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html index fbff3ed9..9da9c6bf 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html @@ -236,7 +236,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html index d9b2fe79..5d162c1e 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html @@ -146,7 +146,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html b/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html index 24248056..cde5e1f0 100644 --- a/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html +++ b/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html @@ -101,7 +101,7 @@ // else {return value;} // } }, - {title: '上次修改时间',field: 'updateInfoTime',align: 'center', + {title: '上次更新时间',field: 'updateInfoTime',align: 'center', formatter: function (value, row, index) { if (value){ diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html index f96a1b64..2d79edc5 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html @@ -160,7 +160,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html index 43206e2f..64d6def1 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html @@ -161,7 +161,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html index 359e2f4c..b7a4bbbc 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html @@ -164,7 +164,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html index 1e0a7350..1d495dbe 100644 --- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html +++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html @@ -209,7 +209,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index 73bb22bb..877ac10e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -511,7 +511,7 @@ {title: '录入时间',field: 'createTime',align: 'center', sortable: true, }, - {title: '上次修改时间',field: 'updateTime',align: 'center', + {title: '上次更新时间',field: 'updateTime',align: 'center', formatter: function(value, row, index) { if (value) { diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html index b2835643..82eb730c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html @@ -572,7 +572,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; @@ -607,7 +607,7 @@ {title: '录入时间',field: 'firstAddTime', formatter: function (value, row, index) {if (value == null) {return " ";}else {return value;}} }, - {title: '上次修改时间',field: 'updateInfoTime', + {title: '上次更新时间',field: 'updateInfoTime', formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(','); return vArr[0];}} }, ] diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index d2337c89..8dc5c899 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -279,7 +279,7 @@ {title: '录入时间',field: 'createTime',sortable: true,align: 'center', }, {title: '更新人',field: 'updateBy',align: 'center'}, - { title: '上次修改时间',field: 'updateTime',align: 'center', + { title: '上次更新时间',field: 'updateTime',align: 'center', }, {title: '备注',field: 'remark'}, { diff --git a/ruoyi-admin/src/main/resources/templates/system/item/item.html b/ruoyi-admin/src/main/resources/templates/system/item/item.html index beb1fca0..8219bc8a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/item/item.html +++ b/ruoyi-admin/src/main/resources/templates/system/item/item.html @@ -99,7 +99,7 @@ }, { field: 'updateTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html index 9f2f125c..99e41d68 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html @@ -101,7 +101,7 @@ {field: 'associatedItem',title: '核算数量关联项',visible: false}, {field: 'procedureRemark',title: '工序备注'}, {field: 'createTime',title: '录入时间'}, - {field: 'updateTime', title: '上次修改时间'}, + {field: 'updateTime', title: '上次更新时间'}, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html index fd2a016a..334de092 100644 --- a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -76,7 +76,7 @@ {field: 'standardConversionCost',title: '标准加工费'}, {field: 'actualProcessingCost',title: '财务实际加工费'}, {field: 'createTime',title: '录入时间'}, - {field: 'updateTime',title: '上次修改时间'}, + {field: 'updateTime',title: '上次更新时间'}, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); diff --git a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html index 0a33968e..6c1cb0a2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html +++ b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html @@ -202,7 +202,7 @@ } } }, - {field: 'updateTime',title: '上次修改时间',formatter: function (value, row, index) { + {field: 'updateTime',title: '上次更新时间',formatter: function (value, row, index) { if (value == null) { return " "; } else { diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html index 0ca5de27..d5386e0b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html @@ -210,7 +210,7 @@ { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html index 31b4acd1..09be6cbd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html +++ b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html @@ -100,7 +100,7 @@ }, { field: 'updateTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; From 2fbb33c655c8edab050403deef3155ac2c494c07 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 29 Nov 2024 19:57:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[fix]=20=E5=85=A5=E5=BA=93-=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E3=80=81=E5=85=A5=E5=BA=93-=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93-=E9=80=80=E6=8D=A2=E8=B4=A7?= =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93-=E5=A7=94=E5=A4=96=EF=BC=9B?= =?UTF-8?q?=E6=9A=82=E6=94=B6-=E4=BB=93=E5=BA=93=E3=80=81=E6=9A=82?= =?UTF-8?q?=E6=94=B6-=E9=87=87=E8=B4=AD=E3=80=81=E6=9A=82=E6=94=B6?= =?UTF-8?q?=E3=80=81=E5=A7=94=E5=A4=96=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=92=8C=E5=85=B6=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=83=BD=E5=8A=A0=E4=B8=8A=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=9E=8B=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=9E=8B=E5=92=8C=E7=89=A9=E6=96=99=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E6=96=B9=E5=BC=8F=E9=83=BD=E5=BC=95=E7=94=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/storageOrder/storageMakeDetail.html | 5 +++++ .../warehouse/storageOrder/storageOutOrder.html | 6 ++++++ .../warehouse/storageOrder/storageOutOrderDetail.html | 5 +++++ .../warehouse/storageOrder/storagePurchase.html | 11 +++++++++++ .../warehouse/storageOrder/storagePurchaseDetail.html | 11 +++++++++++ .../storageOrder/storagePurchaseWarehouse.html | 10 ++++++++++ .../storageOrder/storagePurchaseWarehouseDetail.html | 10 ++++++++++ .../storageOrder/storageRefundsExchanges.html | 5 +++++ .../storageOrder/storageRefundsExchangesDetail.html | 4 ++++ .../warehouse/storageOrder/temporaryOutOrder.html | 5 +++++ .../storageOrder/temporaryOutOrderDetail.html | 4 ++++ .../warehouse/storageOrder/temporaryPurchase.html | 4 ++++ .../storageOrder/temporaryPurchaseDetail.html | 4 ++++ .../storageOrder/temporaryPurchaseWarehouse.html | 7 +++++-- .../temporaryPurchaseWarehouseDetail.html | 4 ++++ 15 files changed, 93 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html index 21597d30..1920d9c5 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html @@ -190,6 +190,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html index 02acd434..cb3f88c7 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html @@ -115,6 +115,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -211,6 +212,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html index d7b97f45..bc09630e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html @@ -150,6 +150,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html index ad9847a6..a3bee18f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html @@ -126,6 +126,11 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchase-edit").validate({ focusCleanup: true @@ -233,6 +238,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -258,6 +266,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html index 4ee5f345..1ba829e8 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html @@ -124,6 +124,11 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchase-edit").validate({ focusCleanup: true @@ -230,6 +235,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -255,6 +263,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html index afb90a21..8b6fe56c 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html @@ -124,6 +124,10 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchaseWarehouse-edit").validate({ focusCleanup: true @@ -231,6 +235,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -256,6 +263,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html index 14aa1c04..01502a37 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html @@ -124,6 +124,10 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ focusCleanup: true @@ -229,6 +233,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -254,6 +261,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html index cae94a8c..d27bdf4b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html @@ -123,6 +123,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -218,6 +219,10 @@ title: '图片', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', field: 'materialDescribe', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html index c1d2cd23..d87c3f0b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html @@ -213,6 +213,10 @@ title: '物料图片地址', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', field: 'materialDescribe', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html index a5b58e41..08e90f5e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html @@ -117,6 +117,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -204,6 +205,10 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html index ed76f722..f7d68936 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html @@ -145,6 +145,10 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html index d129f157..66c1ea0e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html @@ -128,6 +128,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -232,6 +233,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html index bf17f661..6a701c71 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html @@ -128,6 +128,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -231,6 +232,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html index 6fb67c11..189f1543 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html @@ -122,9 +122,9 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] - var processMethodDatas = [[${@dict.getType('processMethod')}]]; - var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -226,6 +226,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html index b4be4347..f2b20c47 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html @@ -126,6 +126,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -228,6 +229,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', From 349eb88ab2b1d73c18671629ad1ee820781fe7d8 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 2 Dec 2024 09:41:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E4=B8=8A=E6=9F=A5=E6=89=BE=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95BOM?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=99=E4=B8=AA=E8=B7=AF=E5=BE=84=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/controller/SysMakeorderBomController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java index fce8a090..d8522489 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java @@ -181,7 +181,7 @@ public class SysMakeorderBomController extends BaseController mmap.put("makeorderBom", makeorderBom); mmap.put("curIndex", curIndex); mmap.put("makeNo", makeNo); - return "/system/makeorder/editMakeOrderBom"; + return "system/makeorder/editMakeOrderBom"; } /** * 删除生产订单BOM信息