From c2e92c3bd4fc134b27ba6a6271f63b032b2b9d99 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期三, 28 八月 2024 15:46:32 +0800 Subject: [PATCH] -打印bug修改 --- jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 6 +++++- jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java index 697af64..e15299d 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java +++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java @@ -17,6 +17,7 @@ import com.jcdm.common.utils.DateUtils; import com.jcdm.common.utils.SecurityUtils; import com.jcdm.common.utils.StringUtils; +import com.jcdm.framework.websocket.WebSocketUsers; import com.jcdm.main.bs.formula.service.IBsFormulaInfoService; import com.jcdm.main.bs.formula.service.impl.BsFormulaInfoServiceImpl; import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo; @@ -53,6 +54,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.websocket.Session; import java.text.SimpleDateFormat; import java.time.Instant; import java.util.*; @@ -108,6 +110,9 @@ private IDaPassingStationCollectionService daPassingStationCollectionService; public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map<String, Session> map = WebSocketUsers.getUsers(); + /** * 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦 @@ -703,14 +708,17 @@ String resultCode = jsonObject.getJSONObject("data").getStr("resultCode"); if("success".equals(code)&&"S".equals(resultCode)){ //濡傛灉鎴愬姛锛屾墽琛屾姤宸ユ垚鍔熸柟娉曪紝淇敼鏄惁鎶ュ伐涓�1锛屾坊鍔犳姤宸ユ椂闂� + WebSocketUsers.sendMessageToUserByText(map.get("POP430"), "reportSuccess"); omProductionOrdeInfoService.updateOrderByProductNum("1",daParamCollection.getProductBarcode(),"POP430"); }else{ + WebSocketUsers.sendMessageToUserByText(map.get("POP430"), "reportError"); //瑙f瀽宸ュ巶mes杩斿洖缁撴灉锛屽鏋滃け璐ワ紝鎵ц鎶ュ伐澶辫触鏂规硶锛屼慨鏀规槸鍚︽姤宸ヤ负2锛屾坊鍔犳姤宸ユ椂闂� omProductionOrdeInfoService.updateOrderByProductNum("2",daParamCollection.getProductBarcode(),"POP430"); } logger.info("OP430鎶ュ伐缁撴潫-宸ュ巶MES寮傛鏂规硶{}"+reportResult); }); }catch (Exception e){ + WebSocketUsers.sendMessageToUserByText(map.get("POP430"), "reportError"); System.out.println(e.getMessage()); } // HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue index 2bc3c55..1668a5a 100644 --- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue @@ -827,7 +827,11 @@ }; this.ws.onmessage = function (event) { - if (event.data === "print") { + if (event.data === "reportError") { + self.$message.error('涓嬬嚎鎶ュ伐寮傚父澶辫触锛�'); + }else if (event.data === "reportSuccess") { + self.$message('涓嬬嚎鎶ュ伐鎴愬姛锛�'); + }else if (event.data === "print") { self.$message('postman璋冪敤鎵撳嵃鏂规硶鎵撳嵃锛�'); // self.print1() document.getElementById('print').click(); -- Gitblit v1.9.3