feat:修改数码印花厂，入库类型，出库类型的查询功能

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageTypeController.java

@@ -9,12 +9,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.web.bind.annotation.*;
-
+import java.util.List;
 /**
  * 入库类型管理接口
  */
-
-import java.util.List;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/putinstoragetype")

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageTypeServiceImpl.java

@@ -36,6 +36,7 @@ public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
     @Override
     public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
         QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(putInStorageTypeBo.getID() != 0,"id",putInStorageTypeBo.getID());
         qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
         Page<PutInStorageTypeVo>page= putInStorageTypeMapper.selectVoPage(pageQuery.build(),qw);

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutOutStorageTypeServiceImpl.java

@@ -36,6 +36,7 @@ public class PutOutStorageTypeServiceImpl implements PutOutStorageTypeService {
     @Override
     public TableDataInfo<PutOutStorageTypeVo> selectPutOutStorageTypePageList(PutOutStorageTypeBo putOutStorage, PageQuery pageQuery) {
         QueryWrapper<PutOutStorageType> qw = new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(putOutStorage.getID() != 0, "id", putOutStorage.getID());
         qw.like(StringUtils.isNotBlank(putOutStorage.getName()), "name", putOutStorage.getName());
         Page<PutOutStorageTypeVo> page = putOutStorageTypeMapper.selectVoPage(pageQuery.build(), qw);

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/FactoryServiceImpl.java

@@ -34,10 +34,11 @@ public class FactoryServiceImpl implements FactoryService {
     @Override
     public TableDataInfo<FactoryVo> selectPageFactoryList(FactoryBo factoryBo, PageQuery pageQuery){
         QueryWrapper<Factory> qw=new QueryWrapper<>();
+        qw.isNull("deletetime");
         qw.like(StringUtils.isNotBlank(factoryBo.getName()),"name",factoryBo.getName());
         qw.like(StringUtils.isNotBlank(factoryBo.getAddress()),"address",factoryBo.getAddress());
         qw.like(StringUtils.isNotBlank(factoryBo.getLinkman()),"linkman",factoryBo.getLinkman());
-        qw.isNull("deletetime");
+
         Page<FactoryVo> page= factoryMapper.selectVoPage(pageQuery.build(),qw);
         return TableDataInfo.build(page);
     }