Merge remote-tracking branch 'origin/dev' into dev

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;
 

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<SysFieldDifferent> compare = FieldCompareUtil.compare(ErpMaterial.class, erpMaterial, oldErpMaterial);
         if (!CollectionUtils.isEmpty(compare)){

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:[]