From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..4bae423 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,6 +36,9 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩紪鐮�
+ * */
@ApiModelProperty(value= "鎵瑰彿")
private String batch;
@@ -43,19 +49,25 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭壒娆�
+ * */
@ApiModelProperty(value= "鍨嬪彿")
private String model;
@ApiModelProperty(value= "棰滆壊")
private String color;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩被鍨�
+ * */
@ApiModelProperty(value= "鍝佺墝")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value= "鍗曚环 闀垮害")
private Double price;
@ApiModelProperty(value= "sku")
@@ -67,6 +79,9 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠变綅缃�
+ * */
@ApiModelProperty(value= "浜у湴")
private String origin;
@@ -91,7 +106,7 @@
@ApiModelProperty(value= "闀垮害")
private Double length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value= "浣撶Н 姣涢噸")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -151,6 +166,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 鍗蜂俊鎭疘D
+ */
+ @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+ @TableField("roll_up")
+ private Long rollUp;
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
@@ -219,4 +241,13 @@
public void sync(Object source) {
Synchro.Copy(source, this);
}
+
+ public String getBrand$(){
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
+ if (!Cools.isEmpty(basBoxType)){
+ return String.valueOf(basBoxType.getBoxSpecs());
+ }
+ return this.brand;
+ }
}
--
Gitblit v1.9.1