Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-06 b939331cf60d3bb36ee8aa208cf05c3a5a04415f

Merge remote-tracking branch 'origin/master'

 framework/src/main/java/com/yuanchu/mom/annotation/ValueTableShow.java

@@ -10,6 +10,6 @@

    String name() default "";

    int width() default 100;
    int width() default 0;

}

 framework/src/main/java/com/yuanchu/mom/common/PrintChina.java

@@ -35,9 +35,11 @@
                }
                soundVo.put("label", field.getName());
                soundVo.put("value", value);
                soundVo.put("width", width);
                if(width>0){
                    soundVo.put("width", width);
                }
                soundVo.put("order", order + "");
                if(list.size() == 0){
                if(list.isEmpty()){
                    list.add(soundVo);
                }else{
                    boolean isAdd = false;

 framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java

@@ -60,9 +60,9 @@
    @Override
    protected void addInterceptors(InterceptorRegistry registry) {
        // TODO: 2024/6/4 访问swagger需关下面拦截器
//        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
//        registry.addInterceptor(powerConfig).addPathPatterns("/**");
//        registry.addInterceptor(logConfig).addPathPatterns("/**");
        registry.addInterceptor(fiferConfig).addPathPatterns("/**");
        registry.addInterceptor(powerConfig).addPathPatterns("/**");
        registry.addInterceptor(logConfig).addPathPatterns("/**");
        super.addInterceptors(registry);
    }


 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

@@ -205,6 +205,7 @@
                    for (BushingDto bushingDto : a.getBushing()) {
                        bushingDto.setInsSampleId(a.getId());
                        insBushingMapper.insert(bushingDto);
                        //光纤不为空
                        if (bushingDto.getFiber().size() != 0) {
                            for (FiberDto fiberDto : bushingDto.getFiber()) {
                                fiberDto.setInsBushingId(bushingDto.getId());
@@ -212,7 +213,9 @@
                                addInsProductMethod(a.getId(), a.getInsProduct(), fiberDto.getId(), 2, true);
                                addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2, false);
                            }
                        } else {
                        }
                        //光纤带不为空
                        else if ( bushingDto.getFibers().size()!=0){
                            for (FibersDto fibersDto : bushingDto.getFibers()) {
                                fibersDto.setInsBushingId(bushingDto.getId());
                                fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
@@ -227,6 +230,17 @@
                                addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1, false);
                            }
                        }
                        //都为空 只配置了套管 这种情况只限于项目是含有松套管的
//                        else {
//                            String collect = a.getInsProduct().stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.joining(","));
//                            if (collect.contains("松套管")){
//                                //获取检验项目中包含松套管的检验项目
//                                List<InsProduct> products = a.getInsProduct().stream().filter(insProduct -> insProduct.getInspectionItem().contains("松套管")).collect(Collectors.toList());
//
//                            }else {
//                                throw new ErrorException("样品的光纤配置信息里面没有配置光纤带信息也没有光纤信息,请重新配置保存再提交下单!!!");
//                            }
//                        }
                    }
                }
            }
@@ -422,7 +436,8 @@
                        }
                    }
                    insProductService.saveBatch(insProductess);
                } else {
                }
                else {
                    if (!is) {
                        switch (type) {
                            case 1:

 inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java

@@ -10,7 +10,7 @@

    private String id;

    @ValueTableShow(value = 1,name = "委托编号",width = 190)
    @ValueTableShow(value = 1,name = "委托编号",width = 180)
    private String entrustCode;

    @ValueTableShow(value = 2,name = "样品名称")