From 7925e2cfcdcb39e9ac6793edd5362bbe369def5c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 22 五月 2025 17:39:46 +0800
Subject: [PATCH] 保存拣料入库流水
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index 3dfa6cf..dd072f1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.*;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -25,7 +27,6 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
-import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -79,6 +80,25 @@
*/
@ApiModelProperty(value= "鐗╂枡ID")
private Long matnrId;
+
+ /**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
+ @ApiModelProperty("鍑哄簱鏁伴噺")
+ @TableField(exist = false)
+ private Double outQty;
/**
* 鐗╂枡鍚嶇О
@@ -147,6 +167,10 @@
*/
@ApiModelProperty(value= "瀛楁绱㈠紩")
private String fieldsIndex;
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -267,6 +291,18 @@
// null // 澶囨敞
// );
+ public String getWareArea(){
+ if (Cools.isEmpty(this.locId)){
+ return "";
+ }
+ LocService locService = SpringUtils.getBean(LocService.class);
+ Loc loc = locService.getById(this.locId);
+ if (Objects.isNull(loc)) {
+ return null;
+ }
+ return loc.getAreaId$();
+ }
+
public String getType$(){
if (Cools.isEmpty(this.type)){
return "";
--
Gitblit v1.9.1