From c6820e2cff19f338e70c9b112f19070c240f561a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 15 一月 2026 12:53:59 +0800
Subject: [PATCH] 完善销售订单出库自动勾选
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 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..e5d4fad 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -22,13 +22,17 @@
private static final long serialVersionUID = 1L;
+ private Long id;
+
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Integer wrkNo;
+
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ private String taskType;
@ApiModelProperty(value= "")
@TableField("inv_wh")
@@ -92,14 +96,14 @@
*/
@ApiModelProperty(value= "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -117,6 +121,10 @@
*/
@ApiModelProperty(value= "鎷ｆ枡")
private String picking;
+
+ @ApiModelProperty(value= "琛ョ┖鎵樼洏鎺ュ彈mes鐨刟gv浠诲姟鍙�")
+ @TableField("user_no")
+ private String userNo;
@ApiModelProperty(value= "")
@TableField("link_mis")
@@ -169,10 +177,6 @@
@ApiModelProperty(value= "")
@TableField("mtn_type")
private Double mtnType;
-
- @ApiModelProperty(value= "")
- @TableField("user_no")
- private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
@@ -321,6 +325,16 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 澶栭儴浠诲姟缂栧彿
+ */
+ @ApiModelProperty(value= "澶栭儴浠诲姟缂栧彿")
+ @TableField("task_no")
+ private String taskNo;
+
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
public WrkMast() {}
public String getYmd$(){
@@ -372,6 +386,16 @@
}
return null;
}
+
+ public String getTaskType$(){
+ if (Cools.isEmpty(this.taskType)){return null;}
+ if (taskType.equals("agv")) {
+ return "AGV浠诲姟";
+ } else {
+ return "鍫嗗灈鏈轰换鍔�";
+ }
+ }
+
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
@@ -481,12 +505,12 @@
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 void setErrorMemo(String errorMemo) {
+// if (errorMemo.length() > 255) {
+// errorMemo = errorMemo.substring(0, 150);
+// }
+// this.errorMemo = errorMemo;
+// }
public String getLogErrTime$(){
if (Cools.isEmpty(this.logErrTime)){
--
Gitblit v1.9.1