From d801ee292fb95592b3ed0eaa95d3b2506c78c9c1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 17 三月 2022 09:20:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 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 026e6cf..544c36b 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,6 @@
package zy.cloud.wms.manager.entity;
+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 +27,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;
@@ -67,6 +69,13 @@
@ApiModelProperty(value= "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
/**
* 鏁伴噺
@@ -199,6 +208,9 @@
@TableField("in_qty")
private int inQty;
+ @TableField("qua_status")
+ private int quaStatus;
+
// ReceiveDetl receiveDetl = new ReceiveDetl(
// null, //
// null, // 璁㈠崟鍐呯爜
@@ -224,6 +236,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;
}
@@ -244,19 +267,49 @@
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());
+// 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){
+ return "鏈叆搴�";
}
- return null;
+ if (anfme - inQty != 0){
+ return "鍏ュ簱涓�";
+ }
+ return "宸插畬鎴�";
}
+
+ public String getQuaStatus$(){
+ if (this.quaStatus == 0){
+ return "寰呮";
+ } else if (this.quaStatus == 1){
+ return "鍚堟牸";
+ } else if (this.quaStatus == 2) {
+ return "涓嶅悎鏍�";
+ }
+ return "鏈煡";
+ }
+
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
+
public Double getAnfme() {
return anfme;
}
--
Gitblit v1.9.1