From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 eca5a1f..d1449e0 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;
/**
* 鏁伴噺
@@ -97,6 +103,9 @@
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
+
+ @ApiModelProperty(value = "鎷ｈ揣鐘舵�侊細0 鏈嫞璐� 1 瀹屾垚鎷ｈ揣 2 锛岄儴鍒嗘嫞璐�")
+ private Integer pickStatus;
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
@@ -191,6 +200,18 @@
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);
Order order = service.getById(this.orderId);
--
Gitblit v1.9.1