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 1c6681d2..e628195e 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 @@ -95,8 +95,8 @@ public class ErpMaterial extends BaseEntity @Excel(name = "工程员",sort = 11) private String businessMembers; - /* - * 文件编号*/ + /** 文件编号*/ + @FieldCompare(chineseName = "文件编号") @Excel(name = "文件编号",sort = 12) private String fileCode; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index bdab86fe..0a8e99b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -466,6 +466,10 @@ public class ErpMaterialServiceImpl implements IErpMaterialService } ErpMaterial oldErpMaterial = erpMaterialMapper.selectErpMaterialById(id); + if ("0".equals(oldErpMaterial.getAuditStatus())){ + erpMaterial.setUnit(oldErpMaterial.getUnit()); + erpMaterial.setWarehouseDept(oldErpMaterial.getWarehouseDept()); + } //修改数据日记修改记录表 List compare = FieldCompareUtil.compare(ErpMaterial.class, erpMaterial, oldErpMaterial); if (!CollectionUtils.isEmpty(compare)){ diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html index eda59f89..310cd7d0 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html @@ -438,6 +438,7 @@ brand: erpMaterialData.brand, describe: erpMaterialData.describe, warehouseDept: erpMaterialData.warehouseDept, + fileCode: erpMaterialData.fileCode, businessMembers: erpMaterialData.businessMembers, fileIdStr: erpMaterialData.fileIdStr, processList:[]