From e98e114ff8765ca1ffbd6dda167e35d18b72f5d4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 16:34:07 +0800
Subject: [PATCH] 代码优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
index e7363d0..98f25fe 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocAreaMatRela.java
@@ -45,6 +45,12 @@
     private Long areaId;
 
     /**
+     * 涓诲崟ID
+     */
+    @ApiModelProperty("涓诲崟ID")
+    private Long areaMatId;
+
+    /**
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
@@ -165,7 +171,7 @@
         WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
         WarehouseAreas warehouseAreas = service.getById(this.areaId);
         if (!Cools.isEmpty(warehouseAreas)){
-            return String.valueOf(warehouseAreas.getCode());
+            return String.valueOf(warehouseAreas.getName());
         }
         return null;
     }
@@ -174,7 +180,7 @@
         MatnrService service = SpringUtils.getBean(MatnrService.class);
         Matnr matnr = service.getById(this.matnrId);
         if (!Cools.isEmpty(matnr)){
-            return String.valueOf(matnr.getUnit());
+            return String.valueOf(matnr.getName());
         }
         return null;
     }
@@ -183,7 +189,7 @@
         MatnrGroupService service = SpringUtils.getBean(MatnrGroupService.class);
         MatnrGroup matnrGroup = service.getById(this.groupId);
         if (!Cools.isEmpty(matnrGroup)){
-            return String.valueOf(matnrGroup.getCode());
+            return String.valueOf(matnrGroup.getName());
         }
         return null;
     }
@@ -201,7 +207,7 @@
         LocService service = SpringUtils.getBean(LocService.class);
         Loc loc = service.getById(this.locId);
         if (!Cools.isEmpty(loc)){
-            return String.valueOf(loc.getWarehouseId());
+            return String.valueOf(loc.getCode());
         }
         return null;
     }

--
Gitblit v1.9.1