From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..a6931c2 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -30,7 +30,23 @@
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ // AGV涓嬪彂鐨勫嚭搴撲换鍔�
+ @ApiModelProperty(value= "AGV涓嬪彂鐨勫嚭搴撲换鍔�")
+ @TableField("Pdc_type")
+ private String PdcType;
+
+ @ApiModelProperty(value= "1:浠诲姟AGV鍏ュ簱绔欑偣瑙ｇ粦")
+ @TableField("ctn_kind")
+ private Integer ctnKind;
+
+ /**
+ * inv_wh
+ * 鎷ｆ枡鍥炲簱杈撻�佺嚎鍑哄彂
+ * 0绛夊緟agv鏀捐揣瀹屾垚
+ * 1绛夊緟杈撻�佺嚎鍏ュ簱
+ * 2杈撻�佺嚎鍏ュ簱浠诲姟涓嬪彂鎴愬姛
+ */
+ @ApiModelProperty(value= "鎷ｆ枡鍥炲簱杈撻�佺嚎鍏ュ簱瑙﹀彂")
@TableField("inv_wh")
private String invWh;
@@ -46,6 +62,7 @@
/**
* 宸ヤ綔鐘舵��
+ * 30:绛夊緟agv鍙栬揣
*/
@ApiModelProperty(value= "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
@@ -111,6 +128,10 @@
@ApiModelProperty(value= "")
@TableField("loc_sts")
private String locSts;
+
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ @TableField("pause_mk")
+ private String pauseMk;
/**
* 鎷ｆ枡
@@ -243,9 +264,7 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
- @TableField("pause_mk")
- private String pauseMk;
+
@ApiModelProperty(value= "")
@TableField("error_time")
@@ -254,10 +273,6 @@
@ApiModelProperty(value= "")
@TableField("error_memo")
private String errorMemo;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_kind")
- private Integer ctnKind;
@ApiModelProperty(value= "")
@TableField("manu_type")
@@ -290,11 +305,6 @@
*/
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
-
- // Y:閿�鍞鍗曞嚭搴撲换鍔�
- @ApiModelProperty(value= "")
- @TableField("Pdc_type")
- private String PdcType;
@ApiModelProperty(value= "")
@TableField("ctn_no")
--
Gitblit v1.9.1