From e5b103f1bfa812b82c4663ecce9cb3e57b5c6679 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 16 Dec 2024 13:32:14 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20Bo?= =?UTF-8?q?m=E5=AF=BC=E5=85=A5=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java | 3 +-- .../java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java index e96d5c49..258526ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java @@ -67,8 +67,7 @@ public class ErpBom extends BaseEntity private String warehouseDept; - /* - * 文件编号*/ + /** 文件编号*/ @Excel(name = "文件编号",sort = 14) private String fileCode; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java index 4c2cc0d3..43adef35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java @@ -725,6 +725,7 @@ private ISysAttachService attachService; fatherBom.setMaterialName(erpMaterialVo.getMaterialName()); fatherBom.setMaterialType(erpMaterialVo.getMaterialType()); fatherBom.setProcessMethod(erpMaterialVo.getProcessMethod()); + fatherBom.setFileCode(erpMaterialVo.getFileCode()); fatherBom.setUnit(erpMaterialVo.getUnit()); fatherBom.setBrand(erpMaterialVo.getBrand()); fatherBom.setDescribe(erpMaterialVo.getDescribe()); @@ -754,6 +755,7 @@ private ISysAttachService attachService; subBom.setBrand(erpMaterialVo.getBrand()); subBom.setDescribe(erpMaterialVo.getDescribe()); subBom.setWarehouseDept(erpMaterialVo.getWarehouseDept()); + subBom.setFileCode(erpMaterialVo.getFileCode()); subBom.setUseNum(useNum); subBom.setLossRate(String.valueOf(lossRate)); subBom.setParentId(parentId);