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 | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 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 99d544c..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
@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.annotation.*;
import java.text.SimpleDateFormat;
-import java.util.Date;
+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;
import java.util.Date;
@@ -23,10 +27,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
@Data
@TableName("man_matnr")
+@Accessors(chain = true)
@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
public class Matnr implements Serializable {
@@ -42,38 +46,53 @@
/**
* 鍚嶇О
*/
- @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 = "璐т富缂栫爜")
+// private String shipperCode;
/**
* 鍒嗙粍ID(*)
*/
- @ApiModelProperty(value= "鍒嗙粍ID(*)")
+ @ApiModelProperty(value= "鐗╂枡鍒嗙粍(*)")
private Long groupId;
+
+ /**
+ * 瀛楁鏍囪瘑
+ */
+ @ApiModelProperty(value = "瀛楁鏍囪瘑")
+ private String fieldsIndex;
+
+ /**
+ * 鍒嗙粍鍔╄鐮�
+ */
+ @ApiModelProperty(value = "鍒嗙粍鍔╄鐮�")
+ private String groupCode;
/**
* 瑙勫垯浠ｇ爜
*/
- @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
+ @ApiModelProperty(value= "鎵规瑙勫垯鏍囪瘑")
private Long rglarId;
/**
* ERP缂栫爜
*/
@ApiModelProperty(value= "ERP缂栫爜")
- private String erpCode;
+ private String platCode;
/**
* 瑙勬牸
@@ -102,7 +121,7 @@
/**
* 闀�*瀹�*楂�(m)
*/
- @ApiModelProperty(value= "闀�*瀹�*楂�(m)")
+ @ApiModelProperty(value= "灏哄(m)")
private String size;
/**
@@ -205,8 +224,11 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
+
+ @ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
/**
* 绉熸埛
@@ -225,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;
/**
@@ -238,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;
/**
@@ -255,13 +279,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;
@@ -340,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; }
@@ -368,7 +391,7 @@
}
}
- public String getIsLabelMange$(){
+ public String getFlagLabelMange$(){
if (null == this.flagLabelMange){ return null; }
switch (this.flagLabelMange){
case 0:
--
Gitblit v1.9.1