weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

上架修改

Browse Source
This commit is contained in:
秦鸿展
2026-02-02 09:34:27 +08:00
parent ef698c2fa1
commit 2b70f25fae
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java
+8
View File
@@ -1,6 +1,7 @@
package com.mhd.wms.domain.shelfMaterialDetail.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -266,39 +267,46 @@ public class ShelfMaterialDetail extends BaseVOEntity {
@ApiModelProperty("扩展字段1")
@Excel(name = "扩展字段1")
@TableField("ext_attr_1")
private String extAttr1;
@ApiModelProperty("扩展字段2")
@Excel(name = "扩展字段2")
@TableField("ext_attr_2")
private String extAttr2;
@ApiModelProperty("生产日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("production_date")
private Date productionDate;
@ApiModelProperty("过期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("expiry_date")
private Date expiryDate;
@ApiModelProperty("存货日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("inventory_date")
private Date inventoryDate;
@ApiModelProperty("ExtAttr3")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr3", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_3")
private Date extAttr3;
@ApiModelProperty("ExtAttr4")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField("ext_attr_4")
private Date extAttr4;
}
mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+6 -6
View File
@@ -688,19 +688,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND a.storage_location_id = #{storageLocationId}
</if>
<if test="extAttr4 != null">
AND DATE(a.EXT_ATTR_4) = DATE(#{inventoryDate})
AND TRUNC(a.EXT_ATTR_4) = TRUNC(#{inventoryDate})
</if>
<if test="extAttr3 != null">
AND DATE(a.EXT_ATTR_3) = DATE(#{inventoryDate})
AND TRUNC(a.EXT_ATTR_3) = TRUNC(#{inventoryDate})
</if>
<if test="inventoryDate != null">
AND DATE(a.inventory_date) = DATE(#{inventoryDate})
AND TRUNC(a.inventory_date) = TRUNC(#{inventoryDate})
</if>
<if test="expiryDate != null">
AND DATE(a.EXPIRY_DATE) = DATE(#{inventoryDate})
AND TRUNC(a.EXPIRY_DATE) = TRUNC(#{inventoryDate})
</if>
<if test="productionDate != null and productionDate != ''">
AND DATE(a.PRODUCTION_DATE) = DATE(#{inventoryDate})
<if test="productionDate != null">
AND TRUNC(a.PRODUCTION_DATE) = TRUNC(#{inventoryDate})
</if>
<if test="extAttr2 != null and extAttr2 != ''">
AND a.EXT_ATTR_2 = #{extAttr2}