From 0610019317ad541683fa59d268db7fd62b29ff7d Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 13:12:28 +0800
Subject: [PATCH] 单据明细页面字段显示
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 90e0164..159a96a 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,12 +1,17 @@
package com.zy.asrs.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.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.api.enums.MatLocType;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,12 +19,16 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("cust_wait_pakin")
public class WaitPakin implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
@@ -30,6 +39,10 @@
@ApiModelProperty(value= "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
+
+ @ApiModelProperty("缁勬墭绫诲瀷")
+ @TableField("type")
+ private String type;
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
@@ -43,6 +56,10 @@
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
+
+ @ApiModelProperty("鍗曟嵁ID")
+ @TableField("order_id")
+ private Long orderId;
@ApiModelProperty(value= "瑙勬牸")
private String specs;
@@ -233,6 +250,27 @@
}
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case "1":
+ return "AGV缁勬墭";
+ case "0":
+ return "鍫嗗灈鏈虹粍鎵�";
+ default:
+ return "鍫嗗灈鏈虹粍鎵�";
+ }
+ }
+
public String getDanger$(){
if (null == this.danger){ return null; }
switch (this.danger){
--
Gitblit v1.9.1