From 26aefb078007bf1fbf58cdecaefcb14e63a970c0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 24 五月 2023 14:25:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index 8ffca63..c773d93 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.NodeService;
import com.zy.system.entity.Host;
import com.zy.system.entity.User;
@@ -24,14 +25,6 @@
public class ManLocDetl implements Serializable {
private static final long serialVersionUID = 1L;
-
- /**
- * uuid
- */
- @ApiModelProperty(value= "uuid")
- @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
- @TableField("uuid")
- private String uuid;
/**
* 鎵�灞為」鐩�
@@ -210,6 +203,26 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ private Integer owner;
+
+ /**
+ * 鏄惁浠樻
+ */
+ @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ")
+ private Integer payment;
+
+ /**
+ * uuid鏃堕棿鎴�
+ */
+ @ApiModelProperty(value= "uuid")
+ @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
+ @TableField("uuid")
+ private String uuid;
+
public ManLocDetl() {}
public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date modiTime,String memo,String uuid) {
@@ -266,6 +279,27 @@
// null // 澶囨敞
// );
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
+ public String getPayment$(){
+ if (null == this.payment){ return null; }
+ switch (this.payment){
+ case 1:
+ return "宸蹭粯娆�";
+ case 0:
+ return "鏈粯娆�";
+ default:
+ return String.valueOf(this.payment);
+ }
+ }
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.selectById(this.hostId);
--
Gitblit v1.9.1