From 98cac850db801e84dff4387eb12b08921c436472 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:33:50 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
index 01777ee..62a105a 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -1,5 +1,8 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -26,6 +29,7 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.core.common.SpringUtils;
+import zy.cloud.wms.manager.service.ReceiveService;
import zy.cloud.wms.system.service.UserService;
import zy.cloud.wms.system.entity.User;
import java.text.SimpleDateFormat;
@@ -55,6 +59,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty(value= "")
@@ -204,7 +209,7 @@
private String memo;
@TableField("in_qty")
- private int inQty;
+ private Double inQty;
@TableField("qua_status")
private int quaStatus;
@@ -234,6 +239,17 @@
// null // 澶囨敞
// );
+ public String getOrderId$(){
+ ReceiveService receiveService = SpringUtils.getBean(ReceiveService.class);
+ Receive receive = receiveService.selectOne(new EntityWrapper<Receive>()
+ .eq("id", orderId));
+ if (!Cools.isEmpty(receive)) {
+ return receive.getOrderNo();
+ }else {
+ return orderId + "";
+ }
+
+ }
public Long getId() {
return id;
}
@@ -254,14 +270,14 @@
return orderId;
}
- public String getOrderId$(){
- OrderService service = SpringUtils.getBean(OrderService.class);
- Order order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)){
- return String.valueOf(order.getId());
- }
- return null;
- }
+// public String getOrderId$(){
+// OrderService service = SpringUtils.getBean(OrderService.class);
+// Order order = service.selectById(this.orderId);
+// if (!Cools.isEmpty(order)){
+// return String.valueOf(order.getId());
+// }
+// return null;
+// }
public String getState$(){
if (this.inQty == 0){
--
Gitblit v1.9.1