湖州智芯动力MES
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
admin
2024-06-24 2fbce7d8c0b7e5b055bb7ab77e58b1ec9ce61885 
 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java


@@ -30,6 +30,7 @@


import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;


import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;


import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;


import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;


import com.jcdm.main.plcserver.sub.OPCUaSubscription;


import com.jcdm.main.restful.factoryMes.service.RestfulService;


import com.jcdm.main.restful.qingYan.doman.ChildVO;


@@ -50,6 +51,7 @@


import java.text.SimpleDateFormat;


import java.time.Instant;


import java.util.*;


import java.util.concurrent.CompletableFuture;


import java.util.stream.Collectors;




/**


@@ -93,6 +95,9 @@




    @Autowired


    private IDaParamCollectionTempService daParamCollectionTempService;




    @Autowired


    private IOmProductionOrdeInfoService omProductionOrdeInfoService;




    public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");




@@ -245,6 +250,7 @@


                daParamCollectionTemp.setCollectionTime(new Date());


                daParamCollectionTemp.setSfcCode(daParamCollection.getProductBarcode());


                daParamCollectionTemp.setLocationCode(daParamCollection.getLocationCode());


                daParamCollectionTemp.setProductCode(daParamCollection.getProductCode());


                daParamCollectionTempService.save(daParamCollectionTemp);


            }


        }


@@ -310,8 +316,26 @@


                //给opc发21


                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());


                if(daParamCollection.getLocationCode().equals("OP240")){


                    RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));


                    try{


                        CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {


                            logger.info("OP230报工开始-工厂MES异步方法");


                            String reportResult = RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(), "OP230", format.format(new Date()));


                            if("".equals(reportResult)){


                                //执行报工失败方法


                            }else{


                                //解析工厂mes返回结果，如果失败，执行报工失败方法，修改是否报工为2，添加报工时间




                                //如果成功，执行报工成功方法，修改是否报工为1，添加报工时间


                            }


                            logger.info("OP230报工结束-工厂MES异步方法{}"+reportResult);


                        });


                    }catch (Exception e){


                        System.out.println(e.getMessage());


                    }


//                    RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));


                }






            } catch (Exception e) {


                throw new RuntimeException(e);


            }


@@ -462,6 +486,7 @@




    @Override


    public void pushGeelycvMesFeedback(String packID, String stationCode) {


        logger.info("进入人工工位推送工厂MES数据方法-pushGeelycvMesFeedback-工位{}-pack码{}",stationCode,packID);


        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


//        String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";


        String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";


@@ -516,12 +541,31 @@




            }


            parentVO.setCheckList(listChildVo);


            HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


            List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());


            Long[] array = idsList.toArray(new Long[0]);


            daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);


            System.out.println(execute.body());


            try{


                CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {


                    logger.info("开始执行异步方法");


                    HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


                    logger.info("异步方法执行结束");


                    logger.info("手动工位传工厂MES异步方法{}"+execute.body());




                    DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();


                    daParamCollectionTemp.setSfcCode(packID);


                    daParamCollectionTemp.setLocationCode(stationCode);


                    int i = daParamCollectionTempService.deleteDaParamCollectionTempBySfcCodeAndLocationCode(daParamCollectionTemp);


                    logger.info("删除临时表数据条数{}-工位{}-pack码{}",i,stationCode,packID);


//                    List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());


//                    Long[] array = idsList.toArray(new Long[0]);


//                    int i = daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);


//                    logger.info("删除临时表数据条数{}-工位{}-pack码{}",i,stationCode,packID);


                });


            }catch (Exception e){


                System.out.println(e.getMessage());


            }


//            HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();




//            System.out.println(execute.body());


            System.out.println("-----------------------"+totalResult);


            logger.info("结束人工工位推送工厂MES数据方法-pushGeelycvMesFeedback-工位{}-pack码{}",stationCode,packID);


        }




    }


@@ -584,9 +628,19 @@


            parentVO.setCheckList(listChildVo);


            logger.info("结束工位{}-拼数据",stationCode);


            logger.info("进入工位{}-工厂MES推送数据方法HttpResponseSend",stationCode);


            HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


            try{


                CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {


                    logger.info("开始执行异步方法");


                    HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


                    System.out.println(execute.body());


                    logger.info("异步方法执行结束");


                    logger.info("自动工位传工厂MES异步方法{}"+execute.body());


                });


            }catch (Exception e){


                System.out.println(e.getMessage());


            }


//            HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


            logger.info("结束工位{}-工厂MES推送数据方法HttpResponseSend",stationCode);


            System.out.println(execute.body());


            System.out.println("-----------------------"+totalResult);


        }


        logger.info("结束工位{}-工厂MES推送数据方法automaticWorkstationPushGeelycvMesFeedback",stationCode);


@@ -636,8 +690,18 @@


        parentVO.setTotalResult("1");


        parentVO.setCheckList(childVOList);


        HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


//        try{


//            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {


//                logger.info("开始执行异步方法");


//                HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();


//                System.out.println(execute.body());


//                logger.info("异步方法执行结束");


//                logger.info("称重异步方法{}",execute.body());


//            });


//        }catch (Exception e){


//            System.out.println(e.getMessage());


//        }


        RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"OP500",format.format(new Date()));


        System.out.println(execute.body());


    }




}