lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

库存管理-导出 时间显示

Browse Source
This commit is contained in:
liuhanqing
2025-11-04 14:11:03 +08:00
parent 4737cd0cef
commit 77c68b95d7
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java
View File

@@ -1,9 +1,11 @@
package com.ruoyi.stock.freeze.domain; package com.ruoyi.stock.freeze.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@@ -25,14 +27,14 @@ public class BasStockFreezeRecord extends BaseEntity
private String stockId; private String stockId;
/** 货位编码 */ /** 货位编码 */
@Excel(name = "${stock.Freeze.cargoSpaceId}") @Excel(name = "货位编码")
private String cargoSpaceId; private String cargoSpaceId;
/** 货位名称 */ /** 货位名称 */
@Excel(name = "${stock.Freeze.cargoSpaceName}") @Excel(name = "货位名称")
private String cargoSpaceName; private String cargoSpaceName;
/** 托盘条码 */ /** 托盘条码 */
@Excel(name = "${stock.Freeze.trayCode}") @Excel(name = "托盘条码")
private String trayCode; private String trayCode;
/** 物品编码 */ /** 物品编码 */
@@ -52,11 +54,11 @@ public class BasStockFreezeRecord extends BaseEntity
private String lotNo; private String lotNo;
/** 初始状态 */ /** 初始状态 */
@Excel(name = "${stock.Freeze.oldStatus}",dictType="stock_status") @Excel(name = "初始状态",dictType="stock_status")
private String oldStatus; private String oldStatus;
/** 更改状态 */ /** 更改状态 */
@Excel(name = "${stock.Freeze.currStatus}",dictType="stock_status") @Excel(name = "更改状态",dictType="stock_status")
private String currStatus; private String currStatus;
/** 操作 */ /** 操作 */
@@ -64,7 +66,7 @@ public class BasStockFreezeRecord extends BaseEntity
private String method; private String method;
/** 仓库 */ /** 仓库 */
@Excel(name = "${stock.Freeze.warehouseId}") @Excel(name = "仓库")
private String warehouseName; private String warehouseName;
private String warehouseId; private String warehouseId;
@@ -89,7 +91,9 @@ public class BasStockFreezeRecord extends BaseEntity
// @Excel(name = "${stock.Freeze.productGuid}") // @Excel(name = "${stock.Freeze.productGuid}")
private String productGuid; private String productGuid;
// 创建时间 // 创建时间
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30) @Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@Override @Override

26
ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java
View File

@@ -1,9 +1,11 @@
package com.ruoyi.stock.maintain.domain; package com.ruoyi.stock.maintain.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@@ -21,26 +23,26 @@ public class BasStockMaintainRecord extends BaseEntity
private String whGuid; private String whGuid;
/** 库存编码 */ /** 库存编码 */
@Excel(name = "${stock.Maintain.stockId}") @Excel(name = "库存编码")
private String stockId; private String stockId;
/** 货位编码 */ /** 货位编码 */
@Excel(name = "${stock.Maintain.cargoSpaceId}") @Excel(name = "货位编码")
private String cargoSpaceId; private String cargoSpaceId;
/** 货位名称 */ /** 货位名称 */
@Excel(name = "${stock.Maintain.cargoSpaceName}") @Excel(name = "货位名称")
private String cargoSpaceName; private String cargoSpaceName;
/** 托盘条码 */ /** 托盘条码 */
@Excel(name = "${stock.Maintain.trayCode}") @Excel(name = "托盘条码")
private String trayCode; private String trayCode;
/** 物品编码 */ /** 物品编码 */
@Excel(name = "${stock.Maintain.productId}") @Excel(name = "物品编码")
private String productId; private String productId;
/** 物品名称 */ /** 物品名称 */
@Excel(name = "${stock.Maintain.productName}") @Excel(name = "物品名称")
private String productName; private String productName;
/** 生产日期 */ /** 生产日期 */
@@ -52,23 +54,25 @@ public class BasStockMaintainRecord extends BaseEntity
private String lotNo; private String lotNo;
/** 初始数量 */ /** 初始数量 */
@Excel(name = "${stock.Maintain.oldQuantity}") @Excel(name = "初始数量")
private String oldQuantity; private String oldQuantity;
/** 操作后数量 */ /** 操作后数量 */
@Excel(name = "${stock.Maintain.quantity}") @Excel(name = "操作后数量")
private String quantity; private String quantity;
/** 操作 */ /** 操作 */
@Excel(name = "${stock.Maintain.method}", dictType="stock_maintain_method") @Excel(name = "操作", dictType="stock_maintain_method")
private String method; private String method;
/** 仓库 */ /** 仓库 */
@Excel(name = "${stock.Maintain.warehouseId}") @Excel(name = "仓库")
private String warehouseName; private String warehouseName;
private String warehouseId; private String warehouseId;
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30) @Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@Override @Override