From 5b00928c8570a3ba21a1170b4642ef88635d90da Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 21 四月 2026 22:45:22 +0800
Subject: [PATCH] 1.对入库拍照功能解耦
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 0d62697..c58c883 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -13,6 +13,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -112,6 +113,18 @@
@TableField("loc_sts")
private String locSts;
+ @ApiModelProperty(value= "涓氬姟鍗曞彿")
+ @TableField("user_no")
+ private String userNo;
+
+ @ApiModelProperty(value= "鍑哄簱椤哄簭")
+ @TableField("plt_type")
+ private Integer pltType;
+
+ @ApiModelProperty(value= "鍑哄簱鎵规搴忓彿")
+ @TableField("batch_seq")
+ private String batchSeq;
+
/**
* 鎷ｆ枡
*/
@@ -137,9 +150,6 @@
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
- @TableField("plt_type")
- private Integer pltType;
/**
* 绌烘澘
@@ -170,10 +180,6 @@
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
- @TableField("user_no")
- private String userNo;
-
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
@@ -203,6 +209,10 @@
@ApiModelProperty(value= "")
@TableField("exp_time")
private Double expTime;
+
+ @ApiModelProperty(value= "鑰楁椂(鍒嗛挓)")
+ @TableField("cost_time")
+ private Integer costTime;
@ApiModelProperty(value= "")
@TableField("ref_wrkno")
@@ -271,7 +281,7 @@
@ApiModelProperty(value= "")
@TableField("sc_weight")
- private Double scWeight;
+ private BigDecimal scWeight;
@ApiModelProperty(value= "")
@TableField("log_mk")
@@ -291,11 +301,35 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- // Y:閿�鍞鍗曞嚭搴撲换鍔�
+ // ERP鍑哄簱纭鏍囪锛歒 鍏佽涓嬪彂WCS锛孨/绌� 涓嶅厑璁�
@ApiModelProperty(value= "")
@TableField("Pdc_type")
private String PdcType;
+ @ApiModelProperty(value= "闆嗚绠卞彿")
+ @TableField("container_no")
+ private String containerNo;
+
+ @ApiModelProperty(value= "TEU")
+ @TableField("teu")
+ private Integer teu;
+
+ @ApiModelProperty(value= "杞︾墝鍙�")
+ @TableField("plate_no")
+ private String plateNo;
+
+ @ApiModelProperty(value= "杞︽鍙�")
+ @TableField("train_no")
+ private String trainNo;
+
+ @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+ @TableField("freq_type")
+ private Integer freqType;
+
+ @ApiModelProperty(value= "绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背")
+ @TableField("cube_number")
+ private Double cubeNumber;
+
@ApiModelProperty(value= "")
@TableField("ctn_no")
private String ctnNo;
--
Gitblit v1.9.1