From 48c7ffb6e7137b4b62bfdc63be8aa72d085ba40e Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 19 二月 2025 11:56:04 +0800
Subject: [PATCH] -换型bug修改
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 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 4e32574..7e63470 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
@@ -86,6 +86,19 @@
@PostMapping("/deviceResultFeedback")
public AjaxResult deviceResultFeedback(@RequestBody ParentVO parentVO)
{
+// if(parentVO.getStationCode().contains("POP360")){
+// String softwareNumberOne = parentVO.getCheckList().get(31).getItemValue();
+// String softwareNumberTwo = parentVO.getCheckList().get(32).getItemValue();
+// String hardwareNumberOne = parentVO.getCheckList().get(33).getItemValue();
+// String hardwareNumberTwo = parentVO.getCheckList().get(34).getItemValue();
+//
+// parentVO.getCheckList().get(31).setItemValue("SSW00"+softwareNumberOne+".00"+softwareNumberTwo);
+// parentVO.getCheckList().get(33).setItemValue("HHW00"+hardwareNumberOne+".00"+hardwareNumberTwo);
+//
+// parentVO.getCheckList().remove(32);
+// parentVO.getCheckList().remove(33);
+// }
+
ObjectMapper mapper = new ObjectMapper();
List<ChildVO> li = parentVO.getCheckList();
String s = null;
@@ -102,16 +115,16 @@
daTestDeviceInterface.setCheckList(s);
daTestDeviceInterface.setCreateTime(new Date());
daTestDeviceInterfaceService.save(daTestDeviceInterface);
- if(parentVO.getStationCode().contains("POP410")){
- if(StringUtils.isNotBlank(parentVO.getProductNum())){
- OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, parentVO.getProductNum()));
- if(ObjectUtil.isNotNull(one)){
- logger.info("瑙ｇ粦灏忚溅{}锛宲ack鐮佹槸{}"+one.getTrolleyYard(),one.getProductNum());
- one.setTrolleyYard("");
- omProductionOrdeInfoService.saveOrUpdate(one);
- }
- }
- }
+// if(parentVO.getStationCode().contains("POP410")){
+// if(StringUtils.isNotBlank(parentVO.getProductNum())){
+// OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, parentVO.getProductNum()));
+// if(ObjectUtil.isNotNull(one)){
+// logger.info("瑙ｇ粦灏忚溅{}锛宲ack鐮佹槸{}"+one.getTrolleyYard(),one.getProductNum());
+// one.setTrolleyYard("");
+// omProductionOrdeInfoService.saveOrUpdate(one);
+// }
+// }
+// }
// try{
// CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
// logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
@@ -129,7 +142,7 @@
}
@GetMapping("/productionWorkOrderRequest")
- public AjaxResult productionWorkOrderRequest(){
+ public AjaxResult productionWorkOrderRequest(@RequestParam String productNum){
List<RestFulOrder> restFulOrders = new ArrayList<>();
// try{
// CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
@@ -148,7 +161,24 @@
// }catch (Exception e){
// System.out.println(e.getMessage());
// }
- return AjaxResult.success(restFulOrders);
+ String result = "";
+ try {
+ String reportResult = RestfulService.getWorkReportResultFeedback(productNum, "POP230", format.format(new Date()));
+ JSONObject jsonObject = new JSONObject(reportResult);
+ String code = jsonObject.getStr("code");
+ String resultCode = jsonObject.getJSONObject("data").getStr("resultCode");
+ if("success".equals(code)&&"S".equals(resultCode)){
+ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂�
+ result = "鎴愬姛";
+ }else{
+ //瑙ｆ瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂�
+ result = "try澶辫触";
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ result = "catch澶辫触";
+ }
+ return AjaxResult.success(result);
}
@GetMapping("/getQualityData")
--
Gitblit v1.9.3