From 6ea39c790edb8a59b1637d18383a14019985d2ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 12 十二月 2025 11:21:47 +0800
Subject: [PATCH] bug修复 组托上架功能优化
---
src/main/java/com/zy/asrs/entity/BasStationDetl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasStationDetl.java b/src/main/java/com/zy/asrs/entity/BasStationDetl.java
index 6227d0d..c9d117b 100644
--- a/src/main/java/com/zy/asrs/entity/BasStationDetl.java
+++ b/src/main/java/com/zy/asrs/entity/BasStationDetl.java
@@ -1,13 +1,17 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.MatService;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -22,6 +26,7 @@
@Data
@TableName("agv_bas_station_detl")
+@Accessors(chain = true)
public class BasStationDetl implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,13 +40,16 @@
*/
@ApiModelProperty(value= "绔欑偣缂栫爜")
@TableField("dev_no")
- private Integer devNo;
+ private String devNo;
/**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
+
+ @ApiModelProperty("鎵ц涓暟閲�")
+ private Double workQty;
/**
* 鎵樼洏鏉＄爜
@@ -302,7 +310,7 @@
public BasStationDetl() {}
- public BasStationDetl(Long id,Integer devNo,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
+ public BasStationDetl(Long id,String devNo,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
this.id = id;
this.devNo = devNo;
this.anfme = anfme;
@@ -438,6 +446,15 @@
}
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getDanger$(){
if (null == this.danger){ return null; }
switch (this.danger){
--
Gitblit v1.9.1