From 1ebf2a61c2894cd75b25c347afde4beed753130c Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 11 七月 2024 09:51:39 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index 9667adf..4fb3487 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -165,11 +165,17 @@
}
@GetMapping("/mozuReceivingWorkOrders")
- public AjaxResult mozuReceivingWorkOrders(OmProductionOrdeInfo paramOrder)
- {
+ public AjaxResult mozuReceivingWorkOrders(OmProductionOrdeInfo paramOrder) throws Exception {
String paramProductNum = "";
+ Object productTypeObjcet = miloService.readFromOpcUa("thoroughfare" + "." + "device" + ".ProductType").getValue();//浜у搧绫诲瀷
+ if (ObjectUtil.isNull(productTypeObjcet)) {
+ return AjaxResult.error("鎺ュ崟澶辫触,PLC鏈紶杈撶敓浜х被鍨嬶紝璇疯仈绯荤鐞嗗憳");
+ }
+ String productType = productTypeObjcet.toString();//浜у搧绫诲瀷
+ String materialCode = Constants.materialMap.get(productType);
+
OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "OP230");
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
--
Gitblit v1.9.3