委托方导入修改以及OMS库存查询调整

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationMaterialInventory/ReservationMaterialInventoryApi.java

@@ -50,7 +50,9 @@ public class ReservationMaterialInventoryApi extends BaseController {
     @ApiOperation("查询物料库存列表")
     @GetMapping("/list")
     public TableDataInfo list(ReservationMaterialInventoryDTO materialInventoryDTO,
-                              @RequestParam(value = "customerName", required = false) String customerName)
+                              @RequestParam(value = "customerName", required = false) String customerName,
+                              @RequestParam(value = "expiryDateStart", required = false) String expiryDateStart,
+                              @RequestParam(value = "expiryDateEnd", required = false) String expiryDateEnd)
     {
         // 出库分配前端传的是客户名称 customerName，这里通过名称查询货主ID，使用精确匹配（不模糊匹配）
         String shipperName = null; // 保存查询到的货主名称
@@ -78,6 +80,8 @@ public class ReservationMaterialInventoryApi extends BaseController {
         ReservationMaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
         materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
         materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
+        materialInventoryDO.setExpiryDateStart(expiryDateStart);
+        materialInventoryDO.setExpiryDateEnd(expiryDateEnd);
         startPage();
         // 使用带批次属性的查询方法，批次属性值从库存表中获取
         List<ReservationMaterialInventoryPO> list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO);