lims项目框架修改优化--后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zhuo
2025-02-28 3aac0bf15ae2942f9b810715946be8a7588004ec 
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java


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


package com.ruoyi.inspect.service.impl;




import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.date.DateTime;


import cn.hutool.core.date.DateUtil;


import cn.hutool.core.util.ObjectUtil;


import cn.hutool.core.util.StrUtil;


import cn.hutool.json.JSONUtil;


@@ -31,10 +33,14 @@


import com.ruoyi.inspect.mapper.*;


import com.ruoyi.inspect.pojo.*;


import com.ruoyi.inspect.service.InsOrderService;


import com.ruoyi.inspect.service.InsOrderStateService;


import com.ruoyi.inspect.service.InsProductService;


import com.ruoyi.inspect.service.InsSampleService;


import com.ruoyi.inspect.vo.InsOrderPrintingVo;


import com.ruoyi.inspect.vo.SampleDefectsFatherVo;


import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;


import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;


import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;


import com.ruoyi.system.mapper.CustomMapper;


import com.ruoyi.system.mapper.UserMapper;


import lombok.AllArgsConstructor;


@@ -47,6 +53,7 @@


import java.io.IOException;


import java.math.BigDecimal;


import java.net.URLEncoder;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.Month;


@@ -70,18 +77,17 @@


    private InsSampleMapper insSampleMapper;


    private InsProductService insProductService;


    private InsProductMapper insProductMapper;


    private InsProductUserMapper insProductUserMapper;


    private InsSampleUserMapper insSampleUserMapper;


    private InsOrderStateMapper insOrderStateMapper;


    private InsOrderStateService insOrderStateService;


    private UserMapper userMapper;


    private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;


    private CustomMapper customMapper;


    private final NumberGenerator<InsOrder> numberGenerator;


    private InsReportMapper insReportMapper;


    private InsUnqualifiedRetestProductMapper insUnqualifiedRetestProductMapper;


    private IfsApiUtils ifsApiUtils;


    private SpotCheckQuarterItemMapper spotCheckQuarterItemMapper;


    private StandardProductListMapper standardProductListMapper;


    private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService;








@@ -100,6 +106,11 @@


    }






    /**


     * 分配检验人


     *


     * @return


     */


    @Override


    @Transactional(rollbackFor = Exception.class)


    public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId, String sonLaboratory) {


@@ -108,13 +119,15 @@


        insOrder.setAppointed(StringUtils.isNotEmpty(appointed) ? LocalDate.parse(appointed) : null);


        insOrder.setSendTime(LocalDateTime.now());


        insOrderMapper.updateById(insOrder);


        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));


        List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());


        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));


        List<Integer> ids = insSamples.stream().map(InsSample::getId).collect(Collectors.toList());


        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()


                .in(InsProduct::getInsSampleId, ids)


                .eq(InsProduct::getState, 1)


                .select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));


        for (InsProduct insProduct : insProducts) {




        // 批量添加检验任务状态表


        List<InsOrderState> insOrderStateList = insProducts.stream().map(insProduct -> {


            InsOrderState insOrderState = new InsOrderState();


            insOrderState.setInsOrderId(orderId);


            try {


@@ -123,8 +136,10 @@


                throw new ErrorException("该检验单有未维护实验室的检验项目");


            }


            insOrderState.setInsState(0);


            insOrderStateMapper.insert(insOrderState);


        }


            return insOrderState;


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


        insOrderStateService.saveBatch(insOrderStateList);




        if (userId != null) {


            InsSampleUser insSampleUser = new InsSampleUser();


            insSampleUser.setState(0);


@@ -144,7 +159,79 @@


            spotCheckQuarterItem.setSamplingUser(user.getName());


            spotCheckQuarterItemMapper.updateById(spotCheckQuarterItem);


        }






        // 创建工时暂存


        // 缓存样品id, 编号map


        Map<Integer, String> sampleMap = insSamples.stream().collect(Collectors.toMap(InsSample::getId, InsSample::getSampleCode));


        List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()


                .in(InsProduct::getInsSampleId, ids)


                .eq(InsProduct::getState, 1));


        List<AuxiliaryOutputWorkingHoursTemporary> outputWorkingHours = insProductList.stream().map(insProduct -> {


            AuxiliaryOutputWorkingHoursTemporary auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHoursTemporary();


            auxiliaryOutputWorkingHours.setInspectionItemClass(insProduct.getInspectionItemClass());//检测项分类


            auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//检测父项


            auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//检测子项


            auxiliaryOutputWorkingHours.setSample(sampleMap.get(insProduct.getInsSampleId()));//样品编号


            auxiliaryOutputWorkingHours.setOrderId(order.getId());//订单id


            auxiliaryOutputWorkingHours.setOrderNo(order.getEntrustCode());//非加班委托单号


            auxiliaryOutputWorkingHours.setWorkTime(insProduct.getManHour());//非加班工时


            auxiliaryOutputWorkingHours.setAmount(1);//非加班数量


            auxiliaryOutputWorkingHours.setOutputWorkTime((ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getOvertimeWorkTime()) ? auxiliaryOutputWorkingHours.getOvertimeWorkTime() : BigDecimal.ZERO).add(ObjectUtils.isNotEmpty(auxiliaryOutputWorkingHours.getWorkTime()) ? auxiliaryOutputWorkingHours.getWorkTime() : BigDecimal.ZERO));//产量工时


            auxiliaryOutputWorkingHours.setManHourGroup(insProduct.getManHourGroup());//工时分组


            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");


            DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");


            auxiliaryOutputWorkingHours.setDateTime(LocalDateTime.now().toLocalDate().atStartOfDay().format(formatters));//日期


            LocalDateTime localDateTime = LocalDateTime.now();


            DateTime parse = DateUtil.parse(localDateTime.format(formatter));


            auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//星期


            auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//周次


            auxiliaryOutputWorkingHours.setCheck(userId);//检测人


            auxiliaryOutputWorkingHours.setPrice(insProduct.getPrice());//单价


            auxiliaryOutputWorkingHours.setSampleId(insProduct.getInsSampleId());//样品id


            auxiliaryOutputWorkingHours.setInsProductId(insProduct.getId());//检验项id




            return auxiliaryOutputWorkingHours;


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


        auxiliaryOutputWorkingHoursTemporaryService.saveBatch(outputWorkingHours);




        return 1;


    }




    public static String getWeek(String dayStr) {


        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        try {


            Date date = sdf.parse(dayStr);


            Calendar calendar = Calendar.getInstance();


            calendar.setTime(date);


            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);


            int day = calendar.get(Calendar.DAY_OF_MONTH);


            return getWeekDay(dayOfWeek);


        } catch (Exception e) {


            e.printStackTrace();


        }


        return null;


    }




    public static String getWeekDay(int dayOfWeek) {


        switch (dayOfWeek) {


            case Calendar.MONDAY:


                return "周一";


            case Calendar.TUESDAY:


                return "周二";


            case Calendar.WEDNESDAY:


                return "周三";


            case Calendar.THURSDAY:


                return "周四";


            case Calendar.FRIDAY:


                return "周五";


            case Calendar.SATURDAY:


                return "周六";


            case Calendar.SUNDAY:


                return "周日";


            default:


                return "未知";


        }


    }




    @Override


@@ -284,9 +371,11 @@


                        .set(IfsInventoryQuantity::getInspectStatus, 0));


            }




            // 审核检验单


            upInsOrderOfState(insOrder);


            upInsOrder(insOrder.getId(), null, appointed != null ? appointed.toString() : null, SecurityUtils.getUserId().intValue(), "原材料");




            // 分配检验人


            upInsOrder(insOrder.getId(), null, appointed != null ? appointed.toString() : null, SecurityUtils.getUserId().intValue(), "原材料");




            // 根据零件号判断是否是辅材


            boolean isRaw = false;


@@ -377,6 +466,11 @@


        return map;


    }




    /**


     * 审核检验单


     * @param insOrder


     * @return


     */


    @Override


    public int upInsOrderOfState(InsOrder insOrder) {


        insOrder.setExamineTime(LocalDateTime.now());


@@ -444,16 +538,6 @@


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


        InsOrder insOrder = insOrderMapper.selectById(id);


        List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);


        for (SampleProductDto sampleProductDto : list) {


            List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());


            List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()


                    .in(InsProductUser::getInsProductId, ids));


            if (CollectionUtils.isNotEmpty(insProductUsers)) {


                List<Integer> userIds = insProductUsers.stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList());


                String collect = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(","));


                sampleProductDto.setCheckName(collect);


            }


        }


        map.put("insOrder", insOrder);


        map.put("sampleProduct", list);


        //查询所有记录模版去重