diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
index eb1e07dc..71cbbc88 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/FlowOperationServiceImpl.java
@@ -106,7 +106,12 @@ public class FlowOperationServiceImpl implements IFlowOperationService {
             BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(deployment.getModel_key(), deployment.getVersion(), model_json);
             FlowNode flowNode = bpmnModel.getProcesses().get(execution.getActivity_id());
             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();
             entity.setCurrentFlowElement(flowNode);
diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
index 0bc5651d..7a7f30d2 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
@@ -160,8 +160,8 @@
       <el-form  :model="vehicleform"  size="mini" label-width="110px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="物料编码" prop="material_code">
-              <el-input v-model="vehicleform.material_code" disabled style="width: 150px;" />
+            <el-form-item label="物料名称" prop="material_name">
+              <el-input v-model="vehicleform.material_name" disabled style="width: 150px;" />
             </el-form-item>
           </el-col>
           <el-col :span="12">