From a9256154523a29337641fecab7d2d327e6e7338a Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 26 Dec 2024 10:36:10 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B3=A8=E8=A7=A3=20=E7=89=A9=E6=96=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=88=B0=E5=90=8E=E7=AB=AF=20=E4=BF=AE=E6=94=B9=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E7=AB=AF=E6=A0=B9=E6=8D=AE=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E8=B5=8B=E5=80=BC=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8D=95=E4=BD=8D=E5=92=8C=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=9A=84=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/erp/domain/ErpMaterial.java       | 4 ++--
 .../com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java    | 4 ++++
 .../src/main/resources/templates/erp/material/edit.html       | 1 +
 3 files changed, 7 insertions(+), 2 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 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<SysFieldDifferent> 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:[]