From fc464a48c95cc0710d89501d9df99312c3efa603 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 13 八月 2024 18:35:12 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index 4ba1d22..808b950 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -3,18 +3,17 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.LocMastService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,6 +41,7 @@
* 搴撲綅鍙�
*/
@ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("loc_no")
private String locNo;
/**
@@ -72,6 +72,7 @@
private String batch;
@ApiModelProperty(value= "")
+ @TableField("order_no")
private String orderNo;
/**
@@ -117,12 +118,15 @@
private String manu;
@ApiModelProperty(value= "")
+ @TableField("manu_date")
private String manuDate;
@ApiModelProperty(value= "")
+ @TableField("item_num")
private String itemNum;
@ApiModelProperty(value= "")
+ @TableField("safe_qty")
private Double safeQty;
@ApiModelProperty(value= "")
@@ -135,21 +139,26 @@
private Double volume;
@ApiModelProperty(value= "")
+ @TableField("three_code")
private String threeCode;
@ApiModelProperty(value= "")
private String supp;
@ApiModelProperty(value= "")
+ @TableField("supp_code")
private String suppCode;
@ApiModelProperty(value= "")
+ @TableField("be_batch")
private Integer beBatch;
@ApiModelProperty(value= "")
+ @TableField("dead_time")
private String deadTime;
@ApiModelProperty(value= "")
+ @TableField("dead_warn")
private Integer deadWarn;
@ApiModelProperty(value= "")
@@ -165,6 +174,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
private Long modiUser;
/**
@@ -172,12 +182,14 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
private Long appeUser;
/**
@@ -185,6 +197,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("appe_time")
private Date appeTime;
/**
@@ -197,14 +210,15 @@
* 鎺堟潈鍟嗘埛
*/
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+ @TableField("host_id")
private Long hostId;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public LocDetl() {}
- public LocDetl(String locNo,String zpallet,Double anfme,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 length,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 hostId,Integer owner) {
+ public LocDetl(String locNo,String zpallet,Double anfme,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 length,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 hostId,String owner) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -289,6 +303,15 @@
// null // 鎺堟潈鍟嗘埛
// );
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.locNo);
@@ -296,18 +319,6 @@
return String.valueOf(locMast.getLocNo());
}
return null;
- }
-
- public String getOwner$(){
- if (null == this.owner){ return null; }
- switch (this.owner){
- case 1:
- return "瀹佹尝";
- case 2:
- return "鏂版槍";
- default:
- return String.valueOf(this.owner);
- }
}
public String getModiUser$(){
--
Gitblit v1.9.1