From 08c24a5530f6e5a9675a1cfcab22b24848adceec Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 21 十月 2025 08:44:50 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 233 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 151 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 6f7f9aa..6da8e74 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -16,96 +16,114 @@
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ private String zpallet;
- /**
- * 鐗╂枡
- */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("loc_no")
+ private String locNo;
+
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
- /**
- * 鐗╂枡鎻忚堪
- */
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
- /**
- * 鎵瑰彿
- */
@ApiModelProperty(value= "鎵瑰彿")
private String batch;
- /**
- * 鍗曟嵁缂栧彿
- */
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
-
- /**
- * 浠撳簱鍙�
- */
@ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
+ private String specs;
- /**
- * 浠撳簱鍙�
- */
@ApiModelProperty(value= "鍨嬪彿")
- private String type;
+ private String model;
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value= "棰滆壊")
private String color;
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String supplier;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String warehouse;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value= "鍝佺墝")
private String brand;
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鍗曚綅
- */
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
- /**
- * 鎵樼洏鏉＄爜
- */
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value= "鍗曚环")
+ private Double price;
- /**
- * 鐢ㄦ埛ID
- */
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String bname;
+ @ApiModelProperty(value= "sku")
+ private String sku;
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("loc_no")
- private Date locNo;
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ private Double units;
+
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ @ApiModelProperty(value= "浜у湴")
+ private String origin;
+
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ @ApiModelProperty(value= "閲嶉噺")
+ private Double weight;
+
+ @ApiModelProperty(value= "闀垮害")
+ private Double length;
+
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supp;
+
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
@ApiModelProperty(value= "鐘舵��")
private String status;
@@ -114,40 +132,91 @@
@TableField("io_status")
private String ioStatus;
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- /**
- * 鍒涘缓鑰�
- */
@ApiModelProperty(value= "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ @TableField("out_order_no")
+ private String outOrderNo;
+
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("pg_no")
+ private String sPgNO;
+
+
+
+
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
--
Gitblit v1.9.1