Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two

2023-11-20 20:05:18 +08:00
parent 13914f12f0 b4896b7061
commit 4426083889
27 changed files with 1774 additions and 60 deletions
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/AddDialog.vue
@@ -205,7 +205,9 @@ export default {
      bill_btn: false,
      mater_btn: false,
      materType: '',
-      storlist: [],
+      storlist: [
+        { 'stor_id': '1010101', 'stor_name': '测试仓库' }
+      ],
      rules: {
        stor_id: [
          { required: true, message: '仓库不能为空', trigger: 'blur' }
@@ -237,6 +239,9 @@ export default {
    },
    [CRUD.HOOK.afterToEdit]() {
      // 获取入库单明细
+      inBill.getInDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+        this.form.tableData = res
+      })
    },
    [CRUD.HOOK.afterToAdd]() {
      this.bill_btn = false
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/DivDialog.vue
@@ -15,7 +15,7 @@
        <span class="crud-opts-right2">
          <!--左侧插槽-->
          <slot name="left">
-            <el-button
+            <!--<el-button
              :loading="allDivBtn"
              class="filter-item"
              type="primary"
@@ -24,7 +24,7 @@
              @click="allDivStruct()"
            >
              全部分配
-            </el-button>
+            </el-button>-->
          </slot>
          <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
        </span>
@@ -138,7 +138,7 @@
          type="primary"
          icon="el-icon-delete"
          size="mini"
-          @click="divPoint()"
+          @click="setPoint()"
        >
          设置起点
        </el-button>
@@ -237,7 +237,7 @@ export default {
  },
  methods: {
    open() {
-     /* crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
+      /* crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
        this.sects = res.content
      })

@@ -258,13 +258,9 @@ export default {
    },
    clcikRow(row) {
      this.form.dtl_row = row
-      /*crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code }).then(res => {
-        this.openParam = res
-        this.form.dtl_row = res[row.index]
-      })
-      crudRawAssist.getDisDtl(row).then(res => {
+      inBill.getIosDis(row).then(res => {
        this.form.tableMater = res
-      })*/
+      })
    },
    tableRowClassName({ row, rowIndex }) {
      row.index = rowIndex
@@ -295,20 +291,58 @@ export default {
        this.form.tableMater[i].sect_name = row.sect_name
        this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
      }
-     /* crudRawAssist.divStruct(this.form).then(res => {
+      /* crudRawAssist.divStruct(this.form).then(res => {
        crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code, 'open_flag': '1' }).then(res => {
          this.openParam = res
        })
        this.form.tableMater = []
      })*/
    },
-    divPoint() {
+    setPoint() {
+      if (!this.form.dtl_row) {
+        this.crud.notify('请选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.point_code) {
+        this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      this.form.dtl_row.point_code = this.form.point_code
+      inBill.setPoint(this.form.dtl_row).then(res => {
+
+      })
    },
    allDivStruct() {
    },
    divStruct() {
+      if (!this.form.dtl_row) {
+        this.crud.notify('请选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      // 判断是手工分配还是自动分配
+      if (this.form.checked === true) {
+        if (!this.sect_id) {
+          this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+        this.divBtn = true
+        this.form.sect_id = this.sect_id
+        this.form.stor_id = this.stor_id
+        inBill.autoDivPoint(this.form).then(res => {
+
+        }).finally(() => {
+          this.divBtn = false
+        })
+      }
    },
    unDivStruct() {
+      if (!this.form.dtl_row) {
+        this.crud.notify('请选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      inBill.unDivPoint(this.form.dtl_row).then(res => {
+
+      })
    }
  }
 }
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/TaskDialog.vue
@@ -35,20 +35,11 @@
        @row-click="clcikRow"
      >
        <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
-        <el-table-column show-overflow-tooltip prop="bill_code" label="单据号" align="center" />
        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="SAP批次" align="center" />
        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column
-          show-overflow-tooltip
-          prop="assign_qty"
-          :formatter="crud.formatNum3"
-          label="已分配数量"
-          align="center"
-        />
-        <el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" align="center" />
      </el-table>
    </el-card>
@@ -80,7 +71,7 @@
          type="warning"
          icon="el-icon-check"
          size="mini"
-          @click="reIssueTask()"
+          @click="issueTask()"
        >
          下发
        </el-button>
@@ -117,7 +108,7 @@
        <el-table-column width="230" prop="box_no" label="木箱码" align="center" />
        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
        <el-table-column show-overflow-tooltip prop="struct_code" label="分配货位" align="center" />
-        <el-table-column show-overflow-tooltip prop="work_status" label="指令状态" :formatter="statusFormat" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_status" label="指令状态" :formatter="statusFormat" align="center" />
        <el-table-column show-overflow-tooltip prop="task_code" label="指令操作号" align="center" />
        <el-table-column show-overflow-tooltip prop="point_code" label="入库点位编码" align="center" />
        <el-table-column show-overflow-tooltip prop="point_name" label="入库点位名称" align="center" />
@@ -174,23 +165,68 @@ export default {
      this.form.dtl_row = null
      this.$emit('AddChanged')
    },
-    delTask() {
-    },
-    statusFormat(row, column) {
-      return this.dict.label.TASK_STATUS[row.work_status]
-    },
-    confirmTask() {
-    },
-    reIssueTask() {
-    },
-    checkedChange(val) {
-    },
    clcikRow(row, column, event) {
      this.form.dtl_row = row
      row.checked = this.form.checked
-     /* crudRawAssist.queryTask(row).then(res => {
+      inBill.getIosDisTask(row).then(res => {
        this.form.tableMater = res
-      })*/
+      })
+    },
+    delTask() {
+      if (!this.dis_row) {
+        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (this.dis_row.work_status !== '20') {
+        this.crud.notify('只能对状态为生成的任务进行删除！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      inBill.delTask(this.dis_row).then(rea => {
+        this.form.dtl_row.checked = this.form.checked
+        inBill.getIosDisTask(this.form.dtl_row).then(res => {
+          this.form.tableMater = res
+          this.crud.notify('删除成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      })
+    },
+    issueTask() {
+      if (!this.dis_row) {
+        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (this.dis_row.work_status !== '20') {
+        this.crud.notify('只能对状态为生成的任务进行下发！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      inBill.issueTask(this.dis_row).then(rea => {
+        this.form.dtl_row.checked = this.form.checked
+        inBill.getIosDisTask(this.form.dtl_row).then(res => {
+          this.form.tableMater = res
+          this.crud.notify('下发成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      })
+    },
+    confirmTask() {
+      if (!this.dis_row) {
+        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (this.dis_row.work_status === '99' || this.dis_row.work_status === '00') {
+        this.crud.notify('只能已生成或下发进行中的任务完成！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      inBill.confirmTask(this.dis_row).then(rea => {
+        this.form.dtl_row.checked = this.form.checked
+        inBill.getIosDisTask(this.form.dtl_row).then(res => {
+          this.form.tableMater = res
+          this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      })
+    },
+    checkedChange(val) {
+    },
+    statusFormat(row, column) {
+      return this.dict.label.TASK_STATUS[row.work_status]
    },
    clcikDisRow(row, column, event) {
      this.dis_row = row
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/ViewDialog.vue
@@ -41,7 +41,7 @@
          :disabled="true"
        >
          <el-option
-            v-for="item in dict.INANDOUT_BILL_TYPE"
+            v-for="item in dict.ST_INV_IN_TYPE"
            :key="item.value"
            :label="item.label"
            :value="item.value"
@@ -103,9 +103,9 @@
        :highlight-current-row="true"
        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
        @current-change="handleDtlCurrentChange"
+        @row-click="clcikRow"
      >
        <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="单据号" align="center" />
        <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
@@ -152,13 +152,14 @@
 <script>

 import { crud } from '@crud/crud'
+import inBill from '@/views/wms/storage_manage/ios/inbill/inbill'
 // import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'

 export default {
  name: 'ViewDialog',
  components: { },
  mixins: [crud()],
-  dicts: ['IO_BILL_STATUS', 'WORK_STATUS', 'TASK_STATUS'],
+  dicts: ['IO_BILL_STATUS', 'WORK_STATUS', 'TASK_STATUS', 'ST_INV_IN_TYPE'],
  props: {
    dialogShow: {
      type: Boolean,
@@ -242,18 +243,14 @@ export default {
      this.currentDis = current
    },
    queryTableDtl() {
-    /*  checkoutbill.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      inBill.getIosDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
        this.tableDtl = res
-      })*/
+      })
    },
-    queryTableDdis() {
-      /*if (this.currentdtl !== null) {
-        checkoutbill.getOutBillTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
-          this.tabledis = res
-        }).catch(() => {
-          this.tabledis = []
-        })
-      }*/
+    clcikRow(row) {
+      inBill.getIosDisTask(row).then(res => {
+        this.tabledis = res
+      })
    }
  }
 }
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/inbill.js
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/inbill.js
@@ -32,4 +32,93 @@ export function queryBoxMater(data) {
  })
 }

-export default { add, edit, del, queryBoxMater }
+export function getInDtl(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/getInDtl',
+    method: 'post',
+    data
+  })
+}
+
+export function getIosDtl(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/getIosDtl',
+    method: 'post',
+    data
+  })
+}
+
+export function getIosDis(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/getIosDis',
+    method: 'post',
+    data
+  })
+}
+
+export function autoDivPoint(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/autoDivPoint',
+    method: 'post',
+    data
+  })
+}
+
+export function unDivPoint(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/unDivPoint',
+    method: 'post',
+    data
+  })
+}
+
+export function setPoint(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/setPoint',
+    method: 'post',
+    data
+  })
+}
+
+export function getIosDisTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/getIosDisTask',
+    method: 'post',
+    data
+  })
+}
+
+export function delTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/delTask',
+    method: 'post',
+    data
+  })
+}
+
+export function issueTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/issueTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmTask(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/confirmTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/stIvtIostorinv/inBill/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, queryBoxMater, getInDtl, getIosDtl, getIosDis,
+  autoDivPoint, unDivPoint, setPoint, getIosDisTask, delTask, issueTask, confirmTask, confirm }
--- a/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/storage_manage/ios/inbill/index.vue
@@ -325,7 +325,9 @@ export default {
      this.viewShow = true
    },
    confirm() {
-
+      inBill.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
    },
    stateFormat(row, column) {
      return this.dict.label.IO_BILL_STATUS[row.bill_status]
@@ -334,12 +336,20 @@ export default {
      return this.dict.label.ST_CREATE_MODE[row.create_mode]
    },
    divOpen() {
+      inBill.getIosDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.openParam = res
+        this.divShow = true
+      })
    },
    querytable() {
      this.onSelectAll()
      this.crud.toQuery()
    },
    taskOpen() {
+      inBill.getIosDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.openParam = res
+        this.taskShow = true
+      })
    }
  }
 }