From 4fb06a58ed5df46f29af1e9fa65cfd40335263ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 18 一月 2025 17:06:18 +0800
Subject: [PATCH] # 6. 大屏添加作业类型 (全盘，还是分拣 IOType) 10.平库出库时，当前平库ID是写死在Sql里，需修改 11.平库出库没有判断是否预约出库，且生成拣货单时没有锁定库存,需确认是否考虑回库问题 26. 已拣过货的任务明细，可以再次拣货，拣货明细需添加一个拣货状态 47. 确认发货前，需判断是否已绑定至集货区 48. CTU出库后，库位103不再删除原有库位信息
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index d220b0a..4e8c095 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -5,10 +5,12 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.asrs.service.OrderSettleService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
+import io.swagger.models.auth.In;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -48,6 +50,8 @@
* 鍗曟嵁鏃ユ湡
*/
@ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private String orderTime;
/**
@@ -138,6 +142,23 @@
@ApiModelProperty(value= "鏄惁鐢熸垚娉㈡ 1: 鏄� 0: 鍚� ")
private Integer hasWave;
+ /**
+ * 璁㈠崟鐘舵��
+ * 1. 宸插畬鎴�
+ * 0. 鏈畬鎴�
+ * 2. 閮ㄥ垎瀹屾垚
+ */
+ @TableField(exist = false)
+ private String orderStatus;
+
+ /**
+ * 璁㈠崟鐘舵��
+ * 1. 宸插畬鎴�
+ * 0. 鏈畬鎴�
+ * 2. 閮ㄥ垎瀹屾垚
+ */
+ private Integer pickStatus;
+
public Order() {}
public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
--
Gitblit v1.9.1