From 13e770013a29f1a730b33d6467482264b35d82d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 29 May 2026 20:57:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../po/ReservationInMaterialDetailPO.java | 1 + .../todo/InventoryAdjustmentRecordPO.java | 3 ++- .../ReservationInventoryAdjustmentRecordDO.java | 3 +++ .../ReservationInventoryAdjustmentRecordDTO.java | 4 ++++ .../InventoryAdjustmentRecordMapper.xml | 12 ++++++++++++ .../InventoryAdjustmentRecordDTO.java | 3 ++- .../InventoryAdjustmentRecordMapper.xml | 14 +++++++++++++- 7 files changed, 37 insertions(+), 3 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java index 874960216..576f58c05 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java @@ -472,4 +472,5 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date drinkDate; + private String lotNumber; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/InventoryAdjustmentRecordPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/InventoryAdjustmentRecordPO.java index ff0809cb6..0badb7a1a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/InventoryAdjustmentRecordPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/InventoryAdjustmentRecordPO.java @@ -251,5 +251,6 @@ public class InventoryAdjustmentRecordPO extends BaseVOEntity { @ApiModelProperty("LOT编号") @Excel(name = "LOT编号") - private String LotNumber; +// private String LotNumber; + private String lotNumber; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDO.java index 9bc66291d..8ac097c2d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDO.java @@ -211,4 +211,7 @@ public class ReservationInventoryAdjustmentRecordDO extends BaseVOEntity { @ApiModelProperty("LOT编号") @Excel(name = "LOT编号") private String lotNumber; + private String lotCode; + private String expiryDate; + private String productionDate; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDTO.java index bcc56a552..0a2734c2c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInventoryAdjustmentRecord/repository/todo/ReservationInventoryAdjustmentRecordDTO.java @@ -101,6 +101,10 @@ public class ReservationInventoryAdjustmentRecordDTO extends BaseVOEntity { @Excel(name = "批次号") private String batchNumber; + private String lotCode; + private String expiryDate; + private String productionDate; + @ApiModelProperty("容器id") @Excel(name = "容器id") private Long containerId; diff --git a/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml b/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml index 2e0e97778..aace2a765 100644 --- a/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml @@ -117,6 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.bar_code = #{barCode} + + and b.batch_number = #{batchNumber} + + + and b.lot_number = #{lotCode} + and a.shipper_id = #{shipperId} @@ -189,6 +195,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.create_by_name like concat('%', #{createByName}, '%') + + AND DATE(b.expiry_date) = #{expiryDate} + + + AND DATE(b.production_date) = #{productionDate} + and a.update_by_name like concat('%', #{updateByName}, '%') diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java index f9ff15d67..ff5d686db 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java @@ -100,6 +100,7 @@ public class InventoryAdjustmentRecordDTO extends BaseVOEntity { @ApiModelProperty("批次号") @Excel(name = "批次号") private String batchNumber; + private String lotNumber; @ApiModelProperty("容器id") @Excel(name = "容器id") @@ -168,4 +169,4 @@ public class InventoryAdjustmentRecordDTO extends BaseVOEntity { @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml b/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml index acdb7dd21..5bd09d7e7 100644 --- a/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.ext_attr_1, b.ext_attr_2, b.ext_attr_3, b.ext_attr_4, b.production_date, b.expiry_date, b.inventory_date, b.batch_ref_no, b.sheet_ref_no, b.box_pallet_no,a.ADJUST_ACTION,a.RELATE_NO, - a.in_order_number,a.lot_number,b.batch_number + b.in_order_number,b.lot_number,b.batch_number from inventory_adjustment_record a left join material_inventory b on a.material_inventory_id = b.material_inventory_id where a.del_flag = 1 @@ -117,6 +117,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.bar_code = #{barCode} + + and b.batch_number = #{batchNumber} + + + and b.lot_number = #{lotCode} + + + AND DATE(b.expiry_date) = #{expiryDate} + + + AND DATE(b.production_date) = #{productionDate} + and a.shipper_id = #{shipperId}