低值易耗品管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
cy
2023-12-09 7c40b902af2ae09b353525f913056d66af12caf1 
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java


@@ -6,8 +6,6 @@


import com.consum.base.BaseController;


import com.consum.base.core.utils.CommonUtil;


import com.consum.base.core.utils.IdUtil;


import com.consum.base.core.utils.MapUtils;


import com.consum.base.core.utils.MapperUtil;


import com.consum.base.pojo.GoodsUseRecordVO;


import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;


import com.consum.base.pojo.RecordUserInfoVO;


@@ -19,20 +17,12 @@


import com.consum.base.pojo.request.ProcureModelInfoParam;


import com.consum.base.pojo.request.RecordInfoParam;


import com.consum.base.pojo.response.FormTransferVO;


import com.consum.base.pojo.response.FromTransferTemplateInfoVO;


import com.consum.base.pojo.response.GoodsTemplateCountVO;


import com.consum.base.pojo.response.LWHFromTransferExtendVO;


import com.consum.base.pojo.response.TransferInfoVO;


import com.consum.base.service.BaseWarehouseServiceImpl;


import com.consum.base.service.LWhFormTransferCoreService;


import com.consum.base.service.LWhFormTransferService;


import com.consum.base.service.LWhProcureModelService;


import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;


import com.consum.base.service.LWhProcureModelUserServiceImpl;


import com.consum.model.po.BaseWarehouse;


import com.consum.model.po.FinSysTenantUser;


import com.consum.model.po.LWhFormTransfer;


import com.consum.model.po.LWhProcureModelUser;


import com.consum.model.po.LWhProcureModelUserRecord;


import com.consum.base.service.*;


import com.consum.base.service.impl.LWhFormTransferCoreService;


import com.consum.model.po.*;


import com.iplatform.model.po.S_user_core;


import com.walker.db.page.GenericPager;


import com.walker.infrastructure.utils.CollectionUtils;


@@ -42,15 +32,6 @@


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import java.lang.reflect.Field;


import java.util.ArrayList;


import java.util.Comparator;


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.Optional;


import java.util.stream.Collectors;


import javax.servlet.http.HttpServletResponse;


import org.apache.commons.compress.utils.Lists;


import org.apache.poi.ss.usermodel.Workbook;


import org.springframework.beans.BeanUtils;


@@ -59,6 +40,11 @@


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import javax.servlet.http.HttpServletResponse;


import java.lang.reflect.Field;


import java.util.*;


import java.util.stream.Collectors;




/**


 * @Description 调拨管理


@@ -77,11 +63,13 @@


    @Autowired


    private LWhFormTransferCoreService lWhFormTransferCoreService;


    @Autowired


    private LWhProcureModelUserServiceImpl lWhProcureModelUserService;


    private LWhProcureModelUserService lWhProcureModelUserService;


    @Autowired


    private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;


    private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;


    @Autowired


    private BaseWarehouseServiceImpl baseWarehouseService;


    private BaseWarehouseService baseWarehouseService;


    @Autowired


    private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;




    /**


     * @Description 新增


@@ -106,13 +94,14 @@


        long id = this.lWhFormTransferService.add(param, this.getSysInfo());




        Integer transferBusinessType = param.getTransferBusinessType();


        //部门分发业务需要处理


        // 部门分发业务需要处理


        if (transferBusinessType == 1) {


            // 先出库，再入库


            // 出库前 设置出库仓库


            FinSysTenantUser sysTenantUser = this.getSysInfo();


            String agencyId = sysTenantUser.getTenantId();


            List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1);


            List<BaseWarehouse> baseWarehouseList =


                baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1);


            if (CollectionUtils.isEmpty(baseWarehouseList)) {


                return ResponseValue.error("机构无默认仓库！");


            }


@@ -135,17 +124,15 @@


     * @Description 列表查询(调拨明细)


     * @Author 卢庆阳


     * @Date 2023/10/30


     * <p>


     * 1.查询调拨单


     * <p>


     * 2.查询物品型号


     *       <p>


     *       1.查询调拨单


     *       <p>


     *       2.查询物品型号


     */


    @ApiOperation(value = "单据列表查询", notes = "单据列表查询")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "page", value = "页码", required = true, dataType = "int"),


    @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页码", required = true, dataType = "int"),


        @ApiImplicitParam(name = "size", value = "每页条数", required = true, dataType = "int"),


        @ApiImplicitParam(name = "param", value = "条件参数", required = true, dataType = "TransferQry"),


    })


        @ApiImplicitParam(name = "param", value = "条件参数", required = true, dataType = "TransferQry"),})


    @GetMapping("/list")


    public ResponseValue queryFormTransferList() {


        TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);


@@ -166,29 +153,18 @@


                FormTransferVO formTransferVO = new FormTransferVO();


                BeanUtils.copyProperties(item, formTransferVO);




                List<FromTransferTemplateInfoVO> templateInfoList = Lists.newArrayList();




                // 查询型号数量


                String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM "


                    + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id "


                    + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id "


                    + "WHERE pm.BUSINESS_ID =:id GROUP BY bgm.GOODS_TEMPLATES_ID";


                Map<String, Object> paramMap = new HashMap<>();


                paramMap.put("id", item.getId());


                List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());


                for (Map<String, Object> map : procureModelList) {


                    FromTransferTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromTransferTemplateInfoVO.class);


                    templateInfoList.add(procureTemplateInfoVO);


                }


                formTransferVO.setFromTransferTemplateInfoList(templateInfoList);


                List<GoodsTemplateCountVO> goodsTemplateCount =


                    lWhProcureModelService.getGoodsTemplateCountByBusinessId(item.getId());


                formTransferVO.setFromTransferTemplateInfoList(goodsTemplateCount);




                result.add(formTransferVO);


            });


        }


        try {


            Field fieldDatas = GenericPager.class.getDeclaredField("datas");


//            fieldDatas.setAccessible(true);


//            fieldDatas.set(genericPager, result);


            // fieldDatas.setAccessible(true);


            // fieldDatas.set(genericPager, result);


            ReflectUtil.setFieldValue(genericPager, fieldDatas, result);




        } catch (Exception e) {


@@ -203,9 +179,7 @@


     * @Date 2023/10/30


     */


    @ApiOperation(value = "根据id查询详情", notes = "根据id查询详情")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),})


    @GetMapping("/detail")


    public ResponseValue getById(Long id) {


        if (id == null) {


@@ -216,9 +190,7 @@


    }




    @ApiOperation(value = "调拨明细列表", notes = "调拨明细列表")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "param", value = "条件", required = true, dataType = "TransferQry"),


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "条件", required = true, dataType = "TransferQry"),})


    @GetMapping("/detail/list")


    public ResponseValue queryFormTransferDetailList() {


        TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);


@@ -242,9 +214,7 @@


     * @date 2023/10/31


     */


    @ApiOperation(value = "撤销", notes = "撤销")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),})


    @PostMapping("/updStatus")


    public ResponseValue updateStatus(Long id) {


        if (id == null) {


@@ -261,9 +231,7 @@


     * @Date 2023/10/31


     */


    @ApiOperation(value = "调拨入库", notes = "调拨入库")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),})


    @PostMapping("/income")


    public ResponseValue income(Long id) {


        lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());


@@ -276,15 +244,14 @@


     * @Date 2023/10/31


     */


    @ApiOperation(value = "调拨出库", notes = "调拨出库")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),})


    @PostMapping("/output")


    public ResponseValue output(Long id) {


        // 出库前 设置出库仓库


        FinSysTenantUser sysTenantUser = this.getSysInfo();


        String agencyId = sysTenantUser.getTenantId();


        List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1);


        List<BaseWarehouse> baseWarehouseList =


            baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short)1, (short)1);


        if (CollectionUtils.isEmpty(baseWarehouseList)) {


            return ResponseValue.error("机构无默认仓库！");


        }


@@ -295,16 +262,14 @@


        lWhFormTransfer.setOutWarehouseId(wareHouseId);


        lWhFormTransfer.setOutWarehouseName(warehouseName);


        lWhFormTransferService.update(lWhFormTransfer);


        lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());


        // lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());


        lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());


        return ResponseValue.success();


    }






    @ApiOperation(value = "调拨单导出", notes = "调拨单导出")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),


        @ApiImplicitParam(name = "type", value = "导出类型 1 入库 2 出库", required = true, dataType = "Integer"),


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "调拨单id", required = true, dataType = "Long"),


        @ApiImplicitParam(name = "type", value = "导出类型 1 入库 2 出库", required = true, dataType = "Integer"),})


    @GetMapping("/list/export")


    public void export(Long id, Integer type, HttpServletResponse response) throws Exception {




@@ -320,8 +285,10 @@


        params.setHeadingStartRow(2);


        List<TransferExcelTemplate> export = this.lWhFormTransferService.export(id, type);




        int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();


        int totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToInt(TransferExcelTemplate::getTotalAmount).sum();


        int countNum =


            export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();


        double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null)


            .mapToDouble(TransferExcelTemplate::getAmount).sum();


        Optional<TransferExcelTemplate> first = export.stream().findFirst();


        TransferExcelTemplate entity = first.get();


        String businessFormCode = entity.getBusinessFormCode();


@@ -342,7 +309,6 @@




    }






    /**


     * 部门物品分发列表明细


     *


@@ -350,9 +316,7 @@


     * @return


     */


    @ApiOperation(value = "部门物品分发列表明细", notes = "部门物品分发列表明细")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "transferQryDto", value = "调拨单查询条件", required = true)


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "transferQryDto", value = "调拨单查询条件", required = true)})


    @GetMapping("/department/list")


    public ResponseValue departmentTransferList() {


        TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);


@@ -360,19 +324,21 @@


        CommonUtil.copyProperties(param, param2);


        param = param2;




        S_user_core currentUser = this.getCurrentUser();


        if (currentUser == null) {


        FinSysTenantUser sysInfo = this.getSysInfo();


        if (sysInfo == null) {


            return ResponseValue.error("登录用户信息不存在");


        }


        GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(param);


        String tenantId = sysInfo.getTenantId();


        if (param.getOutAgencyId() == null) {


            param.setOutAgencyId(Long.valueOf(tenantId));


        }


        GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager =


            this.lWhFormTransferService.queryTransferInfo(param);


        return ResponseValue.success(transferInfoDetailsVoGenericPager);


    }






    @ApiOperation(value = "使用人修改", notes = "使用人修改")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "procureModelInfoDto", value = "使用信息", required = true)


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "procureModelInfoDto", value = "使用信息", required = true)})


    @PostMapping("/useInfo/update")


    public ResponseValue infoUpdate() {




@@ -419,12 +385,18 @@


                    lWhProcureModelUser.setNowUserPhone(item.getPhone());


                    lWhProcureModelUser.setNowUserName(item.getUserName());


                    lWhProcureModelUser.setGoodsNum(item.getCount());




                    // 设置一下在用数量


                    Long oldProcureModelId = item.getOldProcureModelId();


                    LWhProcureModelUser oldInfo = lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));


                    lWhProcureModelUser.setUseCount(oldInfo.getUseCount());


                    procureModelUserList.add(lWhProcureModelUser);


                }




                lWhProcureModelUserService.insert(procureModelUserList);


            }




            // 使用人修改调用


            lGoodsUserRecordCoreService.modifyGoodsUser(null, lWhProcureModelUserRecord.getId());


        }




        return ResponseValue.success();


@@ -437,84 +409,65 @@


     * @return


     */


    @ApiOperation(value = "部门物品使用人记录", notes = "部门物品使用人记录")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "transferOrderId", value = "调拨单id", required = true)


    })


    @ApiImplicitParams({@ApiImplicitParam(name = "transferOrderId", value = "调拨单id", required = true)})


    @GetMapping("/use/record")


    public ResponseValue useRecord(Long transferOrderId) {




        S_user_core currentUser = this.getCurrentUser();


        if (currentUser == null) {


            return ResponseValue.error("登录用户信息不存在");


        }




        List<UseRecordDTO> useRecordDTOList = lWhProcureModelUserService.selectUseRecord(transferOrderId);


        if (CollectionUtils.isEmpty(useRecordDTOList)) {


            return ResponseValue.error("未查询到使用记录");


        }


        List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();


        //分组


        Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream()


            .collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));


        //开始循环collect


        for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {


            Long id = entry.getKey();


            Map<Long, List<UseRecordDTO>> value = entry.getValue();


            //开始循环value


            List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList();


            for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) {


                List<UseRecordDTO> list = item.getValue();


                List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();


                for (UseRecordDTO useRecordDto : list) {




                    GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();


                    goodsUseRecordVO.setId(id);


                    goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());


                    goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());


        List<GoodsUseRecordVO> goodsUseRecordList = useRecordDTOList.stream()


            .collect(Collectors.groupingBy(UseRecordDTO::getId)).entrySet().stream().map(entry -> {


                Long id = entry.getKey();


                List<UseRecordDTO> useRecordList = entry.getValue();


                UseRecordDTO useRecordDto = useRecordList.get(0);




                    UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();


                    useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());


                    useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());


                    useRecordSkuVO.setUnit(useRecordDto.getUnit());


                    useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());


                GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();


                goodsUseRecordVO.setId(id);


                goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());


                goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());




                    RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();


                    recordUserInfoVO.setUseName(useRecordDto.getUseName());


                    recordUserInfoVO.setPhone(useRecordDto.getPhone());


                    recordUserInfoVO.setNum(useRecordDto.getNum());


                    recordUserInfoList.add(recordUserInfoVO);


                    useRecordSkuVO.setRecordUserInfos(recordUserInfoList);


                    useRecordSkuList.add(useRecordSkuVO);


                    goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);


                    goodsUseRecordList.add(goodsUseRecordVO);


                }


            }


        }


        //分组之后重新排序


        List<GoodsUseRecordVO> result = goodsUseRecordList.stream()


            .sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime


                , Comparator.nullsFirst(Long::compareTo)).reversed())


                List<UseRecordSkuVO> useRecordSkuList =


                    useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)).values()


                        .stream().map(recordList -> {


                            UseRecordDTO useRecordDTO = recordList.get(0);


                            UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();


                            useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());


                            useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());


                            useRecordSkuVO.setUnit(useRecordDTO.getUnit());


                            useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());




                            List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {


                                RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();


                                recordUserInfoVO.setOldProcureModelId(userInfo.getOldProcureModelId());


                                recordUserInfoVO.setUseName(userInfo.getUseName());


                                recordUserInfoVO.setPhone(userInfo.getPhone());


                                recordUserInfoVO.setNum(userInfo.getNum());


                                return recordUserInfoVO;


                            }).collect(Collectors.toList());




                            useRecordSkuVO.setRecordUserInfos(recordUserInfoList);


                            return useRecordSkuVO;


                        }).collect(Collectors.toList());




                goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);


                return goodsUseRecordVO;


            }).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))


                .reversed())


            .collect(Collectors.toList());


        return ResponseValue.success(result);


    }






    @ApiOperation(value = "查询部门下的分发单", notes = "查询部门下的分发单")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long", paramType = "query")


    })


    @GetMapping("/query/detail")


    public ResponseValue queryDepartmentTransferOrder(Long agencyId) {




        TransferInfoVO transferInfoVO = new TransferInfoVO();




        lWhFormTransferService.queryDepartmentTransferOrder();


        return ResponseValue.success(transferInfoVO);


        return ResponseValue.success(goodsUseRecordList);


    }




    @ApiOperation(value = "查询部门下的分发单", notes = "查询部门下的分发单")


    @ApiImplicitParams({


        @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long", paramType = "query")


    })


        @ApiImplicitParam(name = "agencyId", value = "机构id", required = true, dataType = "Long", paramType = "query")})


    @GetMapping("/query/transfList")


    public ResponseValue queryDepartmentTransferOrderList() {