diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index 0e9d62727..a11834637 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -1,6 +1,7 @@ package com.mhd.wms.domain.outMaterialDetail.repository.todo; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.mhd.common.core.annotation.Excel; @@ -8,8 +9,10 @@ import com.mhd.common.core.web.domain.BaseVOEntity; import com.mhd.wms.domain.outMaterialDetailSerialNumber.repository.todo.OutMaterialDetailSerialNumberDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @@ -485,4 +488,10 @@ public class OutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("取消分配抄码id数组") @Excel(name = "取消分配抄码id数组") private List copyCodeReferenceIdsCancel; + + @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") + private Date productionDate; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java index 1bb18d645..33deb6af3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java @@ -15,6 +15,15 @@ public class CopyCodeReferenceDTO extends BaseVOEntity { @ApiModelProperty("ID") private Long id; + @ApiModelProperty("组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + private Long topOrganizationId; + @ApiModelProperty("货主ID") private Long shipperId; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java index 3b0900e51..c74e8933f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java @@ -1,5 +1,7 @@ package com.mhd.wms.interfaces.dto.outMaterialDetail; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.mhd.common.core.annotation.Excel; @@ -8,8 +10,10 @@ import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; import com.mhd.wms.interfaces.dto.outMaterialDetailSerialNumber.OutMaterialDetailSerialNumberDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @@ -475,4 +479,10 @@ public class OutMaterialDetailDTO extends BaseVOEntity { @Excel(name = "取消分配抄码id数组") private List copyCodeReferenceIdsCancel; + @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") + private Date productionDate; + } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml b/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml index 6bf467ab9..433e294d0 100644 --- a/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml +++ b/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml @@ -125,6 +125,12 @@ AND material_code = #{materialCode} AND batch_number = #{batchNumber} AND box_pallet_no = #{boxPalletNo} + + AND top_organization_id = #{topOrganizationId} + + + AND organization_id = #{organizationId} + ORDER BY serial_number