From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:07:35 +0800
Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index c697ea4..f9e7fa6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -5,10 +5,13 @@
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.server.manager.service.BatchRegularService;
 import com.vincent.rsf.server.manager.service.CompanysService;
 import com.vincent.rsf.server.manager.service.MatnrGroupService;
 import com.vincent.rsf.server.manager.service.ShipperService;
+import com.vincent.rsf.server.system.entity.SerialRule;
+import com.vincent.rsf.server.system.service.SerialRuleService;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
@@ -43,19 +46,19 @@
     /**
      * 鍚嶇О
      */
-    @ApiModelProperty(value= "鍚嶇О")
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
     private String name;
 
     /**
      * 缂栫爜
      */
-    @ApiModelProperty(value= "缂栫爜")
+    @ApiModelProperty(value= "鐗╂枡缂栫爜")
     private String code;
 
     /**
      * 璐т富ID
      */
-    @ApiModelProperty(value= "璐т富ID")
+    @ApiModelProperty(value= "璐т富鏍囪瘑")
     private Long shipperId;
 
 //    @ApiModelProperty(value = "璐т富缂栫爜")
@@ -64,7 +67,7 @@
     /**
      * 鍒嗙粍ID(*)
      */
-    @ApiModelProperty(value= "鍒嗙粍ID(*)")
+    @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
     private Long groupId;
 
     /**
@@ -82,7 +85,7 @@
     /**
      * 瑙勫垯浠ｇ爜
      */
-    @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+    @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
     private Long rglarId;
 
     /**
@@ -118,7 +121,7 @@
     /**
      * 闀�*瀹�*楂�(m)
      */
-    @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+    @ApiModelProperty(value= "灏哄(m)")
     private String size;
 
     /**
@@ -221,7 +224,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
@@ -245,6 +247,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -258,6 +261,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -360,19 +364,18 @@
         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;
     }
-
-    public String getRglarId$(){
-        BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
-        BatchRegular batchRegular = service.getById(this.rglarId);
-        if (!Cools.isEmpty(batchRegular)){
-            return String.valueOf(batchRegular.getCode());
-        }
-        return null;
-    }
+//    public String getRglarId$(){
+//        SerialRuleService service = SpringUtils.getBean(SerialRuleService.class);
+//        SerialRule batchRegular = service.getById(this.rglarId);
+//        if (!Cools.isEmpty(batchRegular)){
+//            return String.valueOf(batchRegular.getCode());
+//        }
+//        return null;
+//    }
 
     public String getStockLeval$(){
         if (null == this.stockLevel){ return null; }

--
Gitblit v1.9.1