rev:修改：1、新增退货库区；2、根据当前报表需求新增两个出入库报表页面；3、出库分配页面已经下发的任务无法取消；4、出入库报表、转单页面新增子卷号查询字段；5、冷却区页面新增回传MES入冷却按钮；6、手持其他入库也增加库区选择；7、新增改切入库类型，按照MES传的包装关系生成改切入库单；8、临期库区页面修改；

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/Dialog.vue

@@ -0,0 +1,83 @@
+<template>
+  <el-dialog
+    title="回传MES"
+    append-to-body
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    width="500px"
+    destroy-on-close
+    @close="close"
+  >
+    <el-form ref="form" :model="form1" size="mini" label-width="110px">
+      <el-form-item label="母卷号" prop="container_name">
+        <el-input v-model="form1.container_name" clearable size="mini"/>
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="close">取消</el-button>
+      <el-button type="primary" @click="confirm('1')">入冷却回传</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { crud } from '@crud/crud'
+import crudCoolpointivt from '@/views/wms/pdm/ivt/coolpointivt/coolpointivt'
+
+export default {
+  name: 'SunShowDialog',
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.form1 = this.openParam
+      }
+    }
+  },
+  data() {
+    return {
+      form1: {},
+      dialogVisible: false
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.form1 = {}
+      this.crud.toQuery()
+    },
+    confirm(flag) {
+      this.form1.flag = flag
+      crudCoolpointivt.uploadMes(this.form1).then(res => {
+        this.crud.toQuery()
+        this.close()
+        this.crud.notify('回传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolpointivt.js

@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function uploadMes(data) {
+  return request({
+    url: 'api/stIvtCoolpointivt/uploadMes',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, uploadMes }

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue

@@ -141,7 +141,19 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="crud.selections.length !== 1"
+          @click="uploadMES"
+        >
+          回传MES
+        </el-button>
+      </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
@@ -282,6 +294,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <Dialog :dialog-show.sync="dialogShow" :open-param="openParam"/>
   </div>
 </template>
 
@@ -292,12 +305,13 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import Dialog from '@/views/wms/pdm/ivt/coolpointivt/Dialog.vue'
 
 const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, cool_ivt_status: null, empty_point_status: null }
 export default {
   name: 'Inventory',
   dicts: ['sch_full_point_status', 'sch_empty_point_status', 'sch_cool_ivt_status', 'is_used', 'point_location', 'product_area'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { Dialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -319,6 +333,8 @@ export default {
     return {
       permission: {
       },
+      dialogShow: false,
+      openParam: null,
       rules: {
         full_point_status: [
           { required: true, message: '满轴位状态不能为空', trigger: 'blur' }
@@ -340,7 +356,15 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-
+    uploadMES() {
+      debugger
+      const _selectData = this.$refs.table.selection
+      if (_selectData.length !== 1) {
+        return this.crud.notify('请选择一个点位进行回传！', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      this.openParam = _selectData[0]
+      this.dialogShow = true
+    },
     hand(value) {
       this.crud.toQuery()
     }