| | |
| | | |
| | | import cn.hutool.core.bean.BeanUtil; |
| | | 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 com.alibaba.fastjson.JSON; |
| | |
| | | import com.ruoyi.basic.service.StandardTemplateService; |
| | | import com.ruoyi.common.constant.DictDataConstants; |
| | | import com.ruoyi.common.constant.InsOrderTypeConstants; |
| | | import com.ruoyi.common.constant.MenuJumpPathConstants; |
| | | import com.ruoyi.common.core.domain.entity.Custom; |
| | | import com.ruoyi.common.core.domain.entity.InformationNotification; |
| | | import com.ruoyi.common.core.domain.entity.User; |
| | |
| | | import com.ruoyi.inspect.util.HackLoopTableRenderPolicy; |
| | | import com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo; |
| | | import com.ruoyi.inspect.vo.InsOrderPlanVO; |
| | | import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper; |
| | | import com.ruoyi.performance.mapper.PerformanceShiftMapper; |
| | | import com.ruoyi.performance.mapper.ShiftTimeMapper; |
| | | import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours; |
| | | import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary; |
| | | import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursService; |
| | | import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService; |
| | | import com.ruoyi.system.mapper.CustomMapper; |
| | | import com.ruoyi.system.mapper.UserMapper; |
| | | import com.ruoyi.system.service.ISysDictTypeService; |
| | | import com.ruoyi.system.service.InformationNotificationService; |
| | | import org.apache.commons.lang3.StringUtils; |
| | | import org.apache.poi.xwpf.usermodel.*; |
| | | import org.jetbrains.annotations.NotNull; |
| | | import org.springframework.beans.factory.annotation.Value; |
| | | import org.springframework.core.io.ClassPathResource; |
| | | import org.springframework.mock.web.MockMultipartFile; |
| | | import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; |
| | | import org.springframework.stereotype.Service; |
| | |
| | | import java.math.RoundingMode; |
| | | import java.nio.file.Files; |
| | | import java.nio.file.Paths; |
| | | import java.text.SimpleDateFormat; |
| | | import java.time.LocalDate; |
| | | import java.time.LocalDateTime; |
| | | import java.time.LocalTime; |
| | | import java.time.format.DateTimeFormatter; |
| | | import java.util.*; |
| | | import java.util.concurrent.CompletableFuture; |
| | | import java.util.concurrent.atomic.AtomicBoolean; |
| | | import java.util.concurrent.atomic.AtomicInteger; |
| | | import java.util.concurrent.atomic.AtomicReference; |
| | |
| | | private InsOrderStateMapper insOrderStateMapper; |
| | | @Resource |
| | | private InsProductMapper insProductMapper; |
| | | @Resource |
| | | private ShiftTimeMapper shiftTimeMapper; |
| | | @Resource |
| | | private PerformanceShiftMapper performanceShiftMapper; |
| | | |
| | | @Value("${wordUrl}") |
| | | private String wordUrl; |
| | | @Value("${twoCode}") |
| | | private String twoCode; |
| | | @Resource |
| | | private InsReportMapper insReportMapper; |
| | | @Resource |
| | |
| | | @Resource |
| | | private InsProductUserMapper insProductUserMapper; |
| | | @Resource |
| | | private InsUnPassService insUnPassService; |
| | | @Resource |
| | | private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper; |
| | | @Resource |
| | | private AuxiliaryOutputWorkingHoursService auxiliaryOutputWorkingHoursService; |
| | | @Resource |
| | | private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService; |
| | | @Resource |
| | | private InformationNotificationService informationNotificationService; |
| | | @Resource |
| | |
| | | private CustomMapper customMapper; |
| | | @Value("${file.path}") |
| | | private String imgUrl; |
| | | |
| | | @Resource |
| | | private InsOrderFileMapper insOrderFileMapper; |
| | | @Resource |
| | |
| | | private InsOrderFactoryVerifyMapper insOrderFactoryVerifyMapper; |
| | | @Resource |
| | | private InsOrderFactoryVerifyItemService insOrderFactoryVerifyItemService; |
| | | @Value("${file.licenseUrl}") |
| | | private String licenseUrl; |
| | | |
| | | @Resource |
| | | private SpotCheckQuarterItemMapper spotCheckQuarterItemMapper; |
| | | @Resource |
| | |
| | | private InsOrderDeviceRecordService insOrderDeviceRecordService; |
| | | @Resource |
| | | private ISysDictTypeService iSysDictTypeService; |
| | | |
| | | @Resource |
| | | private InsOrderRatesService insOrderRatesService; |
| | | |
| | | @Override |
| | | public IPage<InsOrderPlanVO> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) { |
| | |
| | | } |
| | | } |
| | | |
| | | //查询检验单信息 |
| | | // 添加工时 |
| | | InsProduct finalInsProduct = insProductMapper.selectById(product.getId()); |
| | | threadPoolTaskExecutor.execute(() -> { |
| | | InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId()); |
| | | this.addAuxiliary(userId, finalInsProduct, insOrder); |
| | | }); |
| | | } |
| | | }); |
| | | String sampleIdStr = insContext.keySet().stream().findFirst().orElse(null); |
| | |
| | | @Transactional(rollbackFor = Exception.class) |
| | | public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) { |
| | | InsOrder order = insOrderMapper.selectById(orderId); |
| | | // 判断是否有重复编号, 有重复编号做提醒 |
| | | // 1. 判断是否有重复编号, 有重复编号做提醒 |
| | | Long codeCount = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery() |
| | | .ne(InsOrder::getState, -1) |
| | | .ne(InsOrder::getIfsInventoryId, order.getIfsInventoryId()) |
| | |
| | | throw new ErrorException("当前编号有重复, 请先去修改重复编号"); |
| | | } |
| | | |
| | | // 判断该订单是否是第一次生产 |
| | | // 2. 判断该订单是否是第一次生产(后续报告生成只取第一次提交时间) |
| | | if (!(order.getIsFirstSubmit() != null && order.getIsFirstSubmit().equals(1))) { |
| | | insOrderMapper.update(null, Wrappers.<InsOrder>lambdaUpdate() |
| | | .eq(InsOrder::getId, orderId) |
| | |
| | | .set(InsOrder::getFirstSubmitDate, LocalDateTime.now())); |
| | | } |
| | | |
| | | // 3. 判断是否有未检项 |
| | | 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<Integer> InsSampleIds = insSamples.stream().map(InsSample::getId).collect(Collectors.toList()); |
| | | List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, ids) |
| | | .in(InsProduct::getInsSampleId, InsSampleIds) |
| | | .eq(InsProduct::getSonLaboratory, laboratory) |
| | | .eq(InsProduct::getState, 1) |
| | | .and(wrapper -> wrapper |
| | |
| | | .or() |
| | | .eq(InsProduct::getInsResult, 2) |
| | | ) |
| | | .isNull(InsProduct::getInsFiberId) |
| | | .isNull(InsProduct::getInsFibersId) |
| | | .ne(InsProduct::getIsBinding, 1)); |
| | | insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory)); |
| | | insProducts.addAll(insProductMapper.selectFiberInsProduct(InsSampleIds, laboratory)); |
| | | if (insProducts.size() > 0) { |
| | | String str = ""; |
| | | int count = 0; |
| | | for (InsProduct product : insProducts) { |
| | | count++; |
| | | str += "<br/>" + count + ":" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>"; |
| | | |
| | | str += (count != 0 ? "\n" : "") + count + ":" + |
| | | product.getInspectionItemClass() + " " + |
| | | product.getInspectionItem() + " " + |
| | | product.getInspectionItemSubclass(); |
| | | } |
| | | if (ObjectUtils.isNotEmpty(str)) { |
| | | throw new ErrorException("<strong>存在待检验的项目:</strong><br/>" + str); |
| | | throw new ErrorException("存在待检验的项目:" + str); |
| | | } |
| | | } |
| | | |
| | | // 4.修改检测结果 |
| | | insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId) |
| | | .eq(InsOrderState::getLaboratory, laboratory) |
| | | .set(InsOrderState::getInsTime, LocalDateTime.now()) |
| | | .set(InsOrderState::getInsState, 3) |
| | | .set(InsOrderState::getVerifyUser, verifyUser)); |
| | | |
| | | // 发送消息 |
| | | |
| | | // 5.发送消息通知给复核人 |
| | | // 查询当前人信息 |
| | | Integer userId = SecurityUtils.getUserId().intValue(); |
| | | String userName = insProductMapper.selectUserById(userId).get("name"); |
| | | |
| | | // 查询发送人信息 |
| | | String sendUserAccount = insProductMapper.selectUserById(verifyUser).get("account"); |
| | | |
| | | |
| | | InformationNotification info = new InformationNotification(); |
| | | info.setCreateUser(userName); |
| | | info.setMessageType("2"); |
| | |
| | | info.setSenderId(userId); |
| | | info.setConsigneeId(verifyUser); |
| | | info.setViewStatus(false); |
| | | info.setJumpPath("b1-inspect-orderPlan-review"); |
| | | info.setJumpPath(MenuJumpPathConstants.INSPECTION_REVIEW); |
| | | informationNotificationService.addInformationNotification(info); |
| | | |
| | | //复核人--检验单相关负责人 |
| | | // 6.复核人--新增检验单相关负责人 |
| | | InsSampleUser insSampleUser = new InsSampleUser(); |
| | | insSampleUser.setUserId(verifyUser); |
| | | insSampleUser.setInsSampleId(orderId); |
| | | insSampleUser.setState(1); |
| | | insSampleUser.setSonLaboratory(laboratory); |
| | | insSampleUserMapper.insert(insSampleUser); |
| | | /*校验一下result表*/ |
| | | CompletableFuture.supplyAsync(() -> { |
| | | |
| | | // 7.校验一下result表(避免出现多个检验项结果) |
| | | threadPoolTaskExecutor.execute(() -> { |
| | | List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList()); |
| | | for (Integer ip : ips) { |
| | | List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery() |
| | |
| | | } |
| | | } |
| | | } |
| | | return null; |
| | | }); |
| | | |
| | | // 提交生成报告 |
| | | // 8.提交生成报告 |
| | | this.generateReport(orderId); |
| | | |
| | | // 添加临时pdf生成地址 |
| | | // 9.添加临时pdf生成地址 |
| | | InsReport report = insReportMapper.selectOne(Wrappers.<InsReport>lambdaQuery() |
| | | .eq(InsReport::getInsOrderId, orderId)); |
| | | String tempUrlPdf = this.wordToPdfTemp(report.getUrl().replace("/word", wordUrl)); |
| | | report.setTempUrlPdf("/word/" + tempUrlPdf); |
| | | insReportMapper.updateById(report); |
| | | |
| | | // 查询订单 |
| | | InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery() |
| | | .eq(InsSample::getInsOrderId, orderId) |
| | | .last("limit 1")); |
| | | // 查询原材料 |
| | | IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId()); |
| | | // 10.原始记录模板复制(添加备份, 避免修改原始模板影响到已经完成的单子) |
| | | this.templateCopy(orderId, InsSampleIds); |
| | | |
| | | // 删除原本模板 |
| | | insOrderStandardTemplateService.remove(Wrappers.<InsOrderStandardTemplate>lambdaQuery() |
| | | .eq(InsOrderStandardTemplate::getInsOrderId, orderId)); |
| | | // 复制模板 |
| | | Set<Integer> set = new HashSet<>(); |
| | | List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, ids) |
| | | .select(InsProduct::getTemplateId)); |
| | | |
| | | for (InsProduct product : insProductList) { |
| | | // 查询模板id |
| | | if (product.getTemplateId() != null && set.add(product.getTemplateId())) { |
| | | StandardTemplate standardTemplate = standardTemplateService.getById(product.getTemplateId()); |
| | | if (standardTemplate != null) { |
| | | InsOrderStandardTemplate insOrderStandardTemplate = new InsOrderStandardTemplate(); |
| | | insOrderStandardTemplate.setInsOrderId(orderId); |
| | | insOrderStandardTemplate.setTemplateId(standardTemplate.getId()); |
| | | insOrderStandardTemplate.setNumber(standardTemplate.getNumber()); |
| | | insOrderStandardTemplate.setName(standardTemplate.getName()); |
| | | insOrderStandardTemplate.setThing(standardTemplate.getThing()); |
| | | insOrderStandardTemplateService.save(insOrderStandardTemplate); |
| | | } |
| | | } |
| | | } |
| | | |
| | | // 成品抽样添加合格状态 |
| | | // 11.成品抽样添加合格状态 |
| | | // 判断是否有抽样信息 |
| | | if (order.getQuarterItemId() != null) { |
| | | // 判断是否有不合格 |
| | | Long unqualifiedCount = 0L; |
| | | if (CollectionUtils.isNotEmpty(insSamples)) { |
| | | unqualifiedCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).collect(Collectors.toList())) |
| | | .eq(InsProduct::getInsResult, 0)); |
| | | |
| | | // 判断如果有不合格的检验项, 判断有没有检验项复测, 复核合格也算合格通过 |
| | | if (!unqualifiedCount.equals(0L)) { |
| | | List<InsProduct> productList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).collect(Collectors.toList())) |
| | | .eq(InsProduct::getInsResult, 0)); |
| | | |
| | | boolean flag = true; |
| | | for (InsProduct insProduct : productList) { |
| | | Long unqualifiedProductCount = insUnqualifiedRetestProductMapper.selectCount(Wrappers.<InsUnqualifiedRetestProduct>lambdaQuery() |
| | | .eq(InsUnqualifiedRetestProduct::getInsProductId, insProduct.getId()) |
| | | .ne(InsUnqualifiedRetestProduct::getInsResult, 0)); |
| | | if (unqualifiedProductCount != 2) { |
| | | flag = false; |
| | | } |
| | | } |
| | | if (flag) { |
| | | unqualifiedCount = 0L; |
| | | } |
| | | } |
| | | } |
| | | spotCheckQuarterItemMapper.update(null, Wrappers.<SpotCheckQuarterItem>lambdaUpdate() |
| | | .eq(SpotCheckQuarterItem::getQuarterItemId, order.getQuarterItemId()) |
| | | .set(SpotCheckQuarterItem::getResult, unqualifiedCount.equals(0L) ? "合格" : "不合格")); |
| | | |
| | | this.addProductSpotCheck(insSamples, order); |
| | | } |
| | | |
| | | // 发送企业微信通知 |
| | | // 12.添加工时 |
| | | // 删除原本订单工时 |
| | | auxiliaryOutputWorkingHoursService.remove(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery() |
| | | .eq(AuxiliaryOutputWorkingHours::getOrderId, orderId)); |
| | | // 查询工时暂存 |
| | | List<AuxiliaryOutputWorkingHoursTemporary> hoursTemporaries = auxiliaryOutputWorkingHoursTemporaryService.list(Wrappers.<AuxiliaryOutputWorkingHoursTemporary>lambdaQuery() |
| | | .eq(AuxiliaryOutputWorkingHoursTemporary::getOrderId, orderId)); |
| | | List<AuxiliaryOutputWorkingHours> outputWorkingHours = hoursTemporaries.stream().map(hoursTemporary -> { |
| | | AuxiliaryOutputWorkingHours workingHours = new AuxiliaryOutputWorkingHours(); |
| | | BeanUtil.copyProperties(hoursTemporary, workingHours); |
| | | workingHours.setId(null); |
| | | return workingHours; |
| | | }).collect(Collectors.toList()); |
| | | auxiliaryOutputWorkingHoursService.saveBatch(outputWorkingHours); |
| | | |
| | | // 13.添加订单费用统计信息 |
| | | List<InsProduct> productList = insProductMapper.selectProductByOrderId(orderId); |
| | | // 删除原本费用信息 |
| | | insOrderRatesService.remove(Wrappers.<InsOrderRates>lambdaQuery() |
| | | .eq(InsOrderRates::getInsOrderId, orderId)); |
| | | List<InsOrderRates> orderRatesList = productList.stream().map(insProduct -> { |
| | | InsOrderRates insOrderRates = new InsOrderRates(); |
| | | insOrderRates.setInsOrderId(orderId); |
| | | insOrderRates.setInsSampleId(insProduct.getInsSampleId()); |
| | | insOrderRates.setInsProductId(insProduct.getId()); |
| | | insOrderRates.setSampleCode(insProduct.getSampleCode()); |
| | | insOrderRates.setEntrustCode(order.getEntrustCode()); |
| | | insOrderRates.setInspectionItemClass(insProduct.getInspectionItemClass()); |
| | | insOrderRates.setInspectionItem(insProduct.getInspectionItem()); |
| | | insOrderRates.setInspectionItemSubclass(insProduct.getInspectionItemSubclass()); |
| | | insOrderRates.setCableTag(insProduct.getCableTag()); |
| | | insOrderRates.setRates(insProduct.getRates()); |
| | | insOrderRates.setManHourGroup(insProduct.getManHourGroup()); |
| | | return insOrderRates; |
| | | }).collect(Collectors.toList()); |
| | | insOrderRatesService.saveBatch(orderRatesList); |
| | | |
| | | |
| | | // 14.发送企业微信通知 |
| | | // 查询原材料 |
| | | IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId()); |
| | | // 查询样品信息 |
| | | InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery() |
| | | .eq(InsSample::getInsOrderId, orderId) |
| | | .last("limit 1")); |
| | | threadPoolTaskExecutor.execute(() -> { |
| | | String message = ""; |
| | | message += "检验任务复核通知"; |
| | |
| | | } |
| | | }); |
| | | |
| | | // ifs移库 |
| | | // 15.ifs移库(原材料需要进行移库操作) --> 最后执行,因为失败无法回滚 |
| | | if (ifsInventoryQuantity != null) { |
| | | // 登记检验结果 |
| | | // 判断是否有不合格, 有不合格不能移库 |
| | |
| | | return 1; |
| | | } |
| | | |
| | | public int pxToCm(int px) { |
| | | return px / 9; |
| | | } |
| | | private void templateCopy(Integer orderId, List<Integer> ids) { |
| | | // 删除原本模板 |
| | | insOrderStandardTemplateService.remove(Wrappers.<InsOrderStandardTemplate>lambdaQuery() |
| | | .eq(InsOrderStandardTemplate::getInsOrderId, orderId)); |
| | | // 复制模板 |
| | | Set<Integer> set = new HashSet<>(); |
| | | List<InsProduct> insProductList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, ids) |
| | | .select(InsProduct::getTemplateId)); |
| | | |
| | | // 获取两个localDateTime的每一天 |
| | | public static List<LocalDateTime> getLocalDateTimesBetween(LocalDateTime start, LocalDateTime end) { |
| | | List<LocalDateTime> localDateTimes = new ArrayList<>(); |
| | | LocalDate currentDate = start.toLocalDate(); |
| | | LocalDateTime currentLocalDateTime = start; |
| | | while (!currentDate.isAfter(end.toLocalDate())) { |
| | | localDateTimes.add(currentLocalDateTime); |
| | | currentLocalDateTime = currentLocalDateTime.plusDays(1); |
| | | currentDate = currentDate.plusDays(1); |
| | | } |
| | | return localDateTimes; |
| | | } |
| | | |
| | | 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 "未知"; |
| | | for (InsProduct product : insProductList) { |
| | | // 查询模板id |
| | | if (product.getTemplateId() != null && set.add(product.getTemplateId())) { |
| | | StandardTemplate standardTemplate = standardTemplateService.getById(product.getTemplateId()); |
| | | if (standardTemplate != null) { |
| | | InsOrderStandardTemplate insOrderStandardTemplate = new InsOrderStandardTemplate(); |
| | | insOrderStandardTemplate.setInsOrderId(orderId); |
| | | insOrderStandardTemplate.setTemplateId(standardTemplate.getId()); |
| | | insOrderStandardTemplate.setNumber(standardTemplate.getNumber()); |
| | | insOrderStandardTemplate.setName(standardTemplate.getName()); |
| | | insOrderStandardTemplate.setThing(standardTemplate.getThing()); |
| | | insOrderStandardTemplateService.save(insOrderStandardTemplate); |
| | | } |
| | | } |
| | | } |
| | | } |
| | | |
| | |
| | | * @param orderId |
| | | */ |
| | | private void generateReport(Integer orderId) { |
| | | List<InsUnPass> insUnPasses = new ArrayList<>(); |
| | | /*样品下的项目只要有一个项目不合格则检验结果为0,否则为1*/ |
| | | //这里的insSamples是订单下的所有样品包括("/") |
| | | List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)); |
| | |
| | | insSample.setInsResult(1); |
| | | } |
| | | insSampleMapper.updateById(insSample); |
| | | /*复核通过后,将不合格的项目信息添加到ins_un_pass表中*/ |
| | | for (InsProduct insProduct : insProducts) { |
| | | if (insProduct.getInsResult() == 0) { |
| | | InsUnPass insUnPass = new InsUnPass(); |
| | | insUnPass.setId(null); |
| | | insUnPass.setModel(insSample.getModel()); |
| | | insUnPass.setSample(insSample.getSample()); |
| | | insUnPass.setInspectionItem(insProduct.getInspectionItem()); |
| | | insUnPass.setInspectionItemSubclass(insProduct.getInspectionItemSubclass()); |
| | | insUnPass.setLastValue(insProduct.getLastValue()); |
| | | insUnPass.setEntrustCode(insOrderMapper.selectById(orderId).getEntrustCode()); |
| | | List<Integer> userIds = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().eq(InsProductUser::getInsProductId, insProduct.getId())).stream().map(InsProductUser::getCreateUser).distinct().collect(Collectors.toList()); |
| | | String name = userMapper.selectBatchIds(userIds).stream().map(User::getName).collect(Collectors.joining(",")); |
| | | insUnPass.setName(name); |
| | | insUnPasses.add(insUnPass); |
| | | } |
| | | } |
| | | } |
| | | insUnPassService.saveBatch(insUnPasses); |
| | | InsOrder insOrder = insOrderMapper.selectById(orderId); |
| | | // 抽检变成委托检验 |
| | | if (insOrder.getOrderType().equals(InsOrderTypeConstants.SPOT_CHECK)) { |
| | |
| | | } |
| | | |
| | | /** |
| | | * 保存元此阿里进货验证原始记录 |
| | | * *****保存元此阿里进货验证原始记录***** |
| | | * @param insOrderId 订单Id |
| | | * @param examineUserId 复核人Id |
| | | * @param writeUserId 检验员Id |
| | |
| | | |
| | | |
| | | /** |
| | | * 格式化进厂验证内容 |
| | | * ***格式化进厂验证内容**** |
| | | * @param basicType |
| | | * @return |
| | | */ |
| | |
| | | } |
| | | |
| | | /** |
| | | * word转换pdf |
| | | * ***word转换pdf*** |
| | | * @param path |
| | | * @return |
| | | */ |
| | |
| | | FileOutputStream os = null; |
| | | try { |
| | | //凭证 不然切换后有水印 |
| | | InputStream is = Files.newInputStream(new File(licenseUrl).toPath()); |
| | | InputStream is = new ClassPathResource("/lib/license.xml").getInputStream(); |
| | | License license = new License(); |
| | | license.setLicense(is); |
| | | if (!license.getIsLicensed()) { |
| | | System.out.println("License验证不通过..."); |
| | | return null; |
| | | } |
| | | //生成一个空的PDF文件 |
| | |
| | | } |
| | | |
| | | /** |
| | | * 添加工时 |
| | | * @param userId |
| | | * @param insProduct |
| | | * @param insOrder |
| | | * *****修改成品抽样状态****** |
| | | * @param insSamples |
| | | * @param order |
| | | */ |
| | | private synchronized void addAuxiliary(Integer userId, InsProduct insProduct, InsOrder insOrder) { |
| | | if (insProduct.getIsBinding().equals(1)) { |
| | | return; |
| | | private void addProductSpotCheck(List<InsSample> insSamples, InsOrder order) { |
| | | Long unqualifiedCount = 0L; |
| | | if (CollectionUtils.isNotEmpty(insSamples)) { |
| | | unqualifiedCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).collect(Collectors.toList())) |
| | | .eq(InsProduct::getInsResult, 0)); |
| | | |
| | | // 判断如果有不合格的检验项, 判断有没有检验项复测, 复核合格也算合格通过 |
| | | if (!unqualifiedCount.equals(0L)) { |
| | | List<InsProduct> productList = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() |
| | | .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).collect(Collectors.toList())) |
| | | .eq(InsProduct::getInsResult, 0)); |
| | | |
| | | boolean flag = true; |
| | | for (InsProduct insProduct : productList) { |
| | | Long unqualifiedProductCount = insUnqualifiedRetestProductMapper.selectCount(Wrappers.<InsUnqualifiedRetestProduct>lambdaQuery() |
| | | .eq(InsUnqualifiedRetestProduct::getInsProductId, insProduct.getId()) |
| | | .ne(InsUnqualifiedRetestProduct::getInsResult, 0)); |
| | | if (unqualifiedProductCount != 2) { |
| | | flag = false; |
| | | } |
| | | } |
| | | if (flag) { |
| | | unqualifiedCount = 0L; |
| | | } |
| | | } |
| | | } |
| | | |
| | | //首先判断当前人的当前时间是否是排班时间内,如果不是就是加班 |
| | | LocalDateTime today = LocalDateTime.of(LocalDate.now(), LocalTime.MIDNIGHT); |
| | | |
| | | //校验如果这个人这个检测项目已经添加过了 |
| | | List<AuxiliaryOutputWorkingHours> count2s = auxiliaryOutputWorkingHoursMapper.selectList(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery() |
| | | .eq(AuxiliaryOutputWorkingHours::getCheck, userId) |
| | | .eq(AuxiliaryOutputWorkingHours::getInsProductId, insProduct.getId())); |
| | | if (CollectionUtils.isNotEmpty(count2s)) { |
| | | auxiliaryOutputWorkingHoursMapper.deleteBatchIds(count2s.stream().map(auxiliaryOutputWorkingHours -> auxiliaryOutputWorkingHours.getId()).collect(Collectors.toList())); |
| | | } |
| | | if (ObjectUtils.isNotEmpty(insProduct.getManHour()) && StringUtils.isNotBlank(insProduct.getLastValue())) { |
| | | AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours(); |
| | | auxiliaryOutputWorkingHours.setInspectionItemClass(insProduct.getInspectionItemClass());//检测项分类 |
| | | auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//检测父项 |
| | | auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//检测子项 |
| | | auxiliaryOutputWorkingHours.setSample(insSampleMapper.selectById(insProduct.getInsSampleId()).getSampleCode());//样品编号 |
| | | auxiliaryOutputWorkingHours.setOrderId(insOrder.getId());//订单id |
| | | auxiliaryOutputWorkingHours.setOrderNo(insOrder.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 |
| | | |
| | | auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours); |
| | | |
| | | } |
| | | spotCheckQuarterItemMapper.update(null, Wrappers.<SpotCheckQuarterItem>lambdaUpdate() |
| | | .eq(SpotCheckQuarterItem::getQuarterItemId, order.getQuarterItemId()) |
| | | .set(SpotCheckQuarterItem::getResult, unqualifiedCount.equals(0L) ? "合格" : "不合格")); |
| | | } |
| | | |
| | | } |