From 106fd3c353c2eaac2f31b6f56f3285fefe8dc740 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 22 十月 2025 10:50:43 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/BasArmMast.java |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 7b852b6..79f3d7b 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -70,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;
 
     /**
@@ -88,7 +88,7 @@
     @ApiModelProperty(value= "璐ф簮")
     private String supplier;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "璁㈠崟鍙�")
     @TableField("order_no")
     private String orderNo;
 
@@ -118,6 +118,13 @@
     @ApiModelProperty(value= "寮傚父淇℃伅")
     @TableField("arm_msg")
     private String armMsg;
+
+    /**
+     * 寮傚父淇℃伅
+     */
+    @ApiModelProperty(value= "鏉$爜")
+    @TableField("barcode")
+    private String barcode;
 
     public BasArmMast() {}
     public BasArmMast(TaskArmReportParam param) {
@@ -173,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