浏览代码

修改出入库仓库查询条件

fgd 1 年之前
父节点
当前提交
9db6f703ed

+ 2 - 2
sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageBomSelectDto.java

@@ -40,9 +40,9 @@ public class InOutStorageBomSelectDto extends BaseSelectDto {
     private Long departmentId;
 
     /**
-     * 仓库名称
+     * 仓库id
      */
-    private String warehouseName;
+    private Long warehouseId;
 
     /**
      * 类型 1入库 0出库

+ 2 - 2
sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageSelectDto.java

@@ -33,9 +33,9 @@ public class InOutStorageSelectDto extends BaseSelectDto {
     private Long departmentId;
 
     /**
-     * 仓库名称
+     * 仓库id
      */
-    private String warehouseName;
+    private Long warehouseId;
 
     /**
      * 出入库明细

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -37,7 +37,7 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
         wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
         wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
         wrapper.eq("ios", InOutStorage::getDepartmentId, dto.getDepartmentId());
-        wrapper.like("w", Warehouse::getName, dto.getWarehouseName());
+        wrapper.eq("w", Warehouse::getId, dto.getWarehouseId());
         wrapper.eq("ios", InOutStorage::getType, dto.getType());
         wrapper.eq("ios", InOutStorage::getDetailType, dto.getDetailType());
         wrapper.ge("ios", InOutStorage::getCreateTime, dto.getBeginTime());

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageServiceImpl.java

@@ -56,7 +56,7 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
         wrapper.eq("ios", InOutStorage::getType, dto.getType());
         wrapper.like("ios", InOutStorage::getCode, dto.getCode());
         wrapper.eq("ios", InOutStorage::getDepartmentId, dto.getDepartmentId());
-        wrapper.like("w", Warehouse::getName, dto.getWarehouseName());
+        wrapper.eq("w", Warehouse::getId, dto.getWarehouseId());
         wrapper.eq("ios", InOutStorage::getDetailType, dto.getDetailType());
         wrapper.ge("ios", InOutStorage::getCreateTime, dto.getBeginTime());
         wrapper.le("ios", InOutStorage::getCreateTime, dto.getEndTime());