From aeb30d72af3efcaf2e92c449f3927a31c3348dc9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 12 三月 2025 16:06:16 +0800
Subject: [PATCH] #新增 1. 新增ASN订单导入功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..d127f14 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,8 +6,10 @@
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 lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -26,6 +28,7 @@
@Data
@TableName("man_matnr")
+@Accessors(chain = true)
@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
public class Matnr implements Serializable {
@@ -56,11 +59,20 @@
@ApiModelProperty(value= "璐т富ID")
private Long shipperId;
+// @ApiModelProperty(value = "璐т富缂栫爜")
+// private String shipperCode;
+
/**
* 鍒嗙粍ID(*)
*/
@ApiModelProperty(value= "鍒嗙粍ID(*)")
private Long groupId;
+
+ /**
+ * 鍒嗙粍鍔╄鐮�
+ */
+ @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+ private String groupCode;
/**
* 瑙勫垯浠ｇ爜
@@ -72,7 +84,7 @@
* ERP缂栫爜
*/
@ApiModelProperty(value= "ERP缂栫爜")
- private String erpCode;
+ private String platCode;
/**
* 瑙勬牸
@@ -254,13 +266,13 @@
public Matnr() {}
- public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String platCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.name = name;
this.code = code;
this.shipperId = shipperId;
this.groupId = groupId;
this.rglarId = rglarId;
- this.erpCode = erpCode;
+ this.platCode = platCode;
this.spec = spec;
this.model = model;
this.weight = weight;
@@ -327,10 +339,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 +356,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