From 537bfb7e43c78d5b3b98ba8a135b638f0461ea60 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 20 十月 2024 15:50:30 +0800
Subject: [PATCH] 优化
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index 01f3dad..7abf729 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/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();
}
/**
--
Gitblit v1.9.3