opt:修改入库木箱获取方式

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<AcsTaskDto> taskList = this.schedule();
+            List<AcsTaskDto> taskList = this.schedule();
-    //        if (ObjectUtil.isNotEmpty(taskList)) {
+            if (ObjectUtil.isNotEmpty(taskList)) {
-    //            JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
+                JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
-    //            return AcsUtil.notifyAcs("api/wms/task", arr);
+                return AcsUtil.notifyAcs("api/wms/task", arr);
-    //        }
+            }
         return null;
     }
 

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) {

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"
         >
           分配
         </el-button>
@@ -85,7 +85,6 @@
         size="mini"
         @select="handleSelectionChange"
         @selection-change="crud.selectionChangeHandler"
-        @row-dblclick="handleRowDblClick"
       >
         <el-table-column type="selection" />
         <el-table-column
@@ -218,22 +217,7 @@ export default {
       this.query.status = tab.name === 'first' ? '99' : '0'
       this.crud.toQuery()
     },
-    // 表格双击事件
+    divOpen() {
-    handleRowDblClick(row, column, event) {
-      // 双击事件的处理逻辑
-      this.divOpen(row)
-    },
-    // 双击
-    divOpen(row) {
-      debugger
-      this.sale_order_name = row.sale_order_name
-      crudSubpackagerelation.queryContainerization({ 'sale_order_name': row.sale_order_name }).then(res => {
-        debugger
-        this.openParam = res.content
-        this.divShow = true
-      })
-    },
-    divOpen1() {
       debugger
       this.sale_order_name = this.currentRow.sale_order_name
       crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.currentRow.sale_order_name }).then(res => {