采样管理插入数据时判断项目是否存在

zhaowenxuan

2025-03-26 17539021d35748ec5eb3fef1f677f221a95a34a8

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -1106,7 +1106,8 @@
//        if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;


        String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
//        String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
        String tjNumber = idUtils.getTjNumber();
        if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
        tjOrder.setTjNumber(tjNumber);

@@ -1457,6 +1458,8 @@
            Date date = new Date();
            String format = DateUtil.format(date, "yyMMddHHmmssSSS");
            for (TjOrderDetail detail : detailList) {
                int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId()));
                if(i>0) continue;
                TjSampling sampling = new TjSampling();
                if (null == projectService.getById(detail.getProId())) continue;
                TjProject project = projectService.getById(detail.getProId());
@@ -1899,7 +1902,8 @@

            //获取拼接前缀
            String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
//            String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
            String tjNumber = idUtils.getTjNumber();
            if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;


@@ -3952,9 +3956,8 @@
    public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {

        if (null != dtos && !dtos.isEmpty()) {
            int index = 0;
            boolean flag = false;
            for (UpdateTransitionnewPriceDto dto : dtos) {
                index++;
                LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
                wq.eq(TbTransition::getCusId, dto.getCusIdCard());
                wq.eq(TbTransition::getParentProId, dto.getParentProId());
@@ -3964,48 +3967,32 @@
                log.info("父项目id为: " + dto.getParentProId());
                log.info("折扣为: " + new BigDecimal(dto.getDiscount()));
                if (null != list && !list.isEmpty()) {

                    for (TbTransition transition : list) {
                        BigDecimal ordPrice = transition.getOrdPrice();
                        BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
                        log.info("后端计算的金额: " + multiply.toString());
                        transition.setNowPrice(multiply);
                        transition.setDiscount(new BigDecimal(dto.getDiscount()));
                        transitionService.updateById(transition);
                    }

                    BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
                    log.info("dxzj:{}",dxzj.toString());
                    if (index == dtos.size()){
                        BigDecimal yhj = dto.getYhj();
                        log.info("前端传递的价格：{}",yhj.toString());
                        BigDecimal cj = yhj.subtract(dxzj);
                        log.info("计算的差价：{}",cj.toString());
                        int index1 = 0;
                        for (TbTransition transition : list) {
                            BigDecimal ordPrice = transition.getOrdPrice();
                            BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
                            if (index1 == 0){
                                log.info("修改小项 {}{} 原本价格:{}",transition.getProId(),transition.getProName(),multiply.toString());
                                multiply = multiply.add(cj);
                                log.info("增加差价后：{}",multiply.toString());
                            }
                            index1++;
                            log.info("后端计算的金额: " + multiply.toString());
//                        log.info("前端传递的金额: " + dto.getYhj());
                            transition.setNowPrice(multiply);
                            transition.setDiscount(new BigDecimal(dto.getDiscount()));

                    BigDecimal yhj = dto.getYhj();
                    log.info("前端传递的价格：{}",yhj.toString());
                    BigDecimal cj = yhj.subtract(dxzj);
                    log.info("计算的差价：{}",cj.toString());
                    for (TbTransition transition : list) {
                        BigDecimal result = transition.getNowPrice().add(cj);
                        log.info("补上差价前的价格为：{}",transition.getNowPrice().toString());
                        if (result.compareTo(BigDecimal.ZERO)>0 && !flag && cj.compareTo(BigDecimal.ZERO) != 0){
                            transition.setNowPrice(result);
                            transitionService.updateById(transition);
                            log.info("修改 补上差价后的价格为：{}",result.toString());
                            flag = true;
                            break;
                        }
                    }else {
                        for (TbTransition transition : list) {
                            BigDecimal ordPrice = transition.getOrdPrice();
                            BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
                            log.info("后端计算的金额: " + multiply.toString());
//                        log.info("前端传递的金额: " + dto.getYhj());
                            transition.setNowPrice(multiply);
                            transition.setDiscount(new BigDecimal(dto.getDiscount()));
                            transitionService.updateById(transition);
                        }
//                        if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
//                            List<TbTransition> transitionList = list.stream().filter(a ->
//                                    transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
//                            if (!transitionList.isEmpty()) {
//                                TbTransition tbTransition = transitionList.get(0);
//                                tbTransition.setNowPrice(dxzj);
//                                transitionService.updateById(tbTransition);
//                            }
//                        }
                    }
                }
            }