库存调整记录查询条件添加;

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;
 }

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;
 }

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;
 }

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;

mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml

@@ -117,6 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="barCode != null  and barCode != ''">
             and a.bar_code = #{barCode}
         </if>
+        <if test="batchNumber != null  and batchNumber != ''">
+            and b.batch_number = #{batchNumber}
+        </if>
+        <if test="lotCode != null  and lotCode != ''">
+            and b.lot_number = #{lotCode}
+        </if>
         <if test="shipperId != null ">
             and a.shipper_id = #{shipperId}
         </if>
@@ -189,6 +195,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createByName != null  and createByName != ''">
             and a.create_by_name like concat('%', #{createByName}, '%')
         </if>
+        <if test="expiryDate != null and expiryDate != ''">
+            AND DATE(b.expiry_date) = #{expiryDate}
+        </if>
+        <if test="productionDate != null and productionDate != ''">
+            AND DATE(b.production_date) = #{productionDate}
+        </if>
         <if test="updateByName != null  and updateByName != ''">
             and a.update_by_name like concat('%', #{updateByName}, '%')
         </if>

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;
-}
+}

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
     </sql>
@@ -117,6 +117,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="barCode != null  and barCode != ''">
             and a.bar_code = #{barCode}
         </if>
+        <if test="batchNumber != null  and batchNumber != ''">
+            and b.batch_number = #{batchNumber}
+        </if>
+        <if test="lotCode != null  and lotCode != ''">
+            and b.lot_number = #{lotCode}
+        </if>
+        <if test="expiryDate != null and expiryDate != ''">
+            AND DATE(b.expiry_date) = #{expiryDate}
+        </if>
+        <if test="productionDate != null and productionDate != ''">
+            AND DATE(b.production_date) = #{productionDate}
+        </if>
         <if test="shipperId != null ">
             and a.shipper_id = #{shipperId}
         </if>