优化

admin

2024-10-20 537bfb7e43c78d5b3b98ba8a135b638f0461ea60

 jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java

@@ -73,12 +73,25 @@
    @Autowired
    private IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;

    @Autowired
    private IBsBeatSettingService bsBeatSettingService;

    @Autowired
    private IDaParamCollectionService daParamCollectionService;

    /**
     * 导出点检任务列表
     */
    @PostMapping("/deviceResultFeedback")
    public AjaxResult deviceResultFeedback(@RequestBody ParentVO parentVO)
    {
        //如果是240工位就处理一下总成号，坏了找聂磊
        if(parentVO.getStationCode().equals("OP210")){
            parentVO.setProductNum("TZ180XSDSZX01"+parentVO.getProductNum());
        }
        if(parentVO.getStationCode().equals("OP240")){
            parentVO.setProductNum("TZ180XSDSZX01"+parentVO.getProductNum().split("#T")[1]);
        }
        ObjectMapper mapper = new ObjectMapper();
        List<ChildVO> li = parentVO.getCheckList();
        String checkList = "";
@@ -135,19 +148,19 @@
    }

    @GetMapping("/productionOrderComponentRequest")
    public AjaxResult productionOrderComponentRequest(BsFormulaChildInfo bsFormulaChildInfo){
        List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
                .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getProcessesCode())
                .eq(BsFormulaChildInfo::getOperationType, "2")
        );
        List<ProductionOrderComponentRequest> requests = new ArrayList<>();
        for (BsFormulaChildInfo info : list) {
            ProductionOrderComponentRequest request = new ProductionOrderComponentRequest();
            request.setMaterialCode(info.getMaterialCode());
            request.setOperationSteps(info.getOperationSteps());
            requests.add(request);
    public AjaxResult productionOrderComponentRequest(@RequestParam String stationCode,@RequestParam String confirmTime){
        List<BsBeatSetting> list = bsBeatSettingService.list();
        for (BsBeatSetting bsBeatSetting : list) {
            String workReportResultFeedback = RestfulService.getWorkReportResultFeedback(bsBeatSetting.getProductCode(), stationCode, confirmTime);
            System.out.println(workReportResultFeedback);
        }
        return AjaxResult.success(requests);
        return AjaxResult.success();
    }

    @GetMapping("/pushStartStopTime")
    public AjaxResult pushStartStopTime(@RequestParam String paramCode,@RequestParam String paramName,@RequestParam String productNum){
        daParamCollectionService.pushStartStopTime(paramCode,paramName,productNum);
        return AjaxResult.success();
    }

    /**