cl
2024-07-11 6c345c06709a286a2a7dd3fa27d5348e7a57bfa0
Merge remote-tracking branch 'origin/master'
已修改1个文件
21 ■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -194,7 +194,9 @@
                String cellCheckListString = jsonNode.path("cellCheckList").toString();
                JsonNode cellCheckListNode = objectMapper.readValue(cellCheckListString, JsonNode.class);
                for (JsonNode checkNode : cellCheckListNode) {
                    if(checkNode.path("cellItem").toString().replaceAll("\"", "").equals("电芯挡位")){
                    //电芯挡位
                    String batteryCellGear = checkNode.path("cellItem").toString().replaceAll("\"", "");
                    if(batteryCellGear.equals("电芯档位")){
                        DaCellData daCellData = new DaCellData();
                        daCellData.setSiteCode(jsonObject.getStr("siteCode"));
                        daCellData.setModuleSerial(jsonObject.getStr("moduleSerial"));
@@ -213,23 +215,6 @@
                        daCellData.setCreateTime(new Date());
                        daCellDataList.add(daCellData);
                    }
//                    DaCellData daCellData = new DaCellData();
//                    daCellData.setSiteCode(jsonObject.getStr("siteCode"));
//                    daCellData.setModuleSerial(jsonObject.getStr("moduleSerial"));
//                    daCellData.setModuleModel(jsonObject.getStr("moduleModel"));
//                    daCellData.setAbModule(jsonObject.getStr("ABModule"));
//                    daCellData.setPackageNo(jsonObject.getStr("packageNo"));
//                    daCellData.setSupplierModuleBarcode(jsonObject.getStr("supplierModuleBarcode"));
//                    daCellData.setCustomerModuleBarcode(jsonObject.getStr("customerModuleBarcode"));
//                    daCellData.setCellSerial(jsonNode.path("cellSerial").toString().replaceAll("\"", ""));
//                    daCellData.setCellModel(jsonNode.path("cellModel").toString().replaceAll("\"", ""));
//                    daCellData.setGbCellCode(jsonNode.path("GBCellCode").toString().replaceAll("\"", ""));
//                    daCellData.setGbModuleCode(jsonNode.path("GBModuleCode").toString().replaceAll("\"", ""));
//                    daCellData.setCellItem(checkNode.path("cellItem").toString().replaceAll("\"", ""));
//                    daCellData.setCellValue(checkNode.path("cellValue").toString().replaceAll("\"", ""));
//                    daCellData.setCreateUser("工厂MES");
//                    daCellData.setCreateTime(new Date());
//                    daCellDataList.add(daCellData);
                }
            }
            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {