From 881b15d5c56fd27d244f77cf2fb27ad95cfedd01 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 18 八月 2025 18:14:02 +0800 Subject: [PATCH] art: WMS接口测试相关代码添加,增加API接口日志 --- src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java index cf9c7a3..af2443c 100644 --- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java +++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java @@ -1,9 +1,6 @@ package org.jeecg.modules.mes.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -52,55 +49,69 @@ @ApiModelProperty(value = "鏇存柊鏃ユ湡") private Date updateTime; /**鍒犻櫎鏍囪*/ - @Excel(name = "鍒犻櫎鏍囪", width = 15) @ApiModelProperty(value = "鍒犻櫎鏍囪") @TableLogic private Integer delFlag; /**鎷夊姩鍗曞彿*/ - @Excel(name = "鎷夊姩鍗曞彿", width = 15) @ApiModelProperty(value = "鎷夊姩鍗曞彿") private String requestCode; /**宸ュ崟ID*/ - @Excel(name = "宸ュ崟ID", width = 15) @ApiModelProperty(value = "宸ュ崟ID") private String workOrderId; /**SAP棰勭暀鍙�*/ - @Excel(name = "SAP棰勭暀鍙�", width = 15) @ApiModelProperty(value = "SAP棰勭暀鍙�") private String reservationCode; /**鍙戝竷鐘舵��*/ - @Excel(name = "鍙戝竷鐘舵��", width = 15, dicCode = "publish_status") @Dict(dicCode = "publish_status") @ApiModelProperty(value = "鍙戝竷鐘舵��") private String publishStatus; /**璇锋眰鐘舵��*/ - @Excel(name = "璇锋眰鐘舵��", width = 15, dicCode = "request_status") @Dict(dicCode = "request_status") @ApiModelProperty(value = "璇锋眰鐘舵��") private String requestStatus; /**璇锋眰鏃堕棿*/ - @Excel(name = "璇锋眰鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "璇锋眰鏃堕棿") private Date requestTime; /**鍘熷簱瀛樺湴*/ - @Excel(name = "鍘熷簱瀛樺湴", width = 15) @ApiModelProperty(value = "鍘熷簱瀛樺湴") private String originalWarehouseId; /**鐩爣搴撳瓨鍦�*/ - @Excel(name = "鐩爣搴撳瓨鍦�", width = 15) @ApiModelProperty(value = "鐩爣搴撳瓨鍦�") private String targetWarehouseId; /**浼樺厛绾э紙鎷夊姩绫诲瀷锛�*/ - @Excel(name = "浼樺厛绾э紙鎷夊姩绫诲瀷锛�", width = 15, dicCode = "priority") - @Dict(dicCode = "priority") - @ApiModelProperty(value = "浼樺厛绾э紙鎷夊姩绫诲瀷锛�") - private String priority; + @Dict(dicCode = "material_transfer_category") + @ApiModelProperty(value = "鎷夊姩绫诲瀷") + private String materialTransferCategory; /**鏈�鏅氶厤閫佹椂闂�*/ - @Excel(name = "鏈�鏅氶厤閫佹椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "鏈�鏅氶厤閫佹椂闂�") private Date latestDeliveryTime; + /**鐗╂枡缂栫爜*/ + @ApiModelProperty(value = "鐗╂枡缂栫爜") + private String materialNumber; + /**鐗╂枡鍚嶇О*/ + @ApiModelProperty(value = "鐗╂枡鍚嶇О") + private String materialName; + /**鐞嗚鎷夊姩鏁伴噺*/ + @ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺") + private Double specifiedQuantity; + /**瀹為檯鎷夊姩鏁伴噺*/ + @ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺") + private Double actualQuantity; + /**杞﹂棿鍓╀綑鏁伴噺*/ + @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺") + private Double remainingQuantity; + + @TableField(exist = false) + @ApiModelProperty(value = "宸ュ崟鍙�") + private String workOrderCode; + @TableField(exist = false) + @ApiModelProperty(value = "鐩爣搴撳瓨鍦�") + private String targetWarehouseName; + @TableField(exist = false) + @ApiModelProperty(value = "鍘熷簱瀛樺湴") + private String originalWarehouseName; } -- Gitblit v1.9.3