From 06a9757c727c6bc15595d5f56a0e309077025741 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 四月 2024 09:22:14 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
index e8a5ed6..417c3d1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/asrs/controller/FlowController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wcs.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.asrs.entity.FlowGraph;
import com.zy.asrs.wcs.asrs.entity.param.FlowLogicCodeParam;
@@ -72,11 +73,10 @@
flowGraph.setStatus(0);
}
flowGraph.setName(param.get("name").toString());
- flowGraph.setMemo(param.get("memo").toString());
+ flowGraph.setMemo(param.get("memo") == null ? "" : param.get("memo").toString());
flowGraph.setOriginData(param.get("originData").toString());
- flowGraph.setProcessData(JSON.toJSONString(list));
+ flowGraph.setProcessData(JSON.toJSONString(param.get("data")));
flowGraph.setUpdateTime(new Date());
- flowGraph.setHostId(getHostId());
flowGraphService.saveOrUpdate(flowGraph);
return R.ok();
@@ -91,7 +91,8 @@
//寮�濮嬫ā鎷熸墽琛�
String processData = flowGraph.getProcessData();
- List<FlowLogicCodeParam> list = JSON.parseArray(processData, FlowLogicCodeParam.class);
+// List<FlowLogicCodeParam> list = JSON.parseArray(processData, FlowLogicCodeParam.class);
+ List<JSONObject> list = JSON.parseArray(processData, JSONObject.class);
boolean execute = flowExecute.execute(list);
return R.ok().add(execute);
}
--
Gitblit v1.9.1