From 6a5870843279328c505893b4016b825e480bce77 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sat, 14 Dec 2024 09:49:55 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AF=BC=E5=87=BA=E5=85=A8=E9=83=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=9B=20=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E9=87=87=E7=94=A8=E4=B8=8B=E9=9D=A2=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=AF=BC=E5=87=BA:readConverterExp=20=3D=20"bzjgj=3D?= =?UTF-8?q?=E5=8E=9F=E6=96=99-=E6=A0=87=E5=87=86=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BB=B6=E6=88=96=E7=94=B5=E6=B0=94=E5=85=83=E4=BB=B6,scy=3D?= =?UTF-8?q?=E8=BE=85=E6=96=99-=E7=94=9F=E4=BA=A7=E7=94=A8,fscy=3D=E8=BE=85?= =?UTF-8?q?=E6=96=99-=E9=9D=9E=E7=94=9F=E4=BA=A7=E7=94=A8,dbmcljgj=3D?= =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81-=E5=8A=A0=E5=B7=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=BE=85=E8=A1=A8=E9=9D=A2=E5=A4=84=E7=90=86=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BB=B6,lj=3D=E5=8D=8A=E6=88=90=E5=93=81-?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6,zhj=3D=E5=8D=8A=E6=88=90=E5=93=81-=E7=BB=84?= =?UTF-8?q?=E5=90=88=E4=BB=B6,chcpsb=3D=E6=88=90=E5=93=81-=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87,qtyflswl=3D?= =?UTF-8?q?=E5=85=B6=E4=BB=96/=E7=A0=94=E5=8F=91=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E7=89=A9=E6=96=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/erp/domain/ErpMaterial.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java index 857d0e87..29d35da0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java @@ -31,7 +31,7 @@ public class ErpMaterial extends BaseEntity @Excel(name = "料号",sort = 1) private String materialNo; /** 物料名称 */ - @Excel(name = "物料名称",sort = 4) + @Excel(name = "物料名称",sort = 2) private String materialName; /** 审核状态 0-待审核 1-审核通过 2-审核拒绝*/ @@ -39,9 +39,10 @@ public class ErpMaterial extends BaseEntity /** 使用状态 0-否 1-是 2-已作废*/ private String useStatus; + /** 关联bom */ - @Excel(name = "关联bom号",sort = 2) private String bomNo; + /** 是否有生产团队 */ private String havaProductTem; /**技术团队编号 */ @@ -53,10 +54,10 @@ public class ErpMaterial extends BaseEntity //技术团队利润率 private String itemPR; /** 物料类型 */ + @Excel(name = "物料类型",sort = 3,readConverterExp = "bzjgj=原料-标准结构件或电气元件,scy=辅料-生产用,fscy=辅料-非生产用,dbmcljgj=半成品-加工完成待表面处理的结构件,lj=半成品-零件,zhj=半成品-组合件,chcpsb=成品-成品出货设备,qtyflswl=其他/研发临时物料") private String materialType; /** 物料类型名称 */ - @Excel(name = "物料类型名称",sort = 5) private String materialTypeName; @@ -89,7 +90,9 @@ public class ErpMaterial extends BaseEntity @FieldCompare(chineseName = "入库部门",properties = "0:仓库,1:采购") @Excel(name = "入库部门",sort = 10,dictType = "warehouseDept") private String warehouseDept; - /*工程员*/ + + /**工程员*/ + @Excel(name = "工程员",sort = 11) private String businessMembers; /** 流程实例ID */