fix:缓存线异常处理功能

2023-05-19 14:56:18 +08:00
parent a97b32d3a9
commit 15c59182aa
22 changed files with 1226 additions and 1215 deletions
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue
@@ -248,6 +248,7 @@ const defaultForm = {
  struct_id: '',
  bill_type: '',
  remark: '',
+  workshop_id: '',
  biz_date: new Date(),
  create_mode: '',
  tableData: []
@@ -419,7 +420,6 @@ export default {
    tableChanged(rows) {
      // 对新增的行进行校验不能存在相同物料批次
      rows.forEach((item) => {
-        debugger
        let same_mater = true
        this.form.tableData.forEach((row) => {
          if (row.material_code === item.material_code) {
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
@@ -203,7 +203,7 @@
      </el-table-column>
    </el-table>

-    <StructIvt
+    <MaterDtl
      :dialog-show.sync="materShow"
      :is-single="false"
      @setMaterValue="tableChanged"
@@ -237,6 +237,7 @@ const defaultForm = {
  stor_id: '',
  struct_id: '',
  bill_type: '',
+  workshop_id: '',
  remark: '',
  biz_date: new Date(),
  create_mode: '',
@@ -301,7 +302,7 @@ export default {
    },
    [CRUD.HOOK.afterToEdit]() {
      // 获取入库单明细
-      crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
+      crudProductOut.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
        this.form.tableData = res
        // 将明细变成不可编辑
        for (let i = 0; i < this.form.tableData.length; i++) {
@@ -310,25 +311,6 @@ export default {
        }
      })
    },
-    [CRUD.HOOK.beforeToEdit]() {
-      this.struct_id = this.crud.form.struct_id
-      this.sect_id = this.crud.form.sect_id
-      crudStructattr.getSectCascader({'stor_id': this.crud.form.stor_id}).then(res => {
-        this.sects = res.content
-        this.form.struct_id = this.search(this.sects, this.struct_id)
-      })
-    },
-    [CRUD.HOOK.afterToView]() {
-      crudProductIn.getIODtl({'bill_code': this.form.bill_code}).then(res => {
-        this.form.tableData = res
-        // 将明细变成不可编辑
-        for (let i = 0; i < this.form.tableData.length; i++) {
-          const row = this.form.tableData[i]
-          this.form.tableData.splice(i, 1, row)
-        }
-      })
-    },
-
    [CRUD.HOOK.beforeSubmit]() {
      // 提交前校验
      if (this.form.tableData.length === 0) {
@@ -360,16 +342,6 @@ export default {
        this.sects = res.content
      })
    },
-    search(object, value) {
-      debugger
-      for (var key in object) {
-        if (object[key].value == value) return [object[key].value];
-        if (object[key].children && Object.keys(object[key].children).length > 0) {
-          var temp = search(object[key].children, value);
-          if (temp) return [object[key].value, temp].flat();
-        }
-      }
-    },
    sectQueryChange(val) {
      debugger
      this.sectProp = val
@@ -404,10 +376,9 @@ export default {
    tableChanged(rows) {
      // 对新增的行进行校验不能存在相同物料批次
      rows.forEach((item) => {
-        debugger
        let same_mater = true
        this.form.tableData.forEach((row) => {
-          if (row.material_code === item.material_code && row.struct_id === item.struct_id) {
+          if (row.material_code === item.material_code) {
            same_mater = false
          }
        })
@@ -415,7 +386,9 @@ export default {
          item.quality_scode = '01'
          item.ivt_level = '01'
          item.is_active = '1'
-          item.plan_qty = item.canuse_qty
+          item.plan_qty = '1'
+          item.qty_unit_id = item.base_unit_id
+          item.qty_unit_name = item.base_unit_name
          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
          this.form.tableData.splice(-1, 0, item)
        }
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue
@@ -45,7 +45,7 @@
          @change="crud.toQuery"
        >
          <el-option
-            v-for="item in dict.ST_INV_IN_TYPE"
+            v-for="item in dict.ST_INV_OUT_TYPE"
            :key="item.value"
            :label="item.label"
            :value="item.value"
@@ -130,7 +130,7 @@ export default {
  name: 'ViewDialog',
  components: {},
  mixins: [crud()],
-  dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
+  dicts: ['ST_INV_OUT_TYPE', 'product_area', 'IO_BILL_STATUS'],
  props: {
    dialogShow: {
      type: Boolean,
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue
@@ -42,7 +42,7 @@
              @change="crud.toQuery"
            >
              <el-option
-                v-for="item in dict.ST_INV_IN_TYPE"
+                v-for="item in dict.ST_INV_OUT_TYPE"
                :key="item.value"
                :label="item.label"
                :value="item.value"
@@ -233,7 +233,7 @@ export default {
  },
  mixins: [presenter(), header(), crud()],
  // 数据字典
-  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area', 'ST_INV_CREATE'],
+  dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'product_area', 'ST_INV_CREATE'],
  data() {
    return {
      height: document.documentElement.clientHeight - 180 + 'px;',
@@ -306,7 +306,7 @@ export default {
      }
    },
    bill_typeFormat(row, column) {
-      return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
+      return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
    },
    toView(row) {
      this.mstrow = row
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function add(data) {
  return request({
-    url: 'api/productOut',
+    url: '/api/out/stIvtIostorinvYl',
    method: 'post',
    data
  })
@@ -10,7 +10,7 @@ export function add(data) {

 export function del(ids) {
  return request({
-    url: 'api/productOut/',
+    url: '/api/out/stIvtIostorinvYl/',
    method: 'delete',
    data: ids
  })
@@ -18,211 +18,211 @@ export function del(ids) {

 export function edit(data) {
  return request({
-    url: 'api/productOut',
-    method: 'put',
-    data
-  })
-}
-
-export function getOutBillDtl(data) {
-  return request({
-    url: '/api/productOut/getOutBillDtl',
+    url: '/api/out/stIvtIostorinvYl/update',
    method: 'post',
    data
  })
 }
-export function getOutBillDis(data) {
+
+export function getIODtl(data) {
  return request({
-    url: '/api/productOut/getOutBillDis',
+    url: '/api/out/stIvtIostorinvYl/getIODtl',
+    method: 'post',
+    data
+  })
+}
+export function getIODis(data) {
+  return request({
+    url: '/api/out/stIvtIostorinvYl/getIODis',
    method: 'post',
    data
  })
 }
 export function getOutBillDisDtl(params) {
  return request({
-    url: '/api/productOut/getOutBillDisDtl',
+    url: '//api/out/stIvtIostorinvYl/getOutBillDisDtl',
    method: 'get',
    params
  })
 }
 export function getOutBillTask(params) {
  return request({
-    url: '/api/productOut/getOutBillTask',
+    url: '//api/out/stIvtIostorinvYl/getOutBillTask',
    method: 'get',
    params
  })
 }
 export function getInvTypes() {
  return request({
-    url: '/api/productOut/getInvTypes',
+    url: '//api/out/stIvtIostorinvYl/getInvTypes',
    method: 'get'
  })
 }
 export function insertDtl(data) {
  return request({
-    url: '/api/productOut/insertDtl',
+    url: '//api/out/stIvtIostorinvYl/insertDtl',
    method: 'post',
    data
  })
 }
 export function allDiv(data) {
  return request({
-    url: '/api/productOut/allDiv',
+    url: '//api/out/stIvtIostorinvYl/allDiv',
    method: 'post',
    data
  })
 }
 export function allDivOne(data) {
  return request({
-    url: '/api/productOut/allDivOne',
+    url: '//api/out/stIvtIostorinvYl/allDivOne',
    method: 'post',
    data
  })
 }
 export function allCancel(data) {
  return request({
-    url: '/api/productOut/allCancel',
+    url: '//api/out/stIvtIostorinvYl/allCancel',
    method: 'post',
    data
  })
 }
 export function oneCancel(data) {
  return request({
-    url: '/api/productOut/oneCancel',
+    url: '//api/out/stIvtIostorinvYl/oneCancel',
    method: 'post',
    data
  })
 }
 export function setPoint(data) {
  return request({
-    url: '/api/productOut/setPoint',
+    url: '//api/out/stIvtIostorinvYl/setPoint',
    method: 'post',
    data
  })
 }
 export function oneSetPoint(data) {
  return request({
-    url: '/api/productOut/oneSetPoint',
+    url: '//api/out/stIvtIostorinvYl/oneSetPoint',
    method: 'post',
    data
  })
 }
 export function getStructIvt(params) {
  return request({
-    url: '/api/productOut/getStructIvt',
+    url: '//api/out/stIvtIostorinvYl/getStructIvt',
    method: 'get',
    params
  })
 }
 export function manualDiv(data) {
  return request({
-    url: '/api/productOut/manualDiv',
+    url: '//api/out/stIvtIostorinvYl/manualDiv',
    method: 'post',
    data
  })
 }
 export function confirm(data) {
  return request({
-    url: '/api/productOut/confirm',
+    url: '//api/out/stIvtIostorinvYl/confirm',
    method: 'post',
    data
  })
 }
 export function issueTask(data) {
  return request({
-    url: '/api/productOut/issueTask',
+    url: '//api/out/stIvtIostorinvYl/issueTask',
    method: 'post',
    data
  })
 }
 export function finishTask(data) {
  return request({
-    url: '/api/productOut/finishTask',
+    url: '//api/out/stIvtIostorinvYl/finishTask',
    method: 'post',
    data
  })
 }
 export function cancleTaskfinish(data) {
  return request({
-    url: '/api/productOut/cancleTaskfinish',
+    url: '//api/out/stIvtIostorinvYl/cancleTaskfinish',
    method: 'post',
    data
  })
 }
 export function paramByCodeType(data) {
  return request({
-    url: '/api/productOut/paramByCodeType',
+    url: '//api/out/stIvtIostorinvYl/paramByCodeType',
    method: 'post',
    data
  })
 }
 export function schAreaType(data) {
  return request({
-    url: '/api/productOut/schAreaType',
+    url: '//api/out/stIvtIostorinvYl/schAreaType',
    method: 'post',
    data
  })
 }
 export function backConfirm(data) {
  return request({
-    url: '/api/productOut/backConfirm',
+    url: '//api/out/stIvtIostorinvYl/backConfirm',
    method: 'post',
    data
  })
 }
 export function getType() {
  return request({
-    url: '/api/productOut/getType',
+    url: '//api/out/stIvtIostorinvYl/getType',
    method: 'get'
  })
 }
 export function moneySubmit(data) {
  return request({
-    url: '/api/productOut/moneySubmit',
+    url: '//api/out/stIvtIostorinvYl/moneySubmit',
    method: 'post',
    data
  })
 }
 export function getDisNum(data) {
  return request({
-    url: '/api/productOut/getDisNum',
+    url: '//api/out/stIvtIostorinvYl/getDisNum',
    method: 'post',
    data
  })
 }
 export function queryBox(data) {
  return request({
-    url: '/api/productOut/queryBox',
+    url: '//api/out/stIvtIostorinvYl/queryBox',
    method: 'post',
    data
  })
 }
 export function getOutBillTask2(data) {
  return request({
-    url: '/api/productOut/getOutBillTask2',
+    url: '//api/out/stIvtIostorinvYl/getOutBillTask2',
    method: 'post',
    data
  })
 }
 export function cancelTask(data) {
  return request({
-    url: '/api/productOut/cancelTask',
+    url: '//api/out/stIvtIostorinvYl/cancelTask',
    method: 'post',
    data
  })
 }
 export function allSetPoint(data) {
  return request({
-    url: '/api/productOut/allSetPoint',
+    url: '//api/out/stIvtIostorinvYl/allSetPoint',
    method: 'post',
    data
  })
 }
 export function oneSetPoint2(data) {
  return request({
-    url: '/api/productOut/oneSetPoint2',
+    url: '//api/out/stIvtIostorinvYl/oneSetPoint2',
    method: 'post',
    data
  })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
+export default { add, edit, del, allDiv, allCancel, getIODtl, getIODis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }