From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/java/com/zy/system/entity/SaasLog.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index fb136f6..aa44f07 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= "")
@@ -54,6 +57,20 @@
@TableField("create_by_name")
private String createByName;
+ private String targetLocNo;
+ private String batch;
+ private Integer packageNo;
+
+ /**
+ * 涓讳綋
+ */
+ private String owner;
+
+ /**
+ * 杞﹂棿
+ */
+ private String workshop;
+
public SaasLog() {}
public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
--
Gitblit v1.9.1