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/BasArmMastLog.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMastLog.java b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
index ad60b39..b4c45c8 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
@@ -1,5 +1,7 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -52,7 +55,7 @@
*/
@ApiModelProperty(value= "缁戝畾鏍囪")
@TableField("binding_tags")
- private Integer bindingTags;
+ private Long bindingTags;
/**
* 浼樺厛绾�
@@ -98,6 +101,7 @@
* 鏃堕棿鎴�
*/
@ApiModelProperty(value= "鏃堕棿鎴�")
+ @TableField("create_time")
private Long createTime;
/**
@@ -114,9 +118,16 @@
@TableField("arm_msg")
private String armMsg;
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @TableField("barcode")
+ private String barcode;
+
public BasArmMastLog() {}
- public BasArmMastLog(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 BasArmMastLog(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;
@@ -134,6 +145,26 @@
this.createTime = createTime;
this.armError = armError;
this.armMsg = armMsg;
+ }
+ public BasArmMastLog(BasArmMast basArmMast) {
+ this.armNo = basArmMast.getArmNo();
+ this.armDirection = basArmMast.getArmDirection();
+ this.staNo = basArmMast.getStaNo();
+ this.sortingLine = basArmMast.getSortingLine();
+ this.bindingTags = basArmMast.getBindingTags();
+ this.priority = basArmMast.getPriority();
+ this.status = basArmMast.getStatus();
+ this.matnr = basArmMast.getMatnr();
+ this.sku = basArmMast.getSku();
+ this.po = basArmMast.getPo();
+ this.upc = basArmMast.getUpc();
+ this.supplier = basArmMast.getSupplier();
+ this.orderNo = basArmMast.getOrderNo();
+ this.ctns = basArmMast.getCtns();
+ this.createTime = basArmMast.getCreateTime();
+ this.armError = basArmMast.getArmError();
+ this.armMsg = basArmMast.getArmMsg();
+ this.barcode = basArmMast.getBarcode();
}
// BasArmMastLog basArmMastLog = new BasArmMastLog(
@@ -157,4 +188,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