From 768498719683f85e5ed19c73eb3d14cdbf420df4 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 01 七月 2024 14:03:01 +0800
Subject: [PATCH] 绑定小车码，预装总成码，手动工位扫码，拧紧逻辑优化
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 a77555f..0d833f4 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
@@ -5,6 +5,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -12,6 +13,8 @@
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
+import com.jcdm.main.bs.beatSetting.domain.BsBeatSetting;
+import com.jcdm.main.bs.beatSetting.service.IBsBeatSettingService;
import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService;
import com.jcdm.main.constant.Constants;
@@ -23,6 +26,7 @@
import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
+import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.restful.qingYan.doman.*;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.loadtime.Aj;
@@ -65,6 +69,9 @@
@Autowired
private IBsFormulaChildInfoService bsFormulaChildInfoService;
+
+ @Autowired
+ private IBsBeatSettingService bsBeatSettingService;
private IDaPassingStationCollectionService passingStationCollectionService;
@@ -205,14 +212,38 @@
return AjaxResult.success(restFulOrders);
}
+ public static void main(String[] args) {
+ String str = "0RSPB0011A2E3AE5P0000002 2024-05-28 15:48:51";
+ String[] split = str.split(" ");
+ System.out.println(split[0]);
+ System.out.println(split[1]);
+
+ }
+
@GetMapping("/getQualityData")
public AjaxResult getQualityData(){
- List<DaPassingStationCollection> qualified = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getOutRsSign, "1"));
- List<DaPassingStationCollection> unQualified = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getOutRsSign, "2"));
- Map<String,Integer> map = new HashMap<>();
- map.put("qualified",qualified.size());
- map.put("unQualified",unQualified.size());
- return AjaxResult.success(map);
+// List<DaPassingStationCollection> qualified = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getOutRsSign, "1"));
+// List<DaPassingStationCollection> unQualified = daPassingStationCollectionService.list(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getOutRsSign, "2"));
+// Map<String,Integer> map = new HashMap<>();
+// map.put("qualified",qualified.size());
+// map.put("unQualified",unQualified.size());
+ for (BsBeatSetting bsBeatSetting : bsBeatSettingService.list()) {
+ String str = bsBeatSetting.getProductCode();
+ String[] split = str.split(" ");
+ String reportResult = RestfulService.getWorkReportResultFeedback(split[0], "OP500", "2024-06-27 15:48:51");
+ JSONObject jsonObject = new JSONObject(reportResult);
+ String code = jsonObject.getStr("code");
+ String status = jsonObject.getJSONObject("data").getStr("resultCode");
+ if("success".equals(code)&&"S".equals(status)){
+ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂�
+ bsBeatSetting.setProductName("S");
+ this.bsBeatSettingService.saveOrUpdate(bsBeatSetting);
+ }else{
+ bsBeatSetting.setProductName("F");
+ this.bsBeatSettingService.saveOrUpdate(bsBeatSetting);
+ }
+ }
+ return AjaxResult.success();
}
--
Gitblit v1.9.3