From 05228429f1a801db155ebf34a8bf645f765ecfb1 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 16 三月 2022 17:07:31 +0800
Subject: [PATCH] .
---
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 145 ++++++++++++++++++++++++++++++------------------
1 files changed, 90 insertions(+), 55 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 b713057..01777ee 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -1,22 +1,51 @@
package zy.cloud.wms.manager.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
+import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import zy.cloud.wms.manager.service.OrderService;
-import zy.cloud.wms.system.entity.Host;
-import zy.cloud.wms.system.entity.User;
-import zy.cloud.wms.system.service.HostService;
+import zy.cloud.wms.manager.entity.Order;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
import zy.cloud.wms.system.service.UserService;
-
-import java.io.Serializable;
+import zy.cloud.wms.system.entity.User;
import java.text.SimpleDateFormat;
import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import zy.cloud.wms.system.service.UserService;
+import zy.cloud.wms.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
@TableName("man_receive_detl")
public class ReceiveDetl implements Serializable {
@@ -26,13 +55,9 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 鎵�灞為」鐩�
- */
- @ApiModelProperty(value= "鎵�灞為」鐩�")
+ @ApiModelProperty(value= "")
@TableField("host_id")
private Long hostId;
@@ -42,6 +67,13 @@
@ApiModelProperty(value= "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
/**
* 鏁伴噺
@@ -121,7 +153,7 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Integer count;
+ private Double count;
/**
* 閲嶉噺
@@ -130,7 +162,7 @@
private Double weight;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
@@ -147,6 +179,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -161,6 +194,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -169,34 +203,14 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public ReceiveDetl() {}
+ @TableField("in_qty")
+ private int inQty;
- public ReceiveDetl(Long hostId, Long orderId, Double anfme, String matnr, String maktx, String name, String specs, String model, String batch, String unit, String barcode, String supplier, Double unitPrice, Integer itemNum, Integer count, Double weight, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
- this.hostId = hostId;
- this.orderId = orderId;
- this.anfme = anfme;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.supplier = supplier;
- this.unitPrice = unitPrice;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
+ @TableField("qua_status")
+ private int quaStatus;
-// OrderDetl orderDetl = new OrderDetl(
+// ReceiveDetl receiveDetl = new ReceiveDetl(
+// null, //
// null, // 璁㈠崟鍐呯爜
// null, // 鏁伴噺
// null, // 鍟嗗搧缂栫爜
@@ -236,15 +250,6 @@
this.hostId = hostId;
}
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getName());
- }
- return null;
- }
-
public Long getOrderId() {
return orderId;
}
@@ -258,8 +263,38 @@
return null;
}
+ public String getState$(){
+ if (this.inQty == 0){
+ return "鏈叆搴�";
+ }
+ 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() {
@@ -358,11 +393,11 @@
this.itemNum = itemNum;
}
- public Integer getCount() {
+ public Double getCount() {
return count;
}
- public void setCount(Integer count) {
+ public void setCount(Double count) {
this.count = count;
}
--
Gitblit v1.9.1