From 5c0ac8adccb4d895148ee32ca7afc9a07d50e635 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 18:47:13 +0800
Subject: [PATCH] 添加作业临时库存表 优化拣料出库作业
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index eabc9ad..52630a8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -1,19 +1,21 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+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.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -53,6 +55,9 @@
@ApiModelProperty("缁勬嫋鏄庣粏ID")
private Long source;
+ @ApiModelProperty("璐ㄦ缁撴灉")
+ private Short isptResult;
+
/**
* 璁㈠崟ID
*/
@@ -76,6 +81,18 @@
*/
@ApiModelProperty("鐗╂枡璺熻釜鐮�")
private String trackCode;
+
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
/**
* 鐗╂枡鍚嶇О
@@ -163,6 +180,9 @@
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
/**
* 淇敼浜哄憳
*/
@@ -264,6 +284,20 @@
return null;
}
+ public String getIsptResult$(){
+ if (Cools.isEmpty(this.isptResult)){
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+ .eq(DictData::getValue, this.isptResult));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
--
Gitblit v1.9.1