From d3d9a620f39292b61d85087970d9dc81b6369d4c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 07 三月 2025 16:29:46 +0800
Subject: [PATCH] # 新增 1. 新增ASN单据 2. 新增ASN明细单据
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 7e6e58b..e2bb486 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
@@ -6,6 +6,7 @@
import java.util.Date;
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 org.springframework.format.annotation.DateTimeFormat;
@@ -55,6 +56,9 @@
*/
@ApiModelProperty(value= "璐т富ID")
private Long shipperId;
+
+// @ApiModelProperty(value = "璐т富缂栫爜")
+// private String shipperCode;
/**
* 鍒嗙粍ID(*)
@@ -327,10 +331,10 @@
// );
public String getShipperId$(){
- ShipperService service = SpringUtils.getBean(ShipperService.class);
- Shipper shipper = service.getById(this.shipperId);
- if (!Cools.isEmpty(shipper)){
- return String.valueOf(shipper.getName());
+ CompanysService service = SpringUtils.getBean(CompanysService.class);
+ Companys companys = service.getById(this.shipperId);
+ if (!Cools.isEmpty(companys)){
+ return String.valueOf(companys.getName());
}
return null;
}
@@ -344,7 +348,7 @@
return null;
}
- public String getRglarId(){
+ public String getRglarId$(){
BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
BatchRegular batchRegular = service.getById(this.rglarId);
if (!Cools.isEmpty(batchRegular)){
--
Gitblit v1.9.1