From 3d00d9dd9b444c152b08b48fde0b4dd6a0dfa4b2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 10:32:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/BasArmMast.java | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 46b0e92..79f3d7b 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -20,13 +20,13 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏈烘鑷傜紪鍙�
*/
@ApiModelProperty(value= "鏈烘鑷傜紪鍙�")
- @TableId(value = "arm_no", type = IdType.INPUT)
@TableField("arm_no")
private Integer armNo;
@@ -48,7 +48,6 @@
* 璧风偣
*/
@ApiModelProperty(value= "璧风偣")
- @TableId(value = "sorting_line", type = IdType.INPUT)
@TableField("sorting_line")
private Integer sortingLine;
@@ -57,7 +56,7 @@
*/
@ApiModelProperty(value= "缁戝畾鏍囪")
@TableField("binding_tags")
- private Integer bindingTags;
+ private Long bindingTags;
/**
* 浼樺厛绾�
@@ -71,16 +70,16 @@
@ApiModelProperty(value= "鐘舵��")
private Integer status;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "matnr")
private String matnr;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "po")
private String po;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "upc")
private String upc;
/**
@@ -89,7 +88,7 @@
@ApiModelProperty(value= "璐ф簮")
private String supplier;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "璁㈠崟鍙�")
@TableField("order_no")
private String orderNo;
@@ -103,7 +102,7 @@
* 鏃堕棿鎴�
*/
@ApiModelProperty(value= "鏃堕棿鎴�")
- @TableId(value = "createTime", type = IdType.INPUT)
+ @TableField("create_time")
private Long createTime;
/**
@@ -120,18 +119,27 @@
@TableField("arm_msg")
private String armMsg;
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @TableField("barcode")
+ private String barcode;
+
public BasArmMast() {}
public BasArmMast(TaskArmReportParam param) {
this.orderNo = param.getOrderNo();
this.sku = param.getSku();
+ this.matnr = param.getSku();
this.po = param.getPo();
this.upc = param.getUpc();
this.supplier = param.getSupplier();
this.createTime = param.getCreateTime();
- this.sortingLine = Integer.getInteger(param.getStaNo());
+ this.bindingTags = param.getBindingTags();
+ this.sortingLine = Integer.parseInt(param.getStaNo());;
}
- public BasArmMast(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Integer bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
+ public BasArmMast(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Long bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
this.armNo = armNo;
this.armDirection = armDirection;
this.staNo = staNo;
@@ -172,4 +180,25 @@
// );
+ public String getStatus$() {
+ if (Cools.isEmpty(status)) {return "鏈煡寮傚父";}
+ switch (status){
+ case 0:
+ return "0.绛夊緟涓嬪彂鑷虫満姊拌噦";
+ case 1:
+ return "1.鏈烘鑷備綔涓氫腑";
+ case 2:
+ return "2.鍗曠爜瀹屾垚绛夊緟鎵樼洏瀹屾垚";
+ case 3:
+ return "3.鑷姩缁勬墭涓�";
+ case 4:
+ return "4.鑷姩缁勬墭鎴愬姛";
+ case 5:
+ return "5.绛夊緟鏈烘鑷傝鍗曞畬鎴�";
+ case 6:
+ return "6.瀹岀粨";
+ default:
+ return "鏈煡寮傚父";
+ }
+ }
}
--
Gitblit v1.9.1