From e20d057b0ee325757e6f7510a65ca22e545010d7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 19:15:33 +0800
Subject: [PATCH] 修复移库任务下发给wcs
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 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 83298e9..319f60b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.LocAliasUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -13,6 +14,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -65,6 +67,13 @@
@TableField("crn_no")
private Integer crnNo;
+ /**
+ * 搴撳尯锛�1=A鍖猴紝2=B鍖猴紝3=C鍖�
+ */
+ @ApiModelProperty(value= "搴撳尯")
+ @TableField("area_id")
+ private Integer areaId;
+
@ApiModelProperty(value= "")
@TableField("sheet_no")
private String sheetNo;
@@ -112,6 +121,18 @@
@TableField("loc_sts")
private String locSts;
+ @ApiModelProperty(value= "涓氬姟鍗曞彿")
+ @TableField("user_no")
+ private String userNo;
+
+ @ApiModelProperty(value= "鍑哄簱椤哄簭")
+ @TableField("plt_type")
+ private Integer pltType;
+
+ @ApiModelProperty(value= "鍑哄簱鎵规搴忓彿")
+ @TableField("batch_seq")
+ private String batchSeq;
+
/**
* 鎷ｆ枡
*/
@@ -137,9 +158,6 @@
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
- @TableField("plt_type")
- private Integer pltType;
/**
* 绌烘澘
@@ -170,10 +188,6 @@
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
- @TableField("user_no")
- private String userNo;
-
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
@@ -203,6 +217,10 @@
@ApiModelProperty(value= "")
@TableField("exp_time")
private Double expTime;
+
+ @ApiModelProperty(value= "鑰楁椂(鍒嗛挓)")
+ @TableField("cost_time")
+ private Integer costTime;
@ApiModelProperty(value= "")
@TableField("ref_wrkno")
@@ -271,7 +289,7 @@
@ApiModelProperty(value= "")
@TableField("sc_weight")
- private Double scWeight;
+ private BigDecimal scWeight;
@ApiModelProperty(value= "")
@TableField("log_mk")
@@ -291,10 +309,34 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- // Y:閿�鍞鍗曞嚭搴撲换鍔�
+ // ERP鍑哄簱纭鏍囪锛歒 鍏佽涓嬪彂WCS锛孨/绌� 涓嶅厑璁�
@ApiModelProperty(value= "")
@TableField("Pdc_type")
private String PdcType;
+
+ @ApiModelProperty(value= "闆嗚绠卞彿")
+ @TableField("container_no")
+ private String containerNo;
+
+ @ApiModelProperty(value= "TEU")
+ @TableField("teu")
+ private Integer teu;
+
+ @ApiModelProperty(value= "杞︾墝鍙�")
+ @TableField("plate_no")
+ private String plateNo;
+
+ @ApiModelProperty(value= "杞︽鍙�")
+ @TableField("train_no")
+ private String trainNo;
+
+ @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+ @TableField("freq_type")
+ private Integer freqType;
+
+ @ApiModelProperty(value= "绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背")
+ @TableField("cube_number")
+ private Double cubeNumber;
@ApiModelProperty(value= "")
@TableField("ctn_no")
@@ -357,6 +399,10 @@
return null;
}
+ public String getAreaId$(){
+ return LocAliasUtils.areaName(this.areaId);
+ }
+
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
@@ -368,9 +414,9 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return LocAliasUtils.displayLocNo(locMast);
}
- return null;
+ return this.locNo;
}
public String getStaNo$(){
@@ -395,9 +441,9 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return LocAliasUtils.displayLocNo(locMast);
}
- return null;
+ return this.sourceLocNo;
}
public String getIoTime$(){
@@ -481,6 +527,51 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getTaskNone$(){
+ if (Cools.isEmpty(this.takeNone)){
+ return "闈炶嚜鍔�";
+ }
+ switch (this.takeNone){
+ case "0":
+ return "闈炶嚜鍔�";
+ case "1":
+ return "绛夊緟涓嬪彂";
+ case "2":
+ return "宸蹭笅鍙�";
+ case "3":
+ return "鏃犻渶涓嬪彂";
+ case "4":
+ return "鏃犲彲鐢ˋGV搴撲綅";
+ default:
+ return "闈炶嚜鍔�";
+ }
+ }
+
+ public boolean getStaNoAgvSign(){
+ if (Cools.isEmpty(this.staNo)){
+ return false;
+ }
+ switch (this.staNo){
+ //鍑哄簱 AGV鎺�
+ case 1041:
+ case 4006:
+
+ //鍑哄簱 AGV鎺� 绌烘澘渚涘簲
+ case 2033:
+
+// //鍏ュ簱 AGV鏀�
+// case 1037:
+// case 2034:
+// case 4003:
+//
+// //鍏ュ簱 AGV鎺� 绌烘澘
+// case 1039:
+ return true;
+ default:
+ return false;
+ }
+ }
+
// public void setErrorMemo(String errorMemo) {
// if (errorMemo.length() > 255) {
// errorMemo = errorMemo.substring(0, 150);
--
Gitblit v1.9.1