From ba1a7a9ef126296e2798e313dc5b43f775a1123c Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 23 五月 2024 17:44:36 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP160Callback.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP160Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP160Callback.java
index 3dc71a1..bfd1624 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP160Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP160Callback.java
@@ -163,7 +163,7 @@
.getValue().toString();
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP160_J_PC_FINISH,true);
miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
- /* if("2".equals(S_PRODUCT_STATE_CODE)){
+ if("2".equals(S_PRODUCT_STATE_CODE)){
ProductionOrderRecordsParam productionOrderRecordsParam = new ProductionOrderRecordsParam();
productionOrderRecordsParam.setWorkOrderNo(S_ORDER_CODE);
productionOrderRecordsParam.setProductNo(S_SFC_CODE);
@@ -171,10 +171,11 @@
if(!list.isEmpty()){
ProductionOrderRecordsResult productionOrderRecordsResult = list.get(0);
productionOrderRecordsParam.setId(productionOrderRecordsResult.getId());
- productionOrderRecordsParam.setWhetherPass(S_PRODUCT_STATE_CODE);
+ productionOrderRecordsParam.setWhetherPass("涓嶅悎鏍�");
+ productionOrderRecordsParam.setEndTime(DateTool.getLocalTimeForDate());
productionOrderRecordsService.update(productionOrderRecordsParam);
}
- }*/
+ }
//澶勭悊杩囩珯淇℃伅
PassingStationCollectionParam param = new PassingStationCollectionParam();
param.setWorkOrderNo(S_ORDER_CODE);
@@ -192,7 +193,9 @@
}
public void handleMaterial() {
-
+ if(S_ORDER_CODE.isEmpty()){
+ return;
+ }
//鏌ヨ鎵规涓婃枡淇℃伅
ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
--
Gitblit v1.9.3