zss
2024-07-30 124ecca15d3c5d6dcefa9a27aaa3c07c556674e9
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -159,7 +159,7 @@
        insOrder.setState(0);
        String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
        //insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd"));
        String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd");
        String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_sample", "", "yyMMdd");
        insOrderMapper.insert(insOrder);
        AtomicInteger count = new AtomicInteger();
        list.forEach(a -> {
@@ -373,21 +373,16 @@
                        insProduct.setManHourGroup(product.getManHourGroup());
                        insProduct.setInspectionItemType("0");
                        insProduct.setInspectionValueType("1");
                        if (product.getInspectionItem().equals("热循环")) {
                            insProduct.setInspectionItemClass("直流电阻");//检验子子项--直流电阻
                            insProduct.setInspectionItemClassEn("DC resistance");//检验子子项英文--直流电阻
                            insProduct.setUnit("Ω/km");//单位
                        }
                        insProducts.add(insProduct);
                        insProductes.add(insProduct);
                        insProductess.add(insProduct);
                    }
                    //热循环才有多次循环次数
                    if (product.getInspectionItem().equals("热循环")) {
                        //热循环还要加上直流电阻
                        for (InsProduct insProduct : insProducts) {
                            InsProduct insProduct1 = new InsProduct();
                            BeanUtils.copyProperties(insProduct, insProduct1);
                            insProduct1.setInspectionItemClass("直流电阻");//检验子子项--直流电阻
                            insProduct1.setInspectionItemClassEn("DC resistance");//检验子子项英文--直流电阻
                            insProduct1.setUnit("Ω/km");//单位
                            insProductes.add(insProduct1);
                            insProductess.add(insProduct1);
                        }
                    }
                    if (count > 1) {
                        //循环超过1次
                        for (int j = 2; j <= count; j++) {