代码更新

2022-11-27 11:27:27 +08:00
parent cce8d4eb53
commit 17eae55192
9 changed files with 199 additions and 54 deletions
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -215,7 +215,7 @@
        </template>
      </el-table-column>-->

-      <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" show-overflow-tooltip />
+<!--      <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" show-overflow-tooltip />-->
      <el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" show-overflow-tooltip />
      <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
        <template scope="scope">
@@ -230,7 +230,7 @@
      </el-table-column>
    </el-table>

-    <AddDtl :dialog-show.sync="dtlShow" :open-param="materType" @tableChanged="tableChanged" />
+    <AddDtl :dialog-show.sync="dtlShow" :open-param="materType" @tableChanged="tableChanged5" />
    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
  </el-dialog>
 </template>
@@ -379,32 +379,52 @@ export default {
          })*/
    },
    tableChanged(rows) {
-      const tablemap = new Map()
      rows.forEach((item) => {
        debugger
        if (this.form.tableData.length !== 0) {
          this.flagnow = false
          for (let i = 0; i < this.form.tableData.length; i++) {
-            if (this.form.tableData[i].material_id === item.material_id) {
+            if (this.form.tableData[i].box_no === item.box_no && this.form.tableData[i].pcsn === item.pcsn) {
              this.flagnow = true
            }
          }
          if (!this.flagnow) {
            item.edit = true
-            item.quality_scode = '00'
-            tablemap.set(item.material_id, item)
+            this.form.tableData.splice(-1, 0, item)
          }
        } else {
          item.edit = true
-          item.quality_scode = '00'
-          tablemap.set(item.material_id, item)
+          this.form.tableData.splice(-1, 0, item)
        }
      })
-      for (const value of tablemap.values()) {
-        this.form.tableData.push(value)
-      }
      this.form.detail_count = this.form.tableData.length
    },
+    tableChanged5(rows) {
+      const data = {
+        'data': rows
+      }
+      checkoutbill.queryBox(data).then(res => {
+        res.forEach((item) => {
+          debugger
+          if (this.form.tableData.length !== 0) {
+            this.flagnow = false
+            for (let i = 0; i < this.form.tableData.length; i++) {
+              if (this.form.tableData[i].box_no === item.box_no && this.form.tableData[i].pcsn === item.pcsn) {
+                this.flagnow = true
+              }
+            }
+            if (!this.flagnow) {
+              item.edit = true
+              this.form.tableData.splice(-1, 0, item)
+            }
+          } else {
+            item.edit = true
+            this.form.tableData.splice(-1, 0, item)
+          }
+        })
+        this.form.detail_count = this.form.tableData.length
+      })
+    },
    setMaterValue(row) {
      for (let i = 0; i < this.form.tableData.length; i++) {
        if (this.form.tableData[i].material_id === row.material_id) {
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
@@ -47,6 +47,7 @@
      <el-table-column show-overflow-tooltip prop="instorage_time" label="入库日期" />
      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="struct_name" label="仓位" />
      <el-table-column show-overflow-tooltip prop="box_no" label="箱号" />
      <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" />
      <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" />
--- a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
@@ -176,4 +176,11 @@ export function getDisNum(data) {
    data
  })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum }
+export function queryBox(data) {
+  return request({
+    url: '/api/checkoutbill/queryBox',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox }
--- a/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue
+++ b/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue
@@ -108,18 +108,14 @@
 </template>

 <script>
-import crudIostordaily from '@/api/wms/statistics/iostordaily'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import crudIostordaily from '@/views/wms/statistics/sendReceiveQuery/iostordaily'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
-import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudMaterialbase from "@/api/wms/basedata/master/materialbase";
-import crudBucketrecord from "@/api/wms/basedata/master/bucketrecord";
+import crudMaterialbase from '@/views/wms/basedata/master/material/materialbase'

 const defaultForm = {
  stordaily_id: null,
@@ -143,7 +139,7 @@ const defaultForm = {
 }
 export default {
  name: 'SendReceiveQuery',
-  components: {pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect},
+  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
@@ -182,51 +178,23 @@ export default {
    const param = {
      'materOpt_code': '00'
    }
-    crudMaterialbase.getMaterOptType(param).then(res => {
+ /*   crudMaterialbase.getMaterOptType(param).then(res => {
      this.class_idStr = res.class_idStr
      this.crud.query.class_idStr = res.class_idStr
      this.queryClassId()
-    })
-    crudBucketrecord.getQualityList().then(res => {
+    })*/
+  /*  crudBucketrecord.getQualityList().then(res => {
      this.QualityList = res
    })
    crudBucketrecord.getIvtList().then(res => {
      this.IvtList = res
-    })
+    })*/
  },
  methods: {
    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
    [CRUD.HOOK.beforeRefresh]() {
      return true
    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    loadClass({ action, parentNode, callback}) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
-          parentNode.children = res.content.map(function (obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    },
    hand(value) {
      this.crud.toQuery()
    },
--- a/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/iostordaily.js
+++ b/lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/iostordaily.js
@@ -0,0 +1,34 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/iostordaily',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/iostordaily/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/iostordaily',
+    method: 'put',
+    data
+  })
+}
+
+export function getStor() {
+  return request({
+    url: 'api/iostordaily/getStor',
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, getStor }