From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..1c3bb5f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_mast")
@@ -64,6 +65,20 @@
@ApiModelProperty(value= "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 绌挎杞�
+ */
+ @ApiModelProperty(value= "绌挎杞�")
+ @TableField("ste_no")
+ private Integer steNo;
+
+ /**
+ * 杈圭紭搴撲綅
+ */
+ @ApiModelProperty(value= "杈圭紭搴撲綅")
+ @TableField("out_most")
+ private Integer outMost;
@ApiModelProperty(value= "")
@TableField("sheet_no")
@@ -321,6 +336,11 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
public WrkMast() {}
public String getYmd$(){
@@ -396,6 +416,14 @@
LocMast locMast = service.selectById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
+ }
+ return null;
+ }
+ public String getOrderNo$(){
+ WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(this.wrkNo);
+ if (!Cools.isEmpty(wrkDetls) && wrkDetls.size()!=0){
+ return String.valueOf(wrkDetls.get(0).getOrderNo());
}
return null;
}
@@ -479,13 +507,6 @@
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
- }
-
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
}
public String getLogErrTime$(){
--
Gitblit v1.9.1