From 9aff2228c647b65bd2aa7aa9186445fb7b5d2219 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 27 二月 2026 13:43:51 +0800
Subject: [PATCH] 出入库日志记录是否分包
---
src/main/java/com/zy/system/entity/SaasLog.java | 70 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index f3a43ab..3c5e503 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -1,19 +1,22 @@
package com.zy.system.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("sys_saas_log")
+@AllArgsConstructor
public class SaasLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,7 +31,7 @@
/**
* {0:鍏ュ簱,1:鍑哄簱}
*/
- @ApiModelProperty(value= "{0:鍏ュ簱,1:鍑哄簱}")
+ @ApiModelProperty(value= "{0:鍏ュ簱,1:鍑哄簱,2:绉诲簱}")
private Integer type;
@ApiModelProperty(value= "")
@@ -47,12 +50,49 @@
@TableField("create_by")
private Long createBy;
+ @TableField("anfme")
+ private Double anfme;
+
@ApiModelProperty(value= "")
@TableField("create_by_name")
private String createByName;
- @TableField("anfme")
- private Double anfme;
+ private String targetLocNo;
+ private String batch;
+ private Integer packageNo;
+
+ /**
+ * 涓讳綋
+ */
+ private String owner;
+
+ /**
+ * 杞﹂棿
+ */
+ private String workshop;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @TableField("doc_type")
+ private Long docType;
+
+ @TableField("memo")
+ private String memo;
+
+ @TableField("memo2")
+ private String memo2;
+
+ // 鏄惁鍒嗗寘锛岀敓浜ц鍗曞彿涓虹┖鍒欎负鍒嗗寘 0.姝ｅ父,1.鍒嗗寘
+ @TableField("subcontracting")
+ private Integer subcontracting;
+
+ public String getSubcontracting$() {
+ return Cools.isEmpty(this.subcontracting) ? ""
+ : this.subcontracting == 0 ? "姝ｅ父"
+ : this.subcontracting == 1 ? "鍒嗗寘"
+ : String.valueOf(this.subcontracting);
+ }
public SaasLog() {}
@@ -82,6 +122,9 @@
}
public String getType$(){
+ if (this.type == null) {
+ return "";
+ }
if (this.type ==0) {
return "鍏ュ簱";
} else if (this.type == 1) {
@@ -90,11 +133,16 @@
return "搴撲綅绉昏浆";
} else if (this.type == 3) {
return "搴撳瓨璋冩暣";
- }else {
+ }else if (this.type == 4) {
+ return "閫�璐�";
+ } else {
return "";
}
}
+ public String getDocType$(){
+ return "";
+ }
}
--
Gitblit v1.9.1