root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:修改流程服务配置

Browse Source
This commit is contained in:
zhangzq
2024-06-19 10:19:25 +08:00
parent ecf52e5801
commit 83cc814d75
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
View File

@@ -106,7 +106,12 @@ public class FlowOperationServiceImpl implements IFlowOperationService {
BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(deployment.getModel_key(), deployment.getVersion(), model_json); BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(deployment.getModel_key(), deployment.getVersion(), model_json);
FlowNode flowNode = bpmnModel.getProcesses().get(execution.getActivity_id()); FlowNode flowNode = bpmnModel.getProcesses().get(execution.getActivity_id());
if (auxParam!=null){ if (auxParam!=null){
flowNode.setAuxParam(auxParam); JSONObject param = flowNode.getAuxParam();
if (param!=null){
flowNode.getAuxParam().putAll(auxParam);
}else {
flowNode.setAuxParam(auxParam);
}
} }
ExecutionEntity entity = new ExecutionEntity(); ExecutionEntity entity = new ExecutionEntity();
entity.setCurrentFlowElement(flowNode); entity.setCurrentFlowElement(flowNode);

4
wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
View File

@@ -160,8 +160,8 @@
<el-form :model="vehicleform" size="mini" label-width="110px"> <el-form :model="vehicleform" size="mini" label-width="110px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料编码" prop="material_code"> <el-form-item label="物料名称" prop="material_name">
<el-input v-model="vehicleform.material_code" disabled style="width: 150px;" /> <el-input v-model="vehicleform.material_name" disabled style="width: 150px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">