From b26a2da3d454b93b496bc364a024f978f3edfd7e Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 31 五月 2024 14:45:54 +0800
Subject: [PATCH] add mainCode
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index df30e1e..f1e40ab 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -4,7 +4,6 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
@@ -17,10 +16,7 @@
import com.jcdm.main.da.passingStationCollection.query.ProductOrderQuery;
import com.jcdm.main.da.passingStationCollection.query.ProductOrderVO;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
-import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
-import com.jcdm.main.plcserver.util.TimeUtil;
-import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.work.domain.KeyCodeRelation;
import com.jcdm.main.work.domain.WorkOrder;
import com.jcdm.main.work.service.KeyCodeCheckService;
@@ -181,15 +177,26 @@
if (CollUtil.isNotEmpty(collect)){
query.setProductNum(collect.get(0).getProductNum());
}
- ProductOrderVO vo = daPassingStationCollectionService.queryMessFromLine(query);
+// ProductOrderVO vo = daPassingStationCollectionService.queryMessFromLine(query);
+ ProductOrderVO vo = new ProductOrderVO();
+ ProductOrderChild child = new ProductOrderChild();
+ child.setModel("modelCode123123123");
+ child.setStationCode("M1OP100-1");
+ child.setProductNum("productNum123113");
+ child.setMaterialCode("materialCode2323");
+ child.setProductionOrderNum("proOrderNum123");
+ vo.setData(child);
+ vo.setCode(Constants.SUCCESS);
if (Constants.SUCCESS.equals(vo.getCode())){
WorkOrder workOrder = new WorkOrder();
ProductOrderChild data = vo.getData();
+ workOrder.setId(123L);
workOrder.setProductNum(data.getProductNum());
workOrder.setProductionOrderNum(data.getProductionOrderNum());
workOrder.setStationCode(data.getStationCode());
workOrder.setMaterialCode(data.getMaterialCode());
workOrder.setModel(data.getModel());
+ workOrder.setCreateTime(new Date());
workOrderService.save(workOrder);
//鍐欏叆妯＄粍鐮併�佸伐鍗曞彿銆佷骇鍝佸瀷鍙峰埌plc
log.info("鍐欏叆妯＄粍鐮併�佸伐鍗曞彿銆佷骇鍝佸瀷鍙峰埌plc");
@@ -211,7 +218,7 @@
if (CollUtil.isNotEmpty(paramCollectionList1)){
List<KeyCodeRelation> relationList = new ArrayList<>();
for (ReadWriteEntity readWriteEntity : paramCollectionList1) {
- if (ObjectUtil.isNotNull(readWriteEntity.getValue())){
+ if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && StrUtil.isNotBlank(readWriteEntity.getValue().toString())){
KeyCodeRelation keyCodeRelation = new KeyCodeRelation();
keyCodeRelation.setModuleCode(data.getModel());
keyCodeRelation.setKeyCode(readWriteEntity.getValue().toString());
--
Gitblit v1.9.3