报销类型修改，物资管理-库存修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/controller/CwReimbursementTypeController.java

@@ -50,7 +50,7 @@ public class CwReimbursementTypeController {
     @ApiOperation(value = "列表查询")
     @GetMapping("/bxList")
     public ResponseEntity<List<CwReimbursementTypeInfo>> bxList(CwReimbursementTypeInfo info) {
-        List<CwReimbursementTypeInfo> list = service.bxList(info);
+        List<CwReimbursementTypeInfo> list = service.bxList2(info);
         return ResponseEntity.ok(list);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/domain/CwReimbursementTypeInfo.java

@@ -88,6 +88,14 @@ public class CwReimbursementTypeInfo extends TreeEntity<CwReimbursementTypeInfo>
     @TableField(exist = false)
     private String like;
 
+    //关联部门
+    @TableField(exist = false)
+    private String relateDepartment;
+
+    //报销部门id
+    @TableField(exist = false)
+    private String officeId;
+
     /**
      * 关联的officeIdList
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/mapper/CwReimbursementTypeMapper.java

@@ -27,6 +27,10 @@ public interface CwReimbursementTypeMapper extends BaseMapper<CwReimbursementTyp
      */
     List<CwReimbursementTypeInfo> findList(@Param(Constants.WRAPPER) Wrapper<CwReimbursementTypeInfo> queryWrapper);
 
+
+    List<CwReimbursementTypeInfo> bxList2(@Param(Constants.WRAPPER) Wrapper<CwReimbursementTypeInfo> queryWrapper,
+                                          @Param("officeId") String officeId);
+
     /**
      * 根据id查询详情信息
      * @param id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/mapper/xml/CwReimbursementTypeMapper.xml

@@ -74,7 +74,14 @@
 	<select id="findList" resultMap="BaseResultMap">
 		select
 		<include refid="Base_Column_List"></include>
+		,d.`name` as relateDepartment
 		from cw_reimbursement_type_info a
+		LEFT JOIN
+		(SELECT GROUP_CONCAT(c.name) as name,c.office_id,c.reimbursement_type_id FROM
+		(SELECT name,cw.office_id,cw.reimbursement_type_id
+		FROM cw_reimbursement_type_office_info cw
+		LEFT JOIN sys_office so on cw.office_id = so.id) c GROUP BY c.reimbursement_type_id) d
+		on a.id = d.reimbursement_type_id
 		${ew.customSqlSegment}
 	</select>
 
@@ -123,6 +130,93 @@
 			resultType="com.jeeplus.test.cw.reimbursementApproval.approvalType.domain.CwReimbursementTypeInfo">
 		select * from cw_reimbursement_type_info where  del_flag = '0' order by sort asc
 	</select>
+	<select id="bxList2"
+			resultType="com.jeeplus.test.cw.reimbursementApproval.approvalType.domain.CwReimbursementTypeInfo">
+		SELECT
+			t.id,
+			t.create_date,
+			t.create_by,
+			t.update_date,
+			t.update_by,
+			t.del_flag,
+			t.LEVEL,
+			t.NAME,
+			t.sort,
+			t.parent_id,
+			t.parent_ids,
+			t.office_id_list,
+			t.office_d_t_o_list
+			FROM
+				(SELECT
+					id,
+					create_date,
+					a.create_by,
+					a.update_date,
+					a.update_by,
+					a.del_flag,
+					a.LEVEL,
+					a.NAME,
+					a.sort,
+					a.parent_id,
+					a.parent_ids,
+					a.office_id_list,
+					a.office_d_t_o_list
+					FROM
+					cw_reimbursement_type_info a
+					WHERE
+					del_flag = 0
+					and a.parent_id in (SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b WHERE b.office_id = #{officeId})
+				union
+				SELECT
+					id,
+					create_date,
+					a.create_by,
+					a.update_date,
+					a.update_by,
+					a.del_flag,
+					a.LEVEL,
+					a.NAME,
+					a.sort,
+					a.parent_id,
+					a.parent_ids,
+					a.office_id_list,
+					a.office_d_t_o_list
+					FROM
+					cw_reimbursement_type_info a
+					WHERE
+					del_flag = 0
+					and a.parent_id in
+						(SELECT
+							id
+						FROM
+							cw_reimbursement_type_info a
+						WHERE
+							del_flag = 0
+							and a.parent_id in (SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b WHERE b.office_id = #{officeId})
+						)
+				UNION
+				SELECT
+			id,
+			create_date,
+			a.create_by,
+			a.update_date,
+			a.update_by,
+			a.del_flag,
+			a.LEVEL,
+			a.NAME,
+			a.sort,
+			a.parent_id,
+			a.parent_ids,
+			a.office_id_list,
+			a.office_d_t_o_list
+			FROM
+			cw_reimbursement_type_info a
+			WHERE
+			del_flag = 0
+			and a.id in (SELECT b.reimbursement_type_id FROM cw_reimbursement_type_office_info b WHERE b.office_id = #{officeId})
+						) t
+			${ew.customSqlSegment}
+	</select>
 
 	<delete id="deleteReimbursementTypeOfficeInfo">
 		delete from cw_reimbursement_type_office_info where reimbursement_type_id = #{id}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/service/CwReimbursementTypeService.java

@@ -32,6 +32,25 @@ public class CwReimbursementTypeService {
     @Resource
     private CwReimbursementTypeMapper mapper;
 
+    public List<CwReimbursementTypeInfo> bxList2(CwReimbursementTypeInfo info) {
+        LambdaQueryWrapper<CwReimbursementTypeInfo> wrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(info.getName())) {
+            wrapper.like(CwReimbursementTypeInfo::getName, info.getName());
+        }
+        if (ObjectUtil.isNotEmpty(info)) {
+            if (StringUtils.isNotBlank(info.getLike())){
+                wrapper.likeRight(CwReimbursementTypeInfo::getSort,info.getLike());
+            }
+        }
+        if (info.getSort() != null) {
+            wrapper.like(CwReimbursementTypeInfo::getSort, info.getSort());
+        }
+
+        wrapper.eq(BaseEntity::getDelFlag, 0);
+        wrapper.orderByAsc(CwReimbursementTypeInfo::getSort);
+        return mapper.bxList2(wrapper,info.getOfficeId());
+    }
+
     public List<CwReimbursementTypeInfo> list(CwReimbursementTypeInfo info) {
         LambdaQueryWrapper<CwReimbursementTypeInfo> wrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(info.getName())) {

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/controller/WareHouseController.java

@@ -79,11 +79,11 @@ public class WareHouseController {
     }
 
     /**
-     * 入库列表查询
+     * 入库记录查询
      * @param dto
      * @return
      */
-    @ApiOperation(value = "入库记录和领用记录查询")
+    @ApiOperation(value = "入库记录查询")
     @GetMapping("/wareHouseHistoryList")
     public ResponseEntity<IPage<WareHouseDto>> wareHouseHistoryList(Page<WareHouseDto> page, WareHouseDto dto) throws Exception{
         IPage<WareHouseDto> iPage = basicService.wareHouseHistoryList(page, dto);
@@ -91,11 +91,11 @@ public class WareHouseController {
     }
 
     /**
-     * 入库列表查询
+     * 领用记录查询
      * @param dto
      * @return
      */
-    @ApiOperation(value = "入库记录和领用记录查询")
+    @ApiOperation(value = "领用记录查询")
     @GetMapping("/collectHistoryList")
     public ResponseEntity<IPage<WareHouseDto>> collectHistoryList(Page<WareHouseDto> page, WareHouseDto dto) throws Exception{
         IPage<WareHouseDto> iPage = basicService.collectHistoryList(page, dto);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -34,36 +34,24 @@
 			a.id,
 			a.create_by,
 			a.create_date,
-			c.ware_house_number,
 			a.ware_house_type,
 			a.trade_name,
-			a.trade_number,
-			b.company,
-			c.ware_house_date,
-			so.name as wareHouseManOfficeName,
-			sy.name as wareHouseManName,
-			d.name as wareHouseTypeName,
-			b.trade_number as allNumber,
-			g.collect_number as borrowNumber
+			a.company,
+			c.name as wareHouseTypeName,
+			sum(trade_number) as allNumber,
+			b.collect_number as borrowNumber,
+			IFNULL((sum(trade_number) - collect_number),sum(trade_number)) as tradeNumber
 		FROM
-			material_management_warehouse_summary a
-			left join
-			(SELECT sum(trade_number) as trade_number,company,trade_name,del_flag,ware_house_man,basic_id
-			FROM
-			material_management_warehouse_detailed mater GROUP BY mater.trade_name) b
-			on a.trade_name = b.trade_name and b.del_flag = 0
-			left join sys_user sy on sy.id = b.ware_house_man
-			left join sys_office so on sy.office_id = so.id
-			left join material_management_warehouse_basics c on b.basic_id = c.id and c.del_flag = 0
-
+			material_management_warehouse_detailed a
 			left join
 			(select sum(collect_number) as collect_number,goods_name,status from material_management_collect_detailed e
-			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0 GROUP BY e.goods_name) g
-			on a.trade_name = g.goods_name and g.status = 5
+			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0 GROUP BY e.goods_name) b
+			on a.trade_name = b.goods_name and b.status = 5
 
-			left join cw_reimbursement_type_info d on a.ware_house_type = d.id
+			left join cw_reimbursement_type_info c on a.ware_house_type = c.id
 			${ew.customSqlSegment}
-		ORDER BY a.update_date DESC
+			GROUP BY a.trade_name
+			ORDER BY a.update_date DESC
 	</select>
     <select id="findRequestId" resultType="java.lang.String">
 		select id from material_management_pruchase_request_basics where purchase_no = #{purchaseNo} and del_flag = 0
@@ -71,21 +59,19 @@
 	<select id="wareHouseHistoryList"
 			resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">
 		SELECT
-			d.id as wareHouseId,
-			d.ware_house_number,
-			d.ware_house_name,
-			d.ware_house_date,
+			a.id as wareHouseId,
+			a.ware_house_number,
+			a.ware_house_name,
+			a.ware_house_date,
 			sy.name as wareHouseHandledBy,
-			so.name as wareHouseHandledByOff
+			so.name as wareHouseHandledByOff,
+			b.trade_name
 		FROM
-			material_management_warehouse_summary a
-			left join
-			(SELECT b.id,trade_name,ware_house_number,ware_house_name,ware_house_date,handled_by,handled_by_office FROM
-			material_management_warehouse_basics b LEFT JOIN
-			material_management_warehouse_detailed c on b.id = c.basic_id and c.del_flag = 0) d
-			on a.trade_name = d.trade_name
+			material_management_warehouse_basics a
+			LEFT JOIN
+			material_management_warehouse_detailed b on a.id = b.basic_id and b.del_flag = 0
 
-			left join sys_user sy on sy.id = d.handled_by
+			left join sys_user sy on sy.id = a.handled_by
 			left join sys_office so on sy.office_id = so.id
 
 			${ew.customSqlSegment}
@@ -94,22 +80,19 @@
 	<select id="collectHistoryList"
 			resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">
 		SELECT
-			g.id as collectId,
-			g.collect_no,
-			g.goods_name,
-			sy2.name as collectHandleBy,
-			so2.name as collectHandleByOff,
-			g.collect_date
+			a.id as collectId,
+			a.collect_no,
+			sy.name as collectHandleBy,
+			so.name as collectHandleByOff,
+			a.collect_date,
+			b.goods_name
 		FROM
-			material_management_warehouse_summary a
-			left join
-			(select f.id,status,collect_no,goods_name,handled_by,handled_by_office,collect_date
-			from material_management_collect_detailed e
-			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0) g
-			on a.trade_name = g.goods_name and g.status = 5
+			material_management_collect_basics a
+			LEFT JOIN
+			material_management_collect_detailed b on a.id = b.basic_id and b.del_flag = 0
 
-			left join sys_user sy2 on sy2.id = g.handled_by
-			left join sys_office so2 on sy2.office_id = so2.id
+			left join sys_user sy on sy.id = a.handled_by
+			left join sys_office so on sy.office_id = so.id
 
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -76,7 +76,7 @@ public class WareHouseBasicService {
 
         queryWrapper.eq("a.del_flag", "0");
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
-            queryWrapper.like("a.trade_name", dto.getTradeName());
+            queryWrapper.like("b.trade_name", dto.getTradeName());
         }
 
         return basicMapper.wareHouseHistoryList(page, queryWrapper);
@@ -90,7 +90,7 @@ public class WareHouseBasicService {
 
         queryWrapper.eq("a.del_flag", "0");
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
-            queryWrapper.like("a.trade_name", dto.getTradeName());
+            queryWrapper.like("b.goods_name", dto.getTradeName());
         }
 
         return basicMapper.collectHistoryList(page, queryWrapper);
@@ -118,10 +118,10 @@ public class WareHouseBasicService {
         wrapper.eq(WorkAttachment::getAttachmentId, id);
         ossServiceMapper.delete(wrapper);
         //删除入库汇总表信息
-        List<WareHouseSummary> summaryList = summaryMapper.getInfoByBasicId(id);
-        summaryList.forEach(sum->{
-            summaryMapper.deleteById(sum.getId());
-        });
+//        List<WareHouseSummary> summaryList = summaryMapper.getInfoByBasicId(id);
+//        summaryList.forEach(sum->{
+//            summaryMapper.deleteById(sum.getId());
+//        });
         return "操作成功";
     }
 
@@ -221,7 +221,7 @@ public class WareHouseBasicService {
                 idList.forEach(id->{
                     detailedMapper.deleteById(id);
                     //汇总表中的数据也删除掉
-                    summaryMapper.deleteByDetailedId(id);
+//                    summaryMapper.deleteByDetailedId(id);
                 });
             }
 
@@ -249,35 +249,35 @@ public class WareHouseBasicService {
                     }
                     //将入库详情商品信息汇总处理
                     //根据商品名称及入库类型查是否有相关数据
-                    WareHouseSummary summary = summaryMapper.getInfoByTradeName(detailInfo.getTradeName(),detailInfo.getWareHouseType());;
-                    if (null != summary) {
-                        if (summary.getTradeName().equals(detailInfo.getTradeName()) &&
-                                summary.getWareHouseType().equals(detailInfo.getWareHouseType())) {
-                            String num = Double.valueOf(detailInfo.getTradeNumber())
-                                    + Double.valueOf(summary.getTradeNumber()) + "";
-                            summary.setTradeNumber(num);
-                            summary.setWareHouseType(detailInfo.getWareHouseType());
-                            summary.setUpdateBy(userDTO.getId());
-                            summary.setUpdateDate(new Date());
-                            summary.setDetailedId(detailInfo.getId());
-                            summaryMapper.updateById(summary);
-                        }
-                    } else {
-                        summary = new WareHouseSummary();
-                        // 生成id
-                        String summaryId = UUID.randomUUID().toString().replace("-", "");
-                        summary.setDetailedId(detailInfo.getId());
-                        summary.setId(summaryId);
-                        summary.setCreateBy(userDTO.getId());
-                        summary.setCreateDate(new Date());
-                        summary.setUpdateBy(userDTO.getId());
-                        summary.setUpdateDate(new Date());
-                        summary.setDelFlag(0);
-                        summary.setWareHouseType(detailInfo.getWareHouseType());
-                        summary.setTradeName(detailInfo.getTradeName());
-                        summary.setTradeNumber(detailInfo.getTradeNumber());
-                        summaryMapper.insert(summary);
-                    }
+//                    WareHouseSummary summary = summaryMapper.getInfoByTradeName(detailInfo.getTradeName(),detailInfo.getWareHouseType());;
+//                    if (null != summary) {
+//                        if (summary.getTradeName().equals(detailInfo.getTradeName()) &&
+//                                summary.getWareHouseType().equals(detailInfo.getWareHouseType())) {
+//                            String num = Double.valueOf(detailInfo.getTradeNumber())
+//                                    + Double.valueOf(summary.getTradeNumber()) + "";
+//                            summary.setTradeNumber(num);
+//                            summary.setWareHouseType(detailInfo.getWareHouseType());
+//                            summary.setUpdateBy(userDTO.getId());
+//                            summary.setUpdateDate(new Date());
+//                            summary.setDetailedId(detailInfo.getId());
+//                            summaryMapper.updateById(summary);
+//                        }
+//                    } else {
+//                        summary = new WareHouseSummary();
+//                        // 生成id
+//                        String summaryId = UUID.randomUUID().toString().replace("-", "");
+//                        summary.setDetailedId(detailInfo.getId());
+//                        summary.setId(summaryId);
+//                        summary.setCreateBy(userDTO.getId());
+//                        summary.setCreateDate(new Date());
+//                        summary.setUpdateBy(userDTO.getId());
+//                        summary.setUpdateDate(new Date());
+//                        summary.setDelFlag(0);
+//                        summary.setWareHouseType(detailInfo.getWareHouseType());
+//                        summary.setTradeName(detailInfo.getTradeName());
+//                        summary.setTradeNumber(detailInfo.getTradeNumber());
+//                        summaryMapper.insert(summary);
+//                    }
                 } else {
                     detailInfo.setWareHouseMan(detailInfo.getWareHouseManId());
                     detailInfo.setUpdateBy(userDTO.getId());
@@ -294,35 +294,35 @@ public class WareHouseBasicService {
                     }
                     //将入库详情商品信息汇总处理
                     //根据商品名称及入库类型查是否有相关数据
-                    WareHouseSummary summary = summaryMapper.getInfoByTradeName(detailInfo.getTradeName(),detailInfo.getWareHouseType());;
-                    if (null != summary) {
-                        if (wareHouseDetailed.getTradeNumber().equals(detailInfo.getTradeNumber()) &&
-                                !wareHouseDetailed.getTradeName().equals(detailInfo.getTradeName())) {
-                            String num = Double.valueOf(detailInfo.getTradeNumber())
-                                    + Double.valueOf(summary.getTradeNumber()) + "";
-                            summary.setTradeNumber(num);
-                            summary.setUpdateBy(userDTO.getId());
-                            summary.setWareHouseType(detailInfo.getWareHouseType());
-                            summary.setUpdateDate(new Date());
-                            summary.setDetailedId(detailInfo.getId());
-                            summaryMapper.updateById(summary);
-                        }
-                    } else {
-                        summary = new WareHouseSummary();
-                        // 生成id
-                        String summaryId = UUID.randomUUID().toString().replace("-", "");
-                        summary.setDetailedId(detailInfo.getId());
-                        summary.setId(summaryId);
-                        summary.setCreateBy(userDTO.getId());
-                        summary.setCreateDate(new Date());
-                        summary.setUpdateBy(userDTO.getId());
-                        summary.setUpdateDate(new Date());
-                        summary.setDelFlag(0);
-                        summary.setWareHouseType(detailInfo.getWareHouseType());
-                        summary.setTradeName(detailInfo.getTradeName());
-                        summary.setTradeNumber(detailInfo.getTradeNumber());
-                        summaryMapper.insert(summary);
-                    }
+//                    WareHouseSummary summary = summaryMapper.getInfoByTradeName(detailInfo.getTradeName(),detailInfo.getWareHouseType());;
+//                    if (null != summary) {
+//                        if (wareHouseDetailed.getTradeNumber().equals(detailInfo.getTradeNumber()) &&
+//                                !wareHouseDetailed.getTradeName().equals(detailInfo.getTradeName())) {
+//                            String num = Double.valueOf(detailInfo.getTradeNumber())
+//                                    + Double.valueOf(summary.getTradeNumber()) + "";
+//                            summary.setTradeNumber(num);
+//                            summary.setUpdateBy(userDTO.getId());
+//                            summary.setWareHouseType(detailInfo.getWareHouseType());
+//                            summary.setUpdateDate(new Date());
+//                            summary.setDetailedId(detailInfo.getId());
+//                            summaryMapper.updateById(summary);
+//                        }
+//                    } else {
+//                        summary = new WareHouseSummary();
+//                        // 生成id
+//                        String summaryId = UUID.randomUUID().toString().replace("-", "");
+//                        summary.setDetailedId(detailInfo.getId());
+//                        summary.setId(summaryId);
+//                        summary.setCreateBy(userDTO.getId());
+//                        summary.setCreateDate(new Date());
+//                        summary.setUpdateBy(userDTO.getId());
+//                        summary.setUpdateDate(new Date());
+//                        summary.setDelFlag(0);
+//                        summary.setWareHouseType(detailInfo.getWareHouseType());
+//                        summary.setTradeName(detailInfo.getTradeName());
+//                        summary.setTradeNumber(detailInfo.getTradeNumber());
+//                        summaryMapper.insert(summary);
+//                    }
                 }
             }
         }
@@ -375,28 +375,28 @@ public class WareHouseBasicService {
                 }
                 //将入库详情商品信息汇总处理
                 //根据商品名称及入库类型查是否有相关数据
-                WareHouseSummary summary = summaryMapper.getInfoByTradeName(detailed.getTradeName(),detailed.getWareHouseType());;
-                if (null != summary) {
-                    String num = Double.valueOf(detailed.getTradeNumber())
-                            + Double.valueOf(summary.getTradeNumber()) + "";
-                    summary.setTradeNumber(num);
-                    summaryMapper.updateById(summary);
-                } else {
-                    summary = new WareHouseSummary();
-                    // 生成id
-                    String summaryId = UUID.randomUUID().toString().replace("-", "");
-                    summary.setDetailedId(detailed.getId());
-                    summary.setId(summaryId);
-                    summary.setCreateBy(userDTO.getId());
-                    summary.setCreateDate(new Date());
-                    summary.setUpdateBy(userDTO.getId());
-                    summary.setUpdateDate(new Date());
-                    summary.setDelFlag(0);
-                    summary.setWareHouseType(detailed.getWareHouseType());
-                    summary.setTradeName(detailed.getTradeName());
-                    summary.setTradeNumber(detailed.getTradeNumber());
-                    summaryMapper.insert(summary);
-                }
+//                WareHouseSummary summary = summaryMapper.getInfoByTradeName(detailed.getTradeName(),detailed.getWareHouseType());;
+//                if (null != summary) {
+//                    String num = Double.valueOf(detailed.getTradeNumber())
+//                            + Double.valueOf(summary.getTradeNumber()) + "";
+//                    summary.setTradeNumber(num);
+//                    summaryMapper.updateById(summary);
+//                } else {
+//                    summary = new WareHouseSummary();
+//                    // 生成id
+//                    String summaryId = UUID.randomUUID().toString().replace("-", "");
+//                    summary.setDetailedId(detailed.getId());
+//                    summary.setId(summaryId);
+//                    summary.setCreateBy(userDTO.getId());
+//                    summary.setCreateDate(new Date());
+//                    summary.setUpdateBy(userDTO.getId());
+//                    summary.setUpdateDate(new Date());
+//                    summary.setDelFlag(0);
+//                    summary.setWareHouseType(detailed.getWareHouseType());
+//                    summary.setTradeName(detailed.getTradeName());
+//                    summary.setTradeNumber(detailed.getTradeNumber());
+//                    summaryMapper.insert(summary);
+//                }
             }
         }
         // 保存附件列表信息
@@ -449,30 +449,30 @@ public class WareHouseBasicService {
 
         queryWrapper.eq("a.del_flag", "0");
         queryWrapper.gt("a.trade_number", "0");
-        if (StringUtils.isNotEmpty(dto.getWareHouseNumber())) {
-            queryWrapper.like("c.ware_house_number", dto.getWareHouseNumber());
-        }
+//        if (StringUtils.isNotEmpty(dto.getWareHouseNumber())) {
+//            queryWrapper.like("c.ware_house_number", dto.getWareHouseNumber());
+//        }
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
-            queryWrapper.like("b.trade_name", dto.getTradeName());
-        }
-        if (StringUtils.isNotEmpty(dto.getWareHouseMan())) {
-            queryWrapper.like("b.ware_house_man", dto.getWareHouseMan());
-        }
-        if (StringUtils.isNotEmpty(dto.getWareHouseManOffice())) {
-            queryWrapper.like("so.id", dto.getWareHouseManOffice());
+            queryWrapper.like("a.trade_name", dto.getTradeName());
         }
+//        if (StringUtils.isNotEmpty(dto.getWareHouseMan())) {
+//            queryWrapper.like("a.ware_house_man", dto.getWareHouseMan());
+//        }
+//        if (StringUtils.isNotEmpty(dto.getWareHouseManOffice())) {
+//            queryWrapper.like("so.id", dto.getWareHouseManOffice());
+//        }
 
         //入库类型
         if (StringUtils.isNotEmpty(dto.getWareHouseType())) {
-            queryWrapper.eq("d.name", dto.getWareHouseType());
+            queryWrapper.eq("c.name", dto.getWareHouseType());
         }
 
         // 入库时间
-        String[] contractDates = dto.getWareHouseDates();
-        if (contractDates != null) {
-
-            queryWrapper.between("c.ware_house_date", contractDates[0], contractDates[1]);
-        }
+//        String[] contractDates = dto.getWareHouseDates();
+//        if (contractDates != null) {
+//
+//            queryWrapper.between("c.ware_house_date", contractDates[0], contractDates[1]);
+//        }
 
         return basicMapper.summaryList(page, queryWrapper);
     }