From a2ef34a807b1f88ac9b18dae51adbf61ce821595 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:31:40 +0800
Subject: [PATCH] RCS对接优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
index a7103f5..e09b83d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakin.java
@@ -3,11 +3,19 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,8 +28,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
+@Accessors(chain = true)
@TableName("man_wait_pakin")
public class WaitPakin implements Serializable {
@@ -41,21 +51,9 @@
private String code;
/**
- * 璁㈠崟ID
+ * 鏂欑鐮�
*/
- @ApiModelProperty(value= "璁㈠崟ID")
- private Long ansId;
-
- /**
- * 璁㈠崟缂栫爜
- */
- @ApiModelProperty(value= "璁㈠崟缂栫爜")
- private String asnCode;
-
- /**
- * 瀹瑰櫒鐮�
- */
- @ApiModelProperty(value= "瀹瑰櫒鐮�")
+ @ApiModelProperty(value= "鏂欑鐮�")
private String barcode;
/**
@@ -69,6 +67,12 @@
*/
@ApiModelProperty(value= "缁勬嫋鐘舵�� 0: 寰呭叆搴� 1: 鍏ュ簱涓� ")
private Short ioStatus;
+
+ /**
+ * 鏄惁涓嶈壇鍝�
+ */
+ @ApiModelProperty("鏄惁涓嶈壇鍝�")
+ private Short flagDefect;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -100,6 +104,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;
/**
@@ -113,6 +118,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;
/**
@@ -121,12 +127,17 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍏宠仈鐨勫叆搴撻�氱煡鍗曞彿锛堝涓敤閫楀彿鍒嗛殧锛夛紝浠呮煡璇㈠睍绀虹敤锛屼笉钀藉簱
+ */
+ @ApiModelProperty(value = "鍏宠仈鐨勫叆搴撻�氱煡鍗曞彿锛屽涓敤閫楀彿鍒嗛殧")
+ @TableField(exist = false)
+ private String asnCodes;
+
public WaitPakin() {}
- public WaitPakin(String code,Long ansId,String asnCode,String barcode,Double anfme,Short ioStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public WaitPakin(String code,String barcode,Double anfme,Short ioStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.code = code;
- this.ansId = ansId;
- this.asnCode = asnCode;
this.barcode = barcode;
this.anfme = anfme;
this.ioStatus = ioStatus;
@@ -144,7 +155,7 @@
// null, // 缂栫爜
// null, // 璁㈠崟ID
// null, // 璁㈠崟缂栫爜
-// null, // 瀹瑰櫒鐮�
+// null, // 鏂欑鐮�
// null, // 缁勬嫋鏁伴噺
// null, // 缁勬嫋鐘舵��
// null, // 鐘舵�乕闈炵┖]
@@ -158,15 +169,17 @@
// );
public String getIoStatus$(){
- if (null == this.ioStatus){ return null; }
- switch (this.ioStatus){
- case 0:
- return "寰呭叆搴�";
- case 1:
- return " 鍏ュ簱涓�";
- default:
- return String.valueOf(this.ioStatus);
+ if (Cools.isEmpty(this.ioStatus)){
+ return "";
}
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_ORDER_IN_STATUS)
+ .eq(DictData::getValue, this.ioStatus));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
}
public String getStatus$(){
--
Gitblit v1.9.1