rev: 成品入库前后端修改

mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue

@@ -1,4 +1,3 @@
-<!--suppress ALL -->
 <template>
   <el-dialog
     :title="crud.status.title"
@@ -27,24 +26,24 @@
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
-      <el-form-item label="仓库" prop="product_code">
+      <el-form-item label="仓库" prop="stor_id">
         <label slot="label">仓&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp库:</label>
         <el-select
-          v-model="form.product_code"
+          v-model="form.stor_id"
           clearable
           class="filter-item"
           style="width: 210px"
           :disabled="crud.status.view > 0"
         >
           <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="业务类型">
+      <el-form-item label="业务类型" prop="bill_type">
         <el-select
           v-model="form.bill_type"
           clearable
@@ -114,7 +113,7 @@
           size="mini"
           @click="insertEvent()"
         >
-          添加物料
+          添加单据物料
         </el-button>
         <el-button
           slot="left"
@@ -122,7 +121,7 @@
           type="primary"
           icon="el-icon-plus"
           size="mini"
-          @click="insertEvent()"
+          @click="insertdtl()"
         >
           新增一行
         </el-button>
@@ -139,23 +138,19 @@
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
 
-      <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="material_spec" label="物料规格" />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
-        <template slot-scope="scope">
-          <el-input
-            v-model="form.tableData[scope.$index].pcsn"
-            clearable
-            :controls="false"
-            controls-position="right"
-            size="small"
-          />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
+        <template scope="scope">
+          <el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="入库数量">
         <template slot-scope="scope">
           <el-input-number
+            v-show="!scope.row.edit"
             v-model="form.tableData[scope.$index].plan_qty"
             size="small"
             :controls="false"
@@ -164,8 +159,18 @@
             :min="0"
             @change="changeQty"
           />
+          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
       </el-table-column>
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" />
+      <el-table-column show-overflow-tooltip prop="remark" label="明细备注">
+        <template slot-scope="scope">
+          <el-input v-model="form.tableData[scope.$index].remark" size="small" />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="source_bill_type" label="源单类型" />
+      <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" />
+
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
           <el-button
@@ -181,9 +186,14 @@
 
     <MaterDtl
       :dialog-show.sync="materShow"
-      :is-single="false"
+      :is-single="true"
       :mater-opt-code="materType"
-      @setMaterValue="tableChanged"
+      @setMaterValue="tableChanged1"
+    />
+
+    <AddDtl
+      :dialog-show.sync="dtlShow"
+      @tableChanged="tableChanged2"
     />
 
   </el-dialog>
@@ -193,6 +203,8 @@
 import CRUD, { crud, form } from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
+import AddDtl from '@/views/wms/storage_manage/product/productIn/AddDtl'
+import crudStorattr from "@/api/wms/basedata/st/storattr"
 
 const defaultForm = {
   bill_code: '',
@@ -209,7 +221,7 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: { MaterDtl },
+  components: { MaterDtl, AddDtl },
   mixins: [crud(), form(defaultForm)],
   dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
   props: {
@@ -231,8 +243,8 @@ export default {
       storlist: [],
       billtypelist: [],
       rules: {
-        product_code: [
-          { required: true, message: '生产车间不能为空', trigger: 'blur' }
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
         ],
         bill_type: [
           { required: true, message: '业务类型不能为空', trigger: 'blur' }
@@ -252,8 +264,8 @@ export default {
   },
   methods: {
     open() {
-      crudProductIn.queryStor().then(res => {
-        this.storlist = res
+      crudStorattr.queryStor().then(res => {
+        this.storlist = res.content
       })
     },
     close() {
@@ -261,7 +273,7 @@ export default {
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -271,7 +283,7 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -290,8 +302,8 @@ export default {
 
       for (let i = 0; i < this.form.tableData.length; i++) {
         const row = this.form.tableData[i]
-        if (!row.pcsn || !row.plan_qty) {
-          this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+        if (!row.plan_qty) {
+          this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
       }
@@ -324,16 +336,42 @@ export default {
           item.quality_scode = '01'
           item.ivt_level = '01'
           item.is_active = '1'
-          item.plan_qty = '1'
+          item.plan_qty = '0'
+          item.edit = true
           this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
           this.form.tableData.splice(-1, 0, item)
         }
       })
       this.form.detail_count = this.form.tableData.length
+    },
+    tableChanged1(row) {
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_name = row.material_name
+      this.nowrow.plan_qty = '0'
+      this.nowrow.qty_unit_name = row.unit_name
+      this.nowrow.qty_unit_id = row.base_unit_id
+
+    },
+    tableChanged2(row) {
+
     },
     insertEvent(row) {
+      this.dtlShow = true
+    },
+    queryMater(index, row) {
+      this.nowindex = index
+      this.nowrow = row
       this.materShow = true
     },
+    insertdtl() {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.form.tableData.push({ edit: false, plan_qty: '0' })
+      this.form.detail_count = this.form.tableData.length
+    },
     changeQty() {
       this.form.total_qty = 0
       this.form.tableData.forEach((item) => {

mes/qd/src/views/wms/storage_manage/product/productIn/AddDtl.vue

@@ -1,64 +1,57 @@
-<!--suppress ALL -->
 <template>
   <el-dialog
     title="物料新增"
     append-to-body
     :visible.sync="dialogVisible"
     destroy-on-close
-    width="1000px"
+    width="1200px"
     @close="close"
     @open="open"
   >
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" />
-        <el-input
-          v-model="query.bill_code"
-          clearable
-          size="mini"
-          placeholder="单据号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.package_box_sn"
-          clearable
-          size="mini"
-          placeholder="箱号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.container_name"
-          clearable
-          size="mini"
-          placeholder="子卷号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.material_search"
-          clearable
-          size="mini"
-          placeholder="物料编码"
-          style="width: 230px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.sap_pcsn"
-          clearable
-          size="mini"
-          placeholder="sap批次"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="销售单号">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="销售单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="客户编码">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="客户编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="创建日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation />
@@ -71,17 +64,18 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column show-overflow-tooltip width="150" prop="sale_order_name" label="订单号" />
-        <el-table-column show-overflow-tooltip width="150" prop="customer_name" label="客户编号" />
-        <el-table-column width="200" prop="customer_description" label="客户名称" />
-        <el-table-column show-overflow-tooltip prop="package_box_sn" width="250" label="箱号" />
-        <el-table-column show-overflow-tooltip width="100" prop="quanlity_in_box" label="箱内子卷数" />
-        <el-table-column show-overflow-tooltip width="150" prop="container_name" label="子卷号" />
-        <el-table-column show-overflow-tooltip width="150" prop="sap_pcsn" label="sap批次" />
-        <el-table-column show-overflow-tooltip width="150" prop="product_name" label="物料编码" />
-        <el-table-column show-overflow-tooltip width="170" prop="product_description" label="物料描述" />
-        <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
-        <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" />
+        <el-table-column show-overflow-tooltip width="150" prop="sale_code" label="销售单号" />
+        <el-table-column show-overflow-tooltip width="150" prop="sale_type" label="销售单类型" />
+        <el-table-column show-overflow-tooltip width="150" prop="status" label="状态" />
+        <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip width="150" prop="sale_qty" label="销售数量" />
+        <el-table-column show-overflow-tooltip width="150" prop="cust_code" label="客户编码" />
+        <el-table-column show-overflow-tooltip width="150" prop="cust_name" label="客户名称" />
+        <el-table-column show-overflow-tooltip width="150" prop="qty_unit_name" label="单位" />
+        <el-table-column show-overflow-tooltip width="150" prop="plandeliver_date" label="计划交期" />
+        <el-table-column show-overflow-tooltip width="150" prop="create_name" label="创建人" />
+        <el-table-column show-overflow-tooltip width="150" prop="create_time" label="创建时间" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -146,21 +140,6 @@ export default {
       this.crud.query.bill_type = '0001'
       return true
     },
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        if (rowIndex % 2 === 0) {
-          return {
-            rowspan: 2,
-            colspan: 1
-          }
-        } else {
-          return {
-            rowspan: 0,
-            colspan: 0
-          }
-        }
-      }
-    },
     open() {
       this.crud.toQuery()
     },
@@ -168,14 +147,12 @@ export default {
       this.$emit('update:dialogShow', false)
     },
     submit() {
-
       this.$emit('update:dialogShow', false)
       this.rows = this.$refs.multipleTable.selection
       crudProductIn.queryBoxMater(this.rows).then(res => {
         this.rows = res
         this.$emit('tableChanged', this.rows)
       })
-      // this.form = this.$options.data().form
     }
   }
 }

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -1,4 +1,3 @@
-<!--suppress ALL -->
 <template>
   <el-dialog
     append-to-body
@@ -36,6 +35,7 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @row-click="clcikRow"
       >
+        <el-table-column type="index" label="序号" width="50" align="center" />
         <el-table-column prop="bill_status" label="状态" align="center" width="110px">
           <template slot-scope="scope">
             <el-select
@@ -54,17 +54,49 @@
         </el-table-column>
         <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="material_spec" label="物料规格" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" 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="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-column show-overflow-tooltip prop="source_bill_type" label="源单类型" align="center" />
+        <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号" align="center" />
+
       </el-table>
     </el-card>
     <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
       <el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
-        <el-form-item label="入库点" prop="point_code">
+        <el-form-item label="载具号:" prop="vehicle_code">
+          <el-input
+            v-model="form.vehicle_code"
+            style="width: 200px"
+            size="mini"
+            clearable
+            placeholder="载具号"
+          />
+        </el-form-item>
+
+        <el-form-item label="箱号:" prop="pageBox_code">
+          <el-input v-model="form.pageBox_code" size="mini" style="width: 200px" disabled placeholder="箱号" >
+            <el-button slot="append" icon="el-icon-plus" @click="queryBox" />
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="放入数量:" prop="storage_qty">
+          <el-input-number
+            v-model="form.storage_qty"
+            style="width: 200px"
+            size="mini"
+            :controls="false"
+            precision="3"
+            :min="0"
+            placeholder="数量"
+          />
+        </el-form-item>
+
+        <el-form-item label="入库点:" prop="point_code">
           <el-select
             v-model="form.point_code"
+            size="mini"
             clearable
             placeholder="请选择"
             class="filter-item"
@@ -78,13 +110,14 @@
             />
           </el-select>
         </el-form-item>
+
       </el-form>
     </el-card>
     <div class="crud-opts2">
       <span class="role-span">载具物料明细</span>
       <div class="crud-opts-form">
         <el-form ref="form" :inline="true" :model="form" size="mini">
-          <el-form-item label="区域" prop="gender5">
+          <el-form-item label="库区:" prop="gender5">
             <el-cascader
               placeholder="请选择"
               :options="sects"
@@ -101,6 +134,16 @@
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="confirmvehicle()"
+        >
+          装入托盘
+        </el-button>
         <el-button
           slot="left"
           class="filter-item"
@@ -158,40 +201,12 @@
         <el-table-column show-overflow-tooltip type="index" 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="material_spec" label="物料规格" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" 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="storagevehicle_code" label="载具号" align="center">
-          <template slot-scope="scope">
-            <el-input
-              v-model="form.tableMater[scope.$index].storagevehicle_code"
-              clearable
-              :controls="false"
-              controls-position="right"
-              size="small"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column show-overflow-tooltip prop="overstruct_type" label="载具超限" align="center">
-          <template slot-scope="scope">
-            <el-select
-              v-model="form.tableMater[scope.$index].overstruct_type"
-              clearable
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 100px;"
-            >
-              <el-option
-                v-for="item in dict.MD_OVERSTRUCT_TYPE"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
+        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
+        <el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
+        <el-table-column show-overflow-tooltip prop="real_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="point_code" label="入库点" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
       </el-table>
     </el-card>
 
@@ -254,6 +269,8 @@ export default {
         sect_id: '',
         stor_id: '',
         point_code: null,
+        vehicle_code: "",
+        pageBox_code: "",
         checked: true,
         tableMater: []
       },
@@ -293,11 +310,7 @@ export default {
     },
     clcikRow(row, column, event) {
       this.form.dtl_row = row
-      crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id }).then(res => {
-        this.openParam = res
-        this.form.dtl_row = res[row.index]
-      })
-      crudProductIn.getDisDtl(row).then(res => {
+      crudProductIn.getIosInvDis({ "iostorinv_id": row.iostorinv_id, "iostorinvdtl_id": row.iostorinvdtl_id }).then(res => {
         this.form.tableMater = res
       })
     },

mes/qd/src/views/wms/storage_manage/product/productIn/index.vue

@@ -1,4 +1,3 @@
-<!--suppress ALL -->
 <template>
   <div class="app-container">
     <!--工具栏-->
@@ -22,10 +21,10 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.IO_BILL_STATUS"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
               />
             </el-select>
           </el-form-item>
@@ -186,7 +185,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="单据类型" :formatter="bill_typeFormat" />
-        <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" />
+        <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" min-width="120"/>
         <el-table-column prop="" label="生产车间" width="130" show-overflow-tooltip />
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column label="总重量" align="center" prop="total_qty">
@@ -225,7 +224,7 @@
 </template>
 
 <script>
-import productIn from '@/views/wms/storage_manage/product/productIn/productin'
+import productIn, {getIosInvDtl} from '@/views/wms/storage_manage/product/productIn/productin'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -236,6 +235,7 @@ import DateRangePicker from '@/components/DateRangePicker/index'
 import AddDialog from '@/views/wms/storage_manage/product/productIn/AddDialog'
 import DivDialog from '@/views/wms/storage_manage/product/productIn/DivDialog'
 import ViewDialog from '@/views/wms/storage_manage/product/productIn/ViewDialog'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -246,7 +246,7 @@ export default {
       title: '',
       optShow: { add: true, reset: true },
       idField: 'iostorinv_id',
-      url: '/api/in/productIn',
+      url: '/api/productIn',
       crudMethod: { ...productIn }
     })
   },
@@ -281,8 +281,8 @@ export default {
     }
   },
   created() {
-    crudProductIn.queryStor().then(res => {
-      this.storlist = res
+    crudStorattr.queryStor().then(res => {
+      this.storlist = res.content
     })
   },
   methods: {
@@ -350,9 +350,8 @@ export default {
       return this.dict.label.IO_BILL_STATUS[row.bill_status]
     },
     divOpen() {
-      crudProductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
+      crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
         this.openParam = res
-        debugger
         this.storId = this.currentRow.product_code
         this.billType = this.currentRow.bill_type
         this.divShow = true

mes/qd/src/views/wms/storage_manage/product/productIn/productin.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: '/api/in/productIn',
+    url: '/api/productIn',
     method: 'post',
     data
   })
@@ -10,158 +10,31 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: '/api/in/productIn',
-    method: 'delete',
+    url: '/api/productIn/delete',
+    method: 'post',
     data: ids
   })
 }
 
 export function edit(data) {
   return request({
-    url: '/api/in/productIn',
-    method: 'put',
-    data
-  })
-}
-
-export function getType(params) {
-  return request({
-    url: '/api/in/productIn/getType',
-    method: 'get',
-    params
-  })
-}
-
-export function getIODtl(data) {
-  return request({
-    url: '/api/in/productIn/getIODtl',
+    url: '/api/productIn/update',
     method: 'post',
     data
   })
 }
 
-export function insertDtl(data) {
+export function getIosInvDtl(data) {
   return request({
-    url: '/api/in/productIn/insertDtl',
+    url: '/api/productIn/getIosInvDtl',
     method: 'post',
     data
   })
 }
 
-export function commit(data) {
+export function getIosInvDis(data) {
   return request({
-    url: '/api/in/productIn/commit',
-    method: 'post',
-    data
-  })
-}
-
-export function checkVehicle(data) {
-  return request({
-    url: '/api/in/productIn/checkVehicle',
-    method: 'post',
-    data
-  })
-}
-
-export function confirmvehicle(data) {
-  return request({
-    url: '/api/in/productIn/confirmvehicle',
-    method: 'post',
-    data
-  })
-}
-
-export function getDisDtl(data) {
-  return request({
-    url: '/api/in/productIn/getDisDtl',
-    method: 'post',
-    data
-  })
-}
-
-export function divStruct(data) {
-  return request({
-    url: '/api/in/productIn/divStruct',
-    method: 'post',
-    data
-  })
-}
-
-export function unDivStruct(data) {
-  return request({
-    url: '/api/in/productIn/unDivStruct',
-    method: 'post',
-    data
-  })
-}
-
-export function divPoint(data) {
-  return request({
-    url: '/api/in/productIn/divPoint',
-    method: 'post',
-    data
-  })
-}
-
-export function bucketDtl(data) {
-  return request({
-    url: '/api/in/productIn/bucketDtl',
-    method: 'post',
-    data
-  })
-}
-
-export function updateTask(data) {
-  return request({
-    url: '/api/in/productIn/updateTask',
-    method: 'post',
-    data
-  })
-}
-
-export function confirmTask(data) {
-  return request({
-    url: '/api/in/productIn/confirmTask',
-    method: 'post',
-    data
-  })
-}
-
-export function confirm(data) {
-  return request({
-    url: '/api/in/productIn/confirm',
-    method: 'post',
-    data
-  })
-}
-
-export function delDis(data) {
-  return request({
-    url: '/api/in/productIn/delDis',
-    method: 'post',
-    data
-  })
-}
-
-export function queryBoxMater(data) {
-  return request({
-    url: '/api/in/productIn/queryBoxMater',
-    method: 'post',
-    data
-  })
-}
-
-export function queryStor() {
-  return request({
-    url: '/api/in/productIn/queryStor',
-    method: 'post'
-  })
-}
-
-export function getDisTask(data) {
-  return request({
-    url: '/api/in/productIn/getDisTask',
+    url: '/api/productIn/getIosInvDis',
     method: 'post',
     data
   })
@@ -171,22 +44,6 @@ export default {
   add,
   edit,
   del,
-  getType,
-  insertDtl,
-  getIODtl,
-  commit,
-  checkVehicle,
-  confirmvehicle,
-  getDisDtl,
-  divStruct,
-  unDivStruct,
-  divPoint,
-  delDis,
-  queryBoxMater,
-  bucketDtl,
-  updateTask,
-  confirmTask,
-  confirm,
-  queryStor,
-  getDisTask
+  getIosInvDtl,
+  getIosInvDis
 }