更新

src/api/Inventory/MaterialOut.js

@@ -51,7 +51,7 @@ export function searchList(pageCurrent, pageSize, listPeople_check, listPeople,
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间装配管理_领料单_查询数据',
+      name: '车间装配管理_领料单_查询数据_出库',
       param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&是否审批=1',
       Pagination: pageCurrent + '&' + pageSize
     }

src/api/Inventory/OfflinePartOut.js

@@ -73,7 +73,7 @@ export function searchPeople(data1) {
   })
 }
 // 离线件出库
-export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14) {
+export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14, data15, data16) {
   return request({
     url: '',
     method: 'post',
@@ -82,7 +82,7 @@ export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8,
       ModularID: router.currentRoute.path,
       type: '2',
       name: '库存管理_离线采购件_零件出库',
-      param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12 + '&领料部门=' + data13 + '&备注1=' + data14
+      param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12 + '&领料部门=' + data13 + '&备注1=' + data14 + '&物料与货位对照流水号=' + data15 + '&出库类型=' + data16
     }
   })
 }

src/views/Inventory/Inboundscanning/index.vue

@@ -3,7 +3,7 @@
     <el-card style="width: 1000px">
       <el-row>
         <span style="margin-left: 10px">跟单号</span>
-        <el-input v-model="partNumber" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
+        <el-input v-model="partNumberP" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
         <el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="getscantable()">查询</el-button>
         <!--<el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">-->
         <!--<el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>-->
@@ -109,6 +109,7 @@ export default {
       a: '',
       tableData: [],
       partNumber: '',
+      partNumberP: '',
       listLoading: false,
       craftplannumber: '',
       radio2: 3,
@@ -160,8 +161,8 @@ export default {
     },
     // 数据接收
     websocketonmessage(msg) {
-      this.partNumber = msg.data.split('|')[3]
+      this.partNumberP = msg.data.split('|')[3]
-      this.partNumber = this.partNumber.slice(1)
+      this.partNumber = this.partNumberP.slice(1)
       this.getscantable(this.partNumber)
     },
     // 关闭
@@ -197,6 +198,7 @@ export default {
     },
     // 根据流水号查询
     getscantable() {
+      this.partNumber = this.partNumberP.slice(1)
       // this.tableData = []
       this.finishParts = []
       this.listLoading = true

src/views/Inventory/InventoryCheck/index.vue

@@ -316,7 +316,7 @@ export default {
         data: {
           type: '2',
           name: `库存管理_库存盘点_物料货位数量_修改数据`,
-          param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}&盘点人编号=${this.$store.state.user.id}`
+          param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&组件零件基本件流水号=${row.组件零件基本件流水号}&物料与货位对照流水号=${row.物料与货位对照流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}&盘点人编号=${this.$store.state.user.id}`
         }
       }
       request(param).then(res => {

src/views/Inventory/MaterialOut/index2.vue

@@ -44,7 +44,7 @@
       </el-table-column>
       <el-table-column label="库存" align="center" width="70">
         <template slot-scope="scope">
-          {{ scope.row.货位存量1 }}
+          {{ scope.row.货位存量1 ? scope.row.货位存量1 : 0 }}
         </template>
       </el-table-column>
       <el-table-column label="已领" align="center" width="70">
@@ -194,6 +194,7 @@ export default {
       var check
       this.pickingListNumber ? check = 1 : check = 0
       searchList222(check, this.pickingListNumber, this.pageCurrent1, this.pageSize1).then(response => {
+        console.log(response, 123)
         this.loading1 = false
         this.total1 = response.data.total
         this.pickListTable2 = response.data.rows

src/views/Inventory/OfflinePartOut/index.vue

@@ -406,8 +406,10 @@ export default {
       this.locateNumber = row.货位流水号
       this.materialNumber = row.物料流水号
       this.partnumber = row.货位存量
+      this.outType = row.出库类型
       this.离线合同明细流水号 = row.离线合同明细流水号
       this.组件零件基本件流水号 = row.组件零件基本件流水号
+      this.物料与货位对照流水号 = row.物料与货位对照流水号
       this.departments = []
       this.DirectNotes = []
       this.selectLeaders()
@@ -451,7 +453,7 @@ export default {
                     this.DirectNote111 = this.DirectNotes[i].label
                   }
                 }
-                outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111, this.form.Remarks).then(response => {
+                outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111, this.form.Remarks, this.物料与货位对照流水号, this.outType).then(response => {
                   if (response.data[0].result === '1') {
                     this.$message.success('零件出库成功')
                     this.dialogFormVisible = false