opt:物料基础功能wql改成mybatis plus

lms/nladmin-ui/src/views/wms/st/inStor/check/CheckDialog.vue

@@ -146,7 +146,6 @@
 <!--      <el-button type="primary" @click="saveCheck">保存</el-button>-->
       <el-button type="primary" @click="submitCheck">确认</el-button>
     </span>
-    <MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
     <DtlViewDialog :dialog-show.sync="dtlViewShow" :open-param="paramDtlView"/>
   </el-dialog>
 </template>
@@ -154,13 +153,12 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import check from '@/views/wms/st/inStor/check/check'
-import MaterDialog from '@/views/wms/pub/MaterDialog'
 import DtlViewDialog from '@/views/wms/st/inStor/check/DtlViewDialog'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 export default {
   name: 'CheckDialog',
-  components: { MaterDialog, DtlViewDialog },
+  components: { DtlViewDialog },
   mixins: [crud()],
   props: {
     dialogShow: {
@@ -323,11 +321,6 @@ export default {
       this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '42', qty_unit_name: '桶', is_down: '0', fac_qty: '', check_result: '0', edit: false })
       this.form.dtl_num = this.tableData.length
     },
-    async queryMater(index, row) {
-      this.materShow = true
-      this.nowindex = index
-      this.nowrow = row
-    },
     tableChanged2(row) {
       for (let i = 0; i < this.tableData.length; i++) {
         if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {

lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue

@@ -156,23 +156,14 @@
     </el-table>
 
     <AddDtl :dialog-show.sync="dtlShow" :open-param="opendtlParam" @tableChanged="tableChanged" />
-    <MaterDtl
-      :dialog-show.sync="materShow"
-      :is-single="true"
-      :mater-opt-code="materType"
-      @tableChanged2="tableChanged2"
-    />
 
   </el-dialog>
 </template>
 
 <script>
-import crudOperation from '@crud/CRUD.operation'
 import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/st/inbill/AddDtl'
-import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'
-import MaterDtl from '@/views/wms/pub/MaterDialog'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
@@ -191,7 +182,7 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: { AddDtl, MaterDtl },
+  components: { AddDtl },
   mixins: [crud(), form(defaultForm)],
   dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_INV_IN_TYPE'],
   props: {
@@ -308,14 +299,6 @@ export default {
     fun(val) {
       return Number(val).toFixed(3)
     },
-    async queryMater(index, row) {
-      checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type, 'io_flag': '00' }).then(res => {
-        this.materType = res.materType
-        this.materShow = true
-        this.nowindex = index
-        this.nowrow = row
-      })
-    },
     async insertdtl() {
       if (this.form.bill_type == '') {
         this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)

lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -260,8 +260,6 @@ import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/st/outbill/AddDtl'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
-import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
-import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 
 const defaultForm = {
@@ -348,10 +346,6 @@ export default {
           this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
-        /*if (this.form.out_stor_id === this.form.stor_id) {
-          this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }*/
       }
     },
     [CRUD.HOOK.afterToEdit]() {