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

mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/mapper/ReservationMaterialInventoryMapper.java

@@ -29,6 +29,8 @@ public interface ReservationMaterialInventoryMapper extends BaseMapper<Reservati
     public List<ReservationMaterialInventoryPO> queryListByWl(ReservationMaterialInventoryDO materialInventoryDO);
     //查物料库存列表-货主
     public List<ReservationMaterialInventoryPO> queryListByHz(ReservationMaterialInventoryDO materialInventoryDO);
+    //查物料库存列表-物料+过期日期
+    public List<ReservationMaterialInventoryPO> queryListByWlExpiry(ReservationMaterialInventoryDO materialInventoryDO);
 
 
     public MaterialBaseInfo getByInfoId(@Param("id") Long id);

mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/persistence/ReservationMaterialInventoryImpl.java

@@ -64,6 +64,8 @@ public class ReservationMaterialInventoryImpl extends ServiceImpl<ReservationMat
             return materialInventoryMapper.queryListByKw(materialInventoryDO);
         } else if ("wlkw".equals(queryRule)) {
             return materialInventoryMapper.queryListByWlKw(materialInventoryDO);
+        } else if ("wlExpiry".equals(queryRule)) {
+            return materialInventoryMapper.queryListByWlExpiry(materialInventoryDO);
         } else if ("all".equals(queryRule)) {
             return materialInventoryMapper.queryList(materialInventoryDO);
         } else {

mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/ReservationMaterialInventoryDO.java

@@ -253,4 +253,6 @@ public class ReservationMaterialInventoryDO extends MaterialBaseDO {
     private String createTimeEnd;
     private String expiryDateStr;
     private String productionDateStr;
+    private String expiryDateStart;
+    private String expiryDateEnd;
 }

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