From 1664adb595a7539325f46a85ee7e80e4023e4302 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 14:15:31 +0800
Subject: [PATCH] *分拣流程orderNo由唯一降级为不唯一
---
src/main/java/com/zy/asrs/entity/BasArmMast.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 217acfc..8b94834 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;
@@ -130,7 +130,7 @@
public BasArmMast(TaskArmReportParam param) {
this.orderNo = param.getOrderNo();
this.sku = param.getSku();
- this.matnr = param.getSku();
+ this.matnr = param.getItem();
this.po = param.getPo();
this.upc = param.getUpc();
this.supplier = param.getSupplier();
@@ -180,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