mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
@@ -100,8 +100,7 @@ if (redisTemplate.hasKey(key)) { throw new RuntimeException("有同步任务正在处理"); } partService.syncNewIfs(date); return R.ok(); return R.ok(partService.syncNewIfs(date)); } /** * 分页查询已关联检测模板的零件 @@ -120,7 +119,7 @@ /** * 根据零件号和零件描述查询库存信息接口 * * @param part 零件 * @param 零件 * @return */ @ApiOperation(value = "根据零件号和零件描述查询库存信息接口", notes = "根据零件号和零件描述查询库存信息接口") mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
@@ -131,5 +131,5 @@ void syncPart(); void syncNewIfs(Date date); Long syncNewIfs(Date date); } mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
@@ -369,7 +369,7 @@ @Transactional(rollbackFor = Exception.class) @Override public void syncNewIfs(Date date) { public Long syncNewIfs(Date date) { Map<String, String> dicmattype = dictUtils.getDicKey("material_type"); Map<String, String> dicunit = dictUtils.getDicKey("unit"); String key = "syncPart_lock" + SecurityUtils.getUser().getId(); @@ -379,13 +379,13 @@ redisTemplate.opsForValue().set(key, 1, 1000 * 3600); Map<String, Object>map=new HashMap<>(); map.put("MODIFY_DATE", DateUtil.format(date,"yyyy-MM-dd")); List<Part>partList=new ArrayList<Part>(); try { String url = "http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_INVENTORY_PART_INFO_STD&userId=7632&inAttr="+new ObjectMapper().writeValueAsString(map); String body = HttpRequest.get(url).execute().body(); Map<String, Object> mapResult = JsonUtil.jsonToPojo(body, Map.class); List<Map<String, Object>> data = JsonUtil.jsonToPojo(JsonUtil.jsonToString(mapResult.get("INVENTORY_PART_INFO")), List.class); List<String>no=new ArrayList<String>(); List<Part>partList=new ArrayList<Part>(); data.forEach(l->{ Part part = new Part(); part.setPartNo(String.valueOf(l.get("PART_NO"))); @@ -408,20 +408,23 @@ part.setSunit(dicunit.get(l.get("UNIT_MEAS_FOR_WEIGHT"))); partList.add(part); }); QueryWrapper<Part>queryWrapper=new QueryWrapper<>(); queryWrapper.lambda().select(Part::getPartNo).in(Part::getPartNo,no); List<Part> selectList = baseMapper.selectList(queryWrapper); //System.out.println(baseMapper.selectList(queryWrapper)); partList.removeIf(mainObj -> selectList.stream().anyMatch(subObj -> subObj.getPartNo().equals(mainObj.getPartNo()))); //System.out.println(partList); partList.forEach(l->{ baseMapper.insert(l); }); if(partList.size()>0) { QueryWrapper<Part> queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().select(Part::getPartNo).in(Part::getPartNo, no); List<Part> selectList = baseMapper.selectList(queryWrapper); //System.out.println(baseMapper.selectList(queryWrapper)); partList.removeIf(mainObj -> selectList.stream().anyMatch(subObj -> subObj.getPartNo().equals(mainObj.getPartNo()))); //System.out.println(partList); partList.forEach(l -> { baseMapper.insert(l); }); } } catch (Exception e) { e.printStackTrace(); throw new RuntimeException(e.getMessage()); } finally { redisTemplate.delete(key); } return (long) partList.size(); } } mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
@@ -44,7 +44,6 @@ import com.chinaztt.mes.technology.entity.*; import com.chinaztt.mes.technology.excel.RoutingData; import com.chinaztt.mes.technology.excel.RoutingExcelData; import com.chinaztt.mes.technology.excel.StructureData; import com.chinaztt.mes.technology.mapper.*; import com.chinaztt.mes.technology.service.RoutingService; import com.chinaztt.mes.technology.state.routing.RoutingStateMachineConfig; @@ -1264,11 +1263,11 @@ //结构类型 batchinfoJsonObj.put("BOM_TYPE_DB", routingDTO.getBomTypeDb()); //启用时间 batchinfoJsonObj.put("PHASE_IN_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseInDate())); if (routingDTO.getPhaseOutDate() != null) { //弃用时间 batchinfoJsonObj.put("PHASE_OUT_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseOutDate())); } //batchinfoJsonObj.put("PHASE_IN_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseInDate())); //if (routingDTO.getPhaseOutDate() != null) { // //弃用时间 // batchinfoJsonObj.put("PHASE_OUT_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseOutDate())); //} JSONArray alternateInfo = new JSONArray(); JSONObject alobj = new JSONObject() .fluentPut("ALTERNATIVE_NO", routingDTO.getAlternativeNo()) mes-web/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ druid: username: postgres # password: postgres123 password: 123456 password: root2022 # 射频开发数据库 url: jdbc:postgresql://114.132.189.42:9005/zs_db url: jdbc:postgresql://127.0.0.1:5432/postgres application: name: ztt-mes cloud:
