From f905b7731608257f6e6adf4a29d69838d8cfe213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Thu, 28 May 2026 21:40:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/InMaterialDetail.java | 17 +++++++++++++++++ .../persistence/ReceiptMaterialDetailImpl.java | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java index ba73df65a..e60f886cd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java @@ -376,6 +376,23 @@ public class InMaterialDetail extends BaseVOEntity { @Excel(name = "oms入库单详情id") private String omsInMaterialDetail; + @ApiModelProperty("生产日期") + @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date productionDate; + + @ApiModelProperty("过期日期") + @Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date expiryDate; + + @ApiModelProperty("存货日期") + @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date inventoryDate; @ApiModelProperty(value = "饮用时间") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java index 2b29eeb42..7043d3ab2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java @@ -17,7 +17,6 @@ import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.domain.BatchDetailFeignPO; import com.mhd.system.api.model.LoginUser; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.mhd.wms.domain.materialGoodsRule.repository.facade.IMaterialGoodsRuleService; import com.mhd.wms.util.ReceiptBatchDetailFilter; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; @@ -821,10 +820,11 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("unique_id", receiptMaterialDetailPO.getInUniqueId()); queryWrapper.eq("del_flag", 1); - InMaterialDetail inMaterialDetail = iInMaterialDetailService.list(queryWrapper).get(0); - if (inMaterialDetail == null) { + List inDetailList = iInMaterialDetailService.list(queryWrapper); + if (CollectionUtils.isEmpty(inDetailList)) { return; } + InMaterialDetail inMaterialDetail = inDetailList.get(0); // 如果收货单明细中的料号、物料名称、规格型号、批次号为空，则从入库单明细中获取 if (StringUtils.isBlank(receiptMaterialDetailPO.getMaterialCode()) && StringUtils.isNotBlank(inMaterialDetail.getMaterialCode())) {