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

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

@@ -3,6 +3,7 @@ package com.jeeplus.test.cw.reimbursementApproval.approvalType.service;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.flowable.common.handler.CollectionUtils;
 import com.jeeplus.sys.service.dto.OfficeDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
@@ -16,6 +17,7 @@ import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -151,8 +153,12 @@ public class CwReimbursementTypeService {
             mapper.deleteReimbursementTypeOfficeInfo(info.getId());
             //将新的关联信息进行保存
             mapper.saveReimbursementTypeOfficeInfo(info.getId(),info.getOfficeIdList());
-            info.setOfficeIdList(null);
+//            info.setOfficeIdList(null);
+        } else if (null != info.getOfficeIdList() && info.getOfficeIdList().isEmpty()){
+            //首先删除原有关联信息
+            mapper.deleteReimbursementTypeOfficeInfo(info.getId());
         }
+        info.setOfficeIdList(null);
         mapper.updateById(info);
         return "操作完成";
     }

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

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

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

@@ -23,5 +23,7 @@ public interface WareHouseBasicMapper extends BaseMapper<WareHouseBasic> {
 
     IPage<WareHouseDto> wareHouseHistoryList(Page<WareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<WareHouseDto> queryWrapper);
 
+    IPage<WareHouseDto> collectHistoryList(Page<WareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<WareHouseDto> queryWrapper);
+
     String findRequestId(String purchaseNo);
 }

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

@@ -47,13 +47,17 @@
 			g.collect_number as borrowNumber
 		FROM
 			material_management_warehouse_summary a
-			left join material_management_warehouse_detailed b on a.detailed_id = b.id and b.del_flag = 0
+			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
 
 			left join
-			(select collect_number,goods_name,status from material_management_collect_detailed e
+			(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) g
 			on a.trade_name = g.goods_name and g.status = 5
 
@@ -72,7 +76,24 @@
 			d.ware_house_name,
 			d.ware_house_date,
 			sy.name as wareHouseHandledBy,
-			so.name as wareHouseHandledByOff,
+			so.name as wareHouseHandledByOff
+		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
+
+			left join sys_user sy on sy.id = d.handled_by
+			left join sys_office so on sy.office_id = so.id
+
+			${ew.customSqlSegment}
+		ORDER BY a.update_date DESC
+	</select>
+	<select id="collectHistoryList"
+			resultType="com.jeeplus.test.materialManagement.wareHouse.service.dto.WareHouseDto">
+		SELECT
 			g.id as collectId,
 			g.collect_no,
 			g.goods_name,
@@ -82,19 +103,11 @@
 		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
-			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
 
-			left join sys_user sy on sy.id = d.handled_by
-			left join sys_office so on sy.office_id = so.id
-
 			left join sys_user sy2 on sy2.id = g.handled_by
 			left join sys_office so2 on sy2.office_id = so2.id
 

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

@@ -82,6 +82,20 @@ public class WareHouseBasicService {
         return basicMapper.wareHouseHistoryList(page, queryWrapper);
     }
 
+    /**
+     * 列表查询
+     */
+    public IPage<WareHouseDto> collectHistoryList(Page<WareHouseDto> page , WareHouseDto dto) throws Exception{
+        QueryWrapper<WareHouseDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, WareHouseDto.class);
+
+        queryWrapper.eq("a.del_flag", "0");
+        if (StringUtils.isNotEmpty(dto.getTradeName())) {
+            queryWrapper.like("a.trade_name", dto.getTradeName());
+        }
+
+        return basicMapper.collectHistoryList(page, queryWrapper);
+    }
+
     public String remove(String id) {
         // 删除基础信息表
         basicMapper.deleteById(id);