From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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 bcf2089..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;
/**
* 鏁伴噺
@@ -194,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