diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index 858d977a4..f157990bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -108,11 +108,11 @@ public abstract class AbstractAcsTask { * */ public JSONObject immediateNotifyAcs(String task_id) { - // List taskList = this.schedule(); - // if (ObjectUtil.isNotEmpty(taskList)) { - // JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - // return AcsUtil.notifyAcs("api/wms/task", arr); - // } + List taskList = this.schedule(); + if (ObjectUtil.isNotEmpty(taskList)) { + JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); + return AcsUtil.notifyAcs("api/wms/task", arr); + } return null; } diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue index 8a387f865..b2ba6116e 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue @@ -326,19 +326,19 @@ export default { row.index = rowIndex }, tableChanged(row) { + debugger this.form.tableMater = this.currentSelection this.form.checked = row.material_code - debugger this.form.sale_order_name = this.sale_order_name crudPackagerelation.updateEntityList(this.form).then(res => { crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.sale_order_name }).then(res => { this.openParam = res.content - this.$emit('childEvent') this.clearSelection() }) this.form.tableMater = [] this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }) + this.$emit('childEvent') }, divStruct() { if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) { diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue index d4024f063..c807ab953 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/index.vue @@ -66,7 +66,7 @@ :disabled="dis_flag" icon="el-icon-position" size="mini" - @click="divOpen1" + @click="divOpen" > 分配 @@ -85,7 +85,6 @@ size="mini" @select="handleSelectionChange" @selection-change="crud.selectionChangeHandler" - @row-dblclick="handleRowDblClick" > { - debugger - this.openParam = res.content - this.divShow = true - }) - }, - divOpen1() { + divOpen() { debugger this.sale_order_name = this.currentRow.sale_order_name crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name }).then(res => {