From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index d497908..efe6155 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wms.asrs.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
@@ -19,9 +20,6 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -55,6 +53,14 @@
*/
@ApiModelProperty(value= "璁㈠崟缂栧彿")
private String orderNo;
+
+ @ApiModelProperty("鍗曟嵁绫诲瀷")
+ @TableField(exist = false)
+ private Integer orderType;
+
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ @TableField(exist = false)
+ private String maktx;
/**
* 鏁伴噺
@@ -98,6 +104,9 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
+ @ApiModelProperty(value = "鎷ｈ揣鐘舵�侊細0 鏈嫞璐� 1 瀹屾垚鎷ｈ揣 2 锛岄儴鍒嗘嫞璐�")
+ private Integer pickStatus;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@@ -135,6 +144,12 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty("浼樺厛绾�")
+ private Integer sorted;
+
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Integer wareType;
/**
* 鍟嗗搧搴撳瓨绱㈠紩
@@ -184,12 +199,24 @@
public Double getWaitQty(){
Double qty = 0D;
WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);
- List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));
+ List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));
for (WaitPakin waitPakin : waitPakins) {
qty += waitPakin.getAnfme();
}
return qty;
}
+
+ public String getOrderType$() {
+ if (orderType == null) {return null;}
+ if (orderType == 1) {
+ return OrderType.UTC_IN_ORDER.desc;
+ } else if (orderType == 2) {
+ return OrderType.UTC_OUT_ORDER.desc;
+ } else {
+ return OrderType.PK_IN_ORDER.desc;
+ }
+ }
+
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
@@ -209,6 +236,17 @@
return null;
}
+ public String getWareType$(){
+ if (wareType == null) {return null;}
+ if (wareType == 1) {
+ return "绔嬪簱";
+ } else if (wareType == 2) {
+ return "骞冲簱";
+ } else {
+ return "绔嬪簱/骞冲簱";
+ }
+ }
+
public String getMatId$(){
MatService service = SpringUtils.getBean(MatService.class);
Mat mat = service.getById(this.matId);
--
Gitblit v1.9.1