|
|
|
@ -1,77 +1,59 @@ |
|
|
|
<template> |
|
|
|
<view class="page-wraper"> |
|
|
|
<view class="header"> |
|
|
|
<view class=""> |
|
|
|
<job-top :dataContent="jobContent"></job-top> |
|
|
|
</view> |
|
|
|
<view class="cen_card" style="padding-top: 10rpx;padding-bottom: 10rpx;"> |
|
|
|
<view class="cell_box uni-flex uni-row" style=" font-weight: bold;"> |
|
|
|
<view class="cell_info" style="color: #000"> |
|
|
|
<view class="text_lightblue" style="color: #000">阶段</view> |
|
|
|
<view style="color: #000">{{getCountStageName(jobContent.stage)}}</view> |
|
|
|
</view> |
|
|
|
<view class="cell_info"> |
|
|
|
<view class="text_lightblue" style="color: #000">策略</view> |
|
|
|
<view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view> |
|
|
|
</view> |
|
|
|
<view class="cell_info"> |
|
|
|
<view class="text_lightblue" style="color: #000">库位</view> |
|
|
|
<view style="color: #000">{{fromLocationCode}}</view> |
|
|
|
</view> |
|
|
|
<view class="cell_info"> |
|
|
|
<view class="text_lightblue" style="color: #000">总数</view> |
|
|
|
<view style="color: #000"> {{allCount}}</view> |
|
|
|
</view> |
|
|
|
<view class="cell_info"> |
|
|
|
<view class="text_lightblue" style="color: #000">已扫描</view> |
|
|
|
<view style="color: #000">{{scanCount}}</view> |
|
|
|
<view class="page-header"> |
|
|
|
<view class="header-view"> |
|
|
|
<view class="header_job_top"> |
|
|
|
<job-top :dataContent="jobContent"></job-top> |
|
|
|
<view class="" style="margin-left: 10rpx; margin-top: 10rpx;margin-bottom: 10rpx;"> |
|
|
|
<text style=" font-size: 32rpx; color: #6750F1">库位代码 </text> |
|
|
|
<text style="font-size: 35rpx; font-weight: bold;">{{locationCode}}</text> |
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
</view> |
|
|
|
<u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line> |
|
|
|
<view style="margin-top: 160rpx; padding-bottom: 130rpx;"> |
|
|
|
<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line> |
|
|
|
<scroll-view scroll-y="true" class="" style="margin-bottom: 0px;"> |
|
|
|
<view class="detail-list" v-for="(item, index) in showList" :key="item.id"> |
|
|
|
<view class="page-main" style="margin-bottom: 100rpx;background-color: #F3F4F5"> |
|
|
|
<scroll-view scroll-y="true" class="page-main-scroll"> |
|
|
|
<view class="" style="background-color: #F3F4F5" v-for="(item, index) in dataList" :key="item.id"> |
|
|
|
<uni-swipe-action ref="swipeAction"> |
|
|
|
<uni-swipe-action-item @click="swipeClick($event,item)" |
|
|
|
:right-options="item.scaned?scanOptions:detailOptions"> |
|
|
|
<view class="uni-flex uni-row " style="align-items: center;" :class="item.scaned?'scan_view':'item'"> |
|
|
|
<view class="" style="font-size: 30rpx; font-weight: bold;"> |
|
|
|
{{index+1}}. |
|
|
|
</view> |
|
|
|
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem" |
|
|
|
:settingParam="jobContent" @remove="updateData" @updateData="updateData"> |
|
|
|
<uni-swipe-action-item> |
|
|
|
<view class="uni-flex uni-row " |
|
|
|
style="align-items: center; margin: 10rpx; border-radius: 10rpx ;" |
|
|
|
> |
|
|
|
<comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" |
|
|
|
@editItem="editItem" :settingParam="jobContent" @remove="updateData" |
|
|
|
@summCount="summCount" @currentCount="currentCount" @updateData="updateData"> |
|
|
|
</comCountDetailcards> |
|
|
|
</view> |
|
|
|
<view class='split_line'></view> |
|
|
|
</uni-swipe-action-item> |
|
|
|
</uni-swipe-action> |
|
|
|
</view> |
|
|
|
</scroll-view> |
|
|
|
<uni-load-more :status="loadingType" v-if="showList.length>0" /> |
|
|
|
|
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="page-footer"> |
|
|
|
<view class="uni-flex u-col-center space-between padding_10" style="background-color:ghostwhite; width: 100%; "> |
|
|
|
<view class="uni-flex u-col-center space-between padding_10" |
|
|
|
style="background-color:ghostwhite; width: 100%; "> |
|
|
|
<view class=""> |
|
|
|
</view> |
|
|
|
<view class=" uni-flex uni-row"> |
|
|
|
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button> |
|
|
|
<button class="btn_single_commit" hover-class="btn_commit_after" @click="submitJob">提交</button> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
|
<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true" |
|
|
|
@getCountScanResult='getScanResult'> |
|
|
|
:isShowHistory="false" |
|
|
|
@getCountScanResult='getCountScanResult'> |
|
|
|
</win-scan-pack-and-location> |
|
|
|
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
|
|
<count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" |
|
|
|
:allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount=='TRUE'"> |
|
|
|
:allowEditStatus="true" :isShowBalance="true"> |
|
|
|
</count-qty-edit> |
|
|
|
<detail-info-popup ref="detailInfoPopup"></detail-info-popup> |
|
|
|
<comwinHint ref="comHint"></comwinHint> |
|
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
@ -79,8 +61,6 @@ |
|
|
|
<script> |
|
|
|
import { |
|
|
|
getCountJobDetail, |
|
|
|
takeCountJob, |
|
|
|
cancleTakeCountJob, |
|
|
|
countJobSubmit |
|
|
|
} from '@/api/request2.js'; |
|
|
|
import { |
|
|
|
@ -95,7 +75,8 @@ |
|
|
|
goHome, |
|
|
|
navigateBack, |
|
|
|
getPackingNumberAndBatch, |
|
|
|
compare |
|
|
|
compare, |
|
|
|
deepCopyData |
|
|
|
} from '@/common/basic.js'; |
|
|
|
import { |
|
|
|
getCountStageName |
|
|
|
@ -119,6 +100,8 @@ |
|
|
|
import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue' |
|
|
|
import jobTop from '@/mycomponents/job/jobTop.vue' |
|
|
|
import detailInfoPopup from '@/pages/count/coms/detailInfoPopup.vue' |
|
|
|
import comwinHint from '@/pages/count/coms/comwinHint.vue' |
|
|
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
name: 'receipt_detail', |
|
|
|
@ -129,53 +112,38 @@ |
|
|
|
winScanPackAndLocation, |
|
|
|
countQtyEdit, |
|
|
|
jobTop, |
|
|
|
detailInfoPopup |
|
|
|
detailInfoPopup, |
|
|
|
comwinHint |
|
|
|
}, |
|
|
|
data() { |
|
|
|
return { |
|
|
|
id: '', |
|
|
|
receiptJob: {}, |
|
|
|
fromLocationCode: '', |
|
|
|
isShowPackingCode: true, |
|
|
|
locationCode: '', |
|
|
|
jobContent: {}, //任务内容 |
|
|
|
subList: [], //接口返回的任务subList |
|
|
|
detailSource: [], //绑定在页面上的数据源 |
|
|
|
balance: {}, //库存余额 |
|
|
|
editInventoryStatus: false, |
|
|
|
package: {}, //包装 |
|
|
|
label: {}, //标签 |
|
|
|
currentEditItem: {}, |
|
|
|
mainItem: {}, |
|
|
|
jobStatus: "", |
|
|
|
allCount: 0, |
|
|
|
scanCount: 0, |
|
|
|
index: 0, |
|
|
|
pageSize: 20, |
|
|
|
showList: [], |
|
|
|
loadingType: "", |
|
|
|
allDetails: [], |
|
|
|
scanOptions: [], |
|
|
|
detailOptions: [], |
|
|
|
dataList: [], |
|
|
|
managementList: [], |
|
|
|
managementType: '' |
|
|
|
managementType: '', |
|
|
|
isOpen:false |
|
|
|
|
|
|
|
}; |
|
|
|
}, |
|
|
|
onLoad(option) { |
|
|
|
uni.setNavigationBarTitle({ |
|
|
|
title: option.title + '详情' |
|
|
|
}) |
|
|
|
this.id = option.id; |
|
|
|
if (this.id != undefined) { |
|
|
|
//新建的任务自动接收 |
|
|
|
if (option.status == "1") { |
|
|
|
this.receive((callback => { |
|
|
|
this.getDetail(); |
|
|
|
})); |
|
|
|
} else { |
|
|
|
this.getDetail(); |
|
|
|
} |
|
|
|
if (this.id) { |
|
|
|
this.getDetail(); |
|
|
|
} |
|
|
|
this.detailOptions = getDetailOption(); |
|
|
|
this.scanOptions = getDetailEditRemoveOption(); |
|
|
|
uni.$on('refreshData', (data) => { |
|
|
|
// 调用刷新数据的方法 |
|
|
|
this.refreshData(data); |
|
|
|
}); |
|
|
|
}, |
|
|
|
//返回首页 |
|
|
|
onNavigationBarButtonTap(e) { |
|
|
|
@ -187,56 +155,18 @@ |
|
|
|
onBackPress(e) { |
|
|
|
//已经接收但是没提交任务 |
|
|
|
if (e.from === 'backbutton') { |
|
|
|
if (this.jobStatus == "2") { |
|
|
|
//取消承接任务 |
|
|
|
cancleTakeCountJob(this.id).then(res => { |
|
|
|
uni.navigateBack(); |
|
|
|
}).catch(error => { |
|
|
|
uni.navigateBack(); |
|
|
|
}) |
|
|
|
} else { |
|
|
|
uni.navigateBack(); |
|
|
|
} |
|
|
|
uni.navigateBack(); |
|
|
|
return true; |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
onPullDownRefresh() { |
|
|
|
this.initList(); |
|
|
|
uni.stopPullDownRefresh(); |
|
|
|
}, |
|
|
|
|
|
|
|
mounted() { |
|
|
|
|
|
|
|
}, |
|
|
|
onReachBottom() { |
|
|
|
console.log("onReachBottom") |
|
|
|
//避免多次触发 |
|
|
|
if (this.loadingType == 'nomore') { |
|
|
|
return; |
|
|
|
} |
|
|
|
this.index++; |
|
|
|
var list = this.getDataPage(this.index, this.pageSize) |
|
|
|
if (list.length > 0) { |
|
|
|
// this.showList=list |
|
|
|
this.showList = this.showList.concat(list) |
|
|
|
} else { |
|
|
|
//没有更多了 |
|
|
|
this.loadingType = "nomore"; |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
computed() {}, |
|
|
|
methods: { |
|
|
|
//接收 |
|
|
|
receive(callback) { |
|
|
|
if (this.id != null) { |
|
|
|
takeCountJob(this.id).then(res => { |
|
|
|
callback(); |
|
|
|
}).catch(error => { |
|
|
|
this.showErrorMessage(error) |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
getDetail() { |
|
|
|
var that = this; |
|
|
|
@ -250,37 +180,15 @@ |
|
|
|
that.showMessage('未获取到详情'); |
|
|
|
} else { |
|
|
|
that.jobContent = res.data; |
|
|
|
that.jobStatus = res.data.status; |
|
|
|
that.fromLocationCode = that.jobContent.countSplitCode; |
|
|
|
res.data.subList.forEach(item => { |
|
|
|
item.recommendQty = item.qty |
|
|
|
item.handleQty = 0 |
|
|
|
item.countTime = new Date() |
|
|
|
item.fromLocationCode = that.fromLocationCode; |
|
|
|
}) |
|
|
|
that.allDetails = res.data.subList; |
|
|
|
that.allCount = res.data.subList.length; |
|
|
|
//获取管理模式，封装参数 |
|
|
|
var itemCodes = [] |
|
|
|
this.allDetails.forEach(item => { |
|
|
|
itemCodes.push(item.itemCode) |
|
|
|
item.scaned = false |
|
|
|
}) |
|
|
|
await getManagementPrecisions(itemCodes, that.fromLocationCode, res => { |
|
|
|
if (res.success) { |
|
|
|
this.managementList = res.list; |
|
|
|
this.managementType = this.managementList.some(item => item.ManagementPrecision == |
|
|
|
'BY_BATCH') ? 'BY_BATCH' : '' |
|
|
|
if (this.managementType == 'BY_BATCH') { |
|
|
|
this.allDetails.forEach(item => { |
|
|
|
item.packingNumber = '' |
|
|
|
item.toPackingNumber = '' |
|
|
|
item.fromPackingNumber = '' |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
that.jobContent.status = "2"; |
|
|
|
that.locationCode = that.jobContent.locationCode; |
|
|
|
|
|
|
|
that.dataList = res.data.subList; |
|
|
|
that.dataList.forEach(res => { |
|
|
|
res.scaned = false; |
|
|
|
}) |
|
|
|
that.initList() |
|
|
|
|
|
|
|
that.updateList(false) |
|
|
|
} |
|
|
|
|
|
|
|
}).catch(error => { |
|
|
|
@ -289,47 +197,86 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
initList() { |
|
|
|
this.index = 1; |
|
|
|
this.showList = [] |
|
|
|
this.loadingType = ""; |
|
|
|
this.showList = this.getDataPage(this.index, this.pageSize) |
|
|
|
}, |
|
|
|
refreshData(recordList) { |
|
|
|
//记录的数据刷新列表 |
|
|
|
var addList = [] |
|
|
|
recordList.forEach(subItem => { |
|
|
|
let mainItem = this.dataList.find(r => |
|
|
|
r.itemCode == subItem.itemCode && |
|
|
|
r.batch == subItem.batch && |
|
|
|
r.inventoryStatus == subItem.inventoryStatus) |
|
|
|
//主列表存在数据 |
|
|
|
if (mainItem) { |
|
|
|
mainItem.scaned = true; |
|
|
|
if (!mainItem.recordList) { |
|
|
|
mainItem.recordList = [] |
|
|
|
} |
|
|
|
mainItem.recordList.push(subItem) |
|
|
|
} else { |
|
|
|
//主列表不存在数据，添加到主列表 |
|
|
|
var detail = this.createBackAddDetailInfo(subItem) |
|
|
|
|
|
|
|
getDataPage(pageNo, pageSize) { |
|
|
|
//计算总页数 |
|
|
|
var totalPages = Math.ceil(this.allCount / pageSize); |
|
|
|
//当前页起始索引 |
|
|
|
const start = (pageNo - 1) * pageSize; |
|
|
|
const end = start + pageSize; //当前页结束索引 |
|
|
|
return this.allDetails.slice(start, end) |
|
|
|
if (!detail.recordList) { |
|
|
|
detail.recordList = [] |
|
|
|
} |
|
|
|
var recordItem = { |
|
|
|
scaned: true, |
|
|
|
isNewJobDetail: "true", |
|
|
|
itemCode: subItem.itemCode, |
|
|
|
itemName: subItem.itemName, |
|
|
|
itemDesc1: subItem.itemDesc1, |
|
|
|
itemDesc2: subItem.itemDesc2, |
|
|
|
packingNumber: subItem.packingNumber, |
|
|
|
toPackingNumber:subItem.toPackingNumber, |
|
|
|
toBatch:subItem.toBatch, |
|
|
|
batch: subItem.batch, |
|
|
|
inventoryStatus: subItem.inventoryStatus, |
|
|
|
qty: subItem.qty, |
|
|
|
handleQty: subItem.handleQty, |
|
|
|
uom: subItem.uom, |
|
|
|
packUnit: subItem.packUnit, |
|
|
|
packQty: subItem.packQty, |
|
|
|
balanceQty: subItem.balanceQty, |
|
|
|
locationCode: subItem.locationCode |
|
|
|
} |
|
|
|
detail.recordList.push(recordItem) |
|
|
|
addList.push(detail) |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
if (addList.length > 0) { |
|
|
|
this.dataList = this.dataList.concat(addList) |
|
|
|
} |
|
|
|
|
|
|
|
this.updateList(false); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
swipeClick(e, item) { |
|
|
|
if (e.content.text == "详情") { |
|
|
|
this.detail(item) |
|
|
|
} else if (e.content.text == "编辑") { |
|
|
|
this.editItem(item) |
|
|
|
} else if (e.content.text == "移除") { |
|
|
|
this.remove(item) |
|
|
|
} |
|
|
|
}, |
|
|
|
detail(item) { |
|
|
|
this.showItem = item; |
|
|
|
this.$refs.detailInfoPopup.openPopup(item); |
|
|
|
|
|
|
|
summCount(countAllRecordList) { |
|
|
|
if (countAllRecordList) { |
|
|
|
this.$refs.comHint.openScanPopup(countAllRecordList) |
|
|
|
} else { |
|
|
|
this.showMessage("累计盘点数为0") |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
remove(item, index) { |
|
|
|
this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?", |
|
|
|
res => { |
|
|
|
if (res) { |
|
|
|
item.scaned = false; |
|
|
|
item.handleQty = 0; |
|
|
|
this.showList.splice(index, 1) |
|
|
|
this.$emit('removePack') |
|
|
|
} |
|
|
|
}); |
|
|
|
currentCount(recordList) { |
|
|
|
if (recordList) { |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pages/count/job/countRecord?data=${encodeURIComponent(JSON.stringify(recordList))}` |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.showMessage("请先扫描箱码") |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
@ -337,8 +284,8 @@ |
|
|
|
|
|
|
|
openScanPopup() { |
|
|
|
var fromlocationList = []; |
|
|
|
fromlocationList.push(this.fromLocationCode) |
|
|
|
this.$refs.scanPopup.openScanPopupForJob(this.fromLocationCode, fromlocationList, this.jobContent); |
|
|
|
fromlocationList.push(this.locationCode) |
|
|
|
this.$refs.scanPopup.openScanPopupForJob(this.locationCode, fromlocationList, this.jobContent); |
|
|
|
}, |
|
|
|
|
|
|
|
closeScanPopup() { |
|
|
|
@ -358,276 +305,324 @@ |
|
|
|
this.$refs.scanPopup.packLoseFocus(); |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
//明盘 |
|
|
|
getScanResult(result) { |
|
|
|
|
|
|
|
getCountScanResult(result, managementPrecision) { |
|
|
|
var itemCode = result.label.itemCode |
|
|
|
var packingNumber = result.label.packingNumber |
|
|
|
var pack = result.package |
|
|
|
var batch = result.label.batch |
|
|
|
var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK" |
|
|
|
var qty = result.balance ? result.balance.qty : result.label.qty; |
|
|
|
|
|
|
|
//按物料、箱码、批次、状态匹配 |
|
|
|
let items = this.allDetails.filter(r => |
|
|
|
r.itemCode === itemCode && |
|
|
|
// r.packingNumber === packingNumber && |
|
|
|
r.batch === batch && |
|
|
|
r.inventoryStatus === inventoryStatus) |
|
|
|
//不在任务列表中,是否添加库存 |
|
|
|
if (items.length == 0) { |
|
|
|
// 按批次 |
|
|
|
if (this.managementType == 'BY_BATCH'){ |
|
|
|
this.$refs.comMessage.showQuestionMessage("批次【" + result.label.batch + |
|
|
|
"】不在任务列表中,是否要添加到列表中?",res => { |
|
|
|
//创建盘点信息，标记为已经扫描 |
|
|
|
if (res) { |
|
|
|
var detail = this.createAddDetailInfo(pack, qty) |
|
|
|
detail.countTime = new Date(); |
|
|
|
this.allDetails.push(detail) |
|
|
|
this.updateList(); |
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, |
|
|
|
null); |
|
|
|
} else { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} |
|
|
|
}) |
|
|
|
}else{ |
|
|
|
this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber + |
|
|
|
"】不在任务列表中,是否要添加到列表中?",res => { |
|
|
|
//创建盘点信息，标记为已经扫描 |
|
|
|
if (res) { |
|
|
|
var detail = this.createAddDetailInfo(pack, qty) |
|
|
|
detail.countTime = new Date(); |
|
|
|
this.allDetails.push(detail) |
|
|
|
this.updateList(); |
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, |
|
|
|
null); |
|
|
|
} else { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} |
|
|
|
}) |
|
|
|
var uom = pack.uom |
|
|
|
var locationCode = this.locationCode |
|
|
|
this.managementType = managementPrecision; |
|
|
|
|
|
|
|
var recordItem = { |
|
|
|
scaned: true, |
|
|
|
isNewJobDetail: "false", |
|
|
|
itemCode: itemCode, |
|
|
|
itemName: pack.itemName, |
|
|
|
itemDesc1: pack.itemDesc1, |
|
|
|
itemDesc2: pack.itemDesc2, |
|
|
|
packingNumber: packingNumber, |
|
|
|
batch: batch, |
|
|
|
toPackingNumber:packingNumber, |
|
|
|
toBatch: batch, |
|
|
|
inventoryStatus: inventoryStatus, |
|
|
|
qty: qty, |
|
|
|
handleQty: qty, |
|
|
|
uom: uom, |
|
|
|
packUnit: pack.packUnit, |
|
|
|
packQty: pack.packQty, |
|
|
|
balanceQty: qty, |
|
|
|
locationCode: locationCode |
|
|
|
} |
|
|
|
this.currentEditItem = recordItem; |
|
|
|
this.isOpen=true |
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(recordItem, |
|
|
|
null); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
setData(scanItem){ |
|
|
|
if(this.isOpen){ |
|
|
|
this.isOpen=false |
|
|
|
//按批次管理 |
|
|
|
if (this.managementType == 'BY_BATCH') { |
|
|
|
//按物料、箱码、批次、状态匹配 |
|
|
|
let mainItem = this.dataList.find(r => |
|
|
|
r.itemCode == scanItem.itemCode && |
|
|
|
r.locationCode == scanItem.locationCode && |
|
|
|
r.batch == scanItem.batch && |
|
|
|
r.inventoryStatus == scanItem.inventoryStatus) |
|
|
|
|
|
|
|
//在任务列表中,添加到对应的recordList |
|
|
|
if (mainItem) { |
|
|
|
if (!mainItem.recordList) { |
|
|
|
mainItem.recordList = [] |
|
|
|
} |
|
|
|
mainItem.scaned=true; |
|
|
|
var subItem = mainItem.recordList.find(res => |
|
|
|
res.itemCode == scanItem.itemCode && |
|
|
|
res.locationCode == scanItem.locationCode && |
|
|
|
res.packingNumber == scanItem.packingNumber && |
|
|
|
res.batch == scanItem.batch && |
|
|
|
res.inventoryStatus == scanItem.inventoryStatus |
|
|
|
) |
|
|
|
scanItem.toPackingNumber="" |
|
|
|
|
|
|
|
//已经存在，数量累加 |
|
|
|
if (subItem) { |
|
|
|
subItem.handleQty = calc.add(Number(subItem.handleQty), Number(subItem.handleQty)) |
|
|
|
} else { |
|
|
|
mainItem.recordList.unshift(scanItem) |
|
|
|
} |
|
|
|
} else { |
|
|
|
//不在任务列表中,添加到列表中 |
|
|
|
var detail = this.createAddDetailInfo(scanItem) |
|
|
|
scanItem.isNewJobDetail="true" |
|
|
|
|
|
|
|
if (!detail.recordList) { |
|
|
|
detail.recordList = [] |
|
|
|
} |
|
|
|
|
|
|
|
var subItem = detail.recordList.find(res => |
|
|
|
res.itemCode == scanItem.itemCode && |
|
|
|
res.locationCode == scanItem.locationCode && |
|
|
|
res.packingNumber == scanItem.packingNumber && |
|
|
|
res.batch == scanItem.batch && |
|
|
|
res.inventoryStatus == scanItem.inventoryStatus |
|
|
|
) |
|
|
|
scanItem.toPackingNumber="" |
|
|
|
|
|
|
|
//已经存在，数量累加 |
|
|
|
if (subItem) { |
|
|
|
subItem.handleQty = calc.add(Number(subItem.handleQty), Number(scanItem.handleQty)) |
|
|
|
} else { |
|
|
|
detail.recordList.unshift(scanItem) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this.dataList.unshift(detail) |
|
|
|
} |
|
|
|
} else { |
|
|
|
var selectItem = items[0] |
|
|
|
//已经扫描 |
|
|
|
if (selectItem.scaned) { |
|
|
|
// 按批次 |
|
|
|
if (this.managementType == 'BY_BATCH'){ |
|
|
|
this.$refs.comMessage.showQuestionMessage("批次【" + result.label.batch + |
|
|
|
"】已经完成盘点,是否要编辑盘点结果?", |
|
|
|
res => { |
|
|
|
if (res) { |
|
|
|
this.currentEditItem = selectItem; |
|
|
|
this.$refs.countQtyEdit.openEditPopup(selectItem, |
|
|
|
null); |
|
|
|
} else { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} |
|
|
|
}) |
|
|
|
}else{ |
|
|
|
this.$refs.comMessage.showQuestionMessage("包装【" + result.label.packingNumber + |
|
|
|
"】已经完成盘点,是否要编辑盘点结果?", |
|
|
|
res => { |
|
|
|
if (res) { |
|
|
|
this.currentEditItem = selectItem; |
|
|
|
this.$refs.countQtyEdit.openEditPopup(selectItem, |
|
|
|
null); |
|
|
|
} else { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
} else if (this.managementType == 'BY_QUANTITY') { |
|
|
|
let item = this.dataList.find(r => |
|
|
|
r.itemCode == scanItem.itemCode && |
|
|
|
r.locationCode == scanItem.locationCode && |
|
|
|
r.inventoryStatus == scanItem.inventoryStatus) |
|
|
|
//在任务列表中,添加到对应的recordList |
|
|
|
if (item) { |
|
|
|
if (!item.recordList) { |
|
|
|
item.recordList = [] |
|
|
|
} |
|
|
|
item.scaned=true; |
|
|
|
var subItem = item.recordList.find(res => |
|
|
|
res.itemCode == scanItem.itemCode && |
|
|
|
res.packingNumber == scanItem.packingNumber && |
|
|
|
res.batch == scanItem.batch && |
|
|
|
res.locatioCode == scanItem.locatioCode && |
|
|
|
res.inventoryStatus == scanItem.inventoryStatus |
|
|
|
) |
|
|
|
subItem.toPackingNumber="", |
|
|
|
subItem.toBatch="" |
|
|
|
//已经存在，数量累加 |
|
|
|
if (subItem) { |
|
|
|
subItem.handleQty = calc.add(Number(subItem.handleQty), Number(scanItem.handleQty)) |
|
|
|
} else { |
|
|
|
item.recordList.unshift(scanItem) |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
//不在任务列表中,添加到列表中 |
|
|
|
var detail = this.createAddDetailInfo(scanItem) |
|
|
|
|
|
|
|
if (!detail.recordList) { |
|
|
|
detail.recordList = [] |
|
|
|
} |
|
|
|
var subItem = detail.recordList.find(res => |
|
|
|
res.itemCode == scanItem.itemCode && |
|
|
|
res.packingNumber == scanItem.packingNumber && |
|
|
|
res.batch == scanItem.batch && |
|
|
|
res.inventoryStatus == scanItem.inventoryStatus |
|
|
|
) |
|
|
|
subItem.toPackingNumber="", |
|
|
|
subItem.toBatch="" |
|
|
|
//已经存在，数量累加 |
|
|
|
if (subItem) { |
|
|
|
subItem.handleQty = calc.add(Number(subItem.handleQty), Number(scanItem.handleQty)) |
|
|
|
} else { |
|
|
|
detail.recordList.unshift(scanItem) |
|
|
|
} |
|
|
|
|
|
|
|
this.currentEditItem = scanItem; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
//未扫描，赋值 |
|
|
|
selectItem.scaned = true; |
|
|
|
selectItem.balanceQty = Number(qty) |
|
|
|
selectItem.handleQty = Number(qty) |
|
|
|
selectItem.packQty = pack.packQty |
|
|
|
selectItem.packUnit = pack.packUnit |
|
|
|
selectItem.parentPackingNumber = pack.parentPackingNumber |
|
|
|
selectItem.locationCode = this.fromLocationCode |
|
|
|
selectItem.fromLocationCode = this.fromLocationCode |
|
|
|
|
|
|
|
this.$refs.countQtyEdit.openEditPopupShowSeconds(selectItem, |
|
|
|
null); |
|
|
|
selectItem.countTime = new Date(); |
|
|
|
this.updateList(); |
|
|
|
} |
|
|
|
this.updateList(true); |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
editConfirm(qty, inventoryStatus, mode) { |
|
|
|
let that = this; |
|
|
|
//编辑 |
|
|
|
if (mode == 'edit') { |
|
|
|
this.currentEditItem.handleQty = qty; |
|
|
|
this.currentEditItem.inventoryStatus = inventoryStatus; |
|
|
|
|
|
|
|
updateList(isGetFocus) { |
|
|
|
this.calcScanCount() |
|
|
|
this.calcQtyAndUpdateSatus() |
|
|
|
this.sortList(); |
|
|
|
this.$forceUpdate() |
|
|
|
if(isGetFocus){ |
|
|
|
this.scanPopupLoseFocus() |
|
|
|
} |
|
|
|
//重新排序 |
|
|
|
this.currentEditItem.countTime = new Date(); |
|
|
|
this.updateList(); |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
|
|
|
|
}, |
|
|
|
editConfirm(qty, inventoryStatus, mode) { |
|
|
|
//需要考虑，是否修改状态，修改状态直接添加到列表，不修改，只修改数量 |
|
|
|
this.currentEditItem.handleQty = qty; |
|
|
|
this.currentEditItem.inventoryStatus = inventoryStatus; |
|
|
|
this.setData(this.currentEditItem); |
|
|
|
console.log("editConfirm") |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
updateList() { |
|
|
|
this.allDetails.sort(compare('countTime')); //按扫描信息排序 |
|
|
|
this.initList() |
|
|
|
this.scanPopupLoseFocus() |
|
|
|
this.calcAllCount() |
|
|
|
this.calcScanCount() |
|
|
|
calcQtyAndUpdateSatus() { |
|
|
|
this.dataList.forEach(item => { |
|
|
|
if (Number(item.currentQty) == 0) { |
|
|
|
if (Number(item.qty) == Number(item.totalRecordCountQty)) { |
|
|
|
item.countStatus = "finish" |
|
|
|
} else { |
|
|
|
item.countStatus = "wait" |
|
|
|
} |
|
|
|
} else if (Number(item.currentQty) > 0) { |
|
|
|
item.countStatus = "doing" |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
calcAllCount() { |
|
|
|
this.allCount = this.allDetails.length; |
|
|
|
sortList() { |
|
|
|
const statusOrder = { |
|
|
|
'wait': 1, |
|
|
|
'doing': 2, |
|
|
|
'finish': 3 |
|
|
|
}; |
|
|
|
|
|
|
|
this.dataList.sort((a, b) => { |
|
|
|
return statusOrder[a.countStatus] - statusOrder[b.countStatus]; |
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
calcScanCount() { |
|
|
|
this.scanCount = this.allDetails.filter(r => r.scaned === true).length; |
|
|
|
this.dataList.forEach(main => { |
|
|
|
if (main.recordList) { |
|
|
|
var handleQty = 0; |
|
|
|
main.recordList.forEach(item => { |
|
|
|
handleQty = calc.add(handleQty, Number(item.handleQty)) |
|
|
|
}) |
|
|
|
main.currentQty = handleQty |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
editClose() { |
|
|
|
this.scanPopupGetFocus(); |
|
|
|
this.setData(this.currentEditItem); |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
//创建盘盈的明细 |
|
|
|
createAddDetailInfo(pack, qty) { |
|
|
|
createAddDetailInfo(scanImte) { |
|
|
|
var detail = { |
|
|
|
masterId: this.jobContent.id, //新增的明细 |
|
|
|
scaned: true, |
|
|
|
countDetailNumber: "", |
|
|
|
ownerCode: "", |
|
|
|
packingNumber: pack.number, |
|
|
|
containerNumber: "", |
|
|
|
batch: pack.batch, |
|
|
|
inventoryStatus: "OK", |
|
|
|
itemCode: pack.itemCode, |
|
|
|
itemName: pack.itemName, |
|
|
|
itemDesc1: pack.itemDesc1, |
|
|
|
itemDesc2: pack.itemDesc2, |
|
|
|
packQty: pack.packQty, |
|
|
|
packUnit: pack.packUnit, |
|
|
|
projectCode: "", |
|
|
|
recommendQty: Number(qty), |
|
|
|
qty: Number(qty), |
|
|
|
handleQty: Number(qty), |
|
|
|
uom: pack.uom, |
|
|
|
number: pack.number, |
|
|
|
remark: "", |
|
|
|
countQty: Number(qty), |
|
|
|
balanceQty: Number(qty), |
|
|
|
fromLocationCode: this.fromLocationCode, |
|
|
|
locationCode: this.fromLocationCode, |
|
|
|
creator: this.$store.state.user.id, |
|
|
|
countTime: new Date() |
|
|
|
scaned:true, |
|
|
|
isNewJobDetail: "true", |
|
|
|
batch: scanImte.batch, |
|
|
|
countAllRecordList: [], |
|
|
|
currentQty: 0, |
|
|
|
id: "", |
|
|
|
inventoryStatus: scanImte.inventoryStatus, |
|
|
|
itemCode: scanImte.itemCode, |
|
|
|
itemName: scanImte.itemName, |
|
|
|
itemDesc1: scanImte.itemDesc1, |
|
|
|
itemDesc2: scanImte.itemDesc2, |
|
|
|
packingNumber: scanImte.packingNumber, |
|
|
|
qty: 0, |
|
|
|
totalRecordCountQty: 0, |
|
|
|
uom: scanImte.uom, |
|
|
|
locationCode: scanImte.locationCode, |
|
|
|
|
|
|
|
} |
|
|
|
return detail; |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
commit() { |
|
|
|
this.calcAllCount() |
|
|
|
this.calcScanCount() |
|
|
|
// if(!this.scanCount){ |
|
|
|
// this.$refs.comMessage.showErrorMessage('请先进行扫描,再进行提交'); |
|
|
|
// return |
|
|
|
// } |
|
|
|
if (this.scanCount == this.allCount) { |
|
|
|
this.submitJob(); |
|
|
|
} else if (this.scanCount < this.allCount) { |
|
|
|
//扫描数量小于任务数量，判断是否允许部分提交 |
|
|
|
if (this.jobContent.allowPartialComplete == "TRUE") { |
|
|
|
//提交 |
|
|
|
this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount + |
|
|
|
"]总共[" + |
|
|
|
this.allCount + "],是否把未扫描的盘点数量设置为0?", |
|
|
|
res => { |
|
|
|
if (res) { |
|
|
|
this.allDetails.forEach(item => { |
|
|
|
if (!item.scaned) { |
|
|
|
item.scaned = true; |
|
|
|
item.handleQty = 0 |
|
|
|
item.locationCode = this.fromLocationCode |
|
|
|
item.fromLocationCode = this.fromLocationCode |
|
|
|
} |
|
|
|
}) |
|
|
|
this.submitJob(); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
} else { |
|
|
|
//不允许部分提交，提示 |
|
|
|
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交\n' + "已经扫描[" + this.scanCount + |
|
|
|
"]总共[" + this |
|
|
|
.getTotalCount() + "]", res => { |
|
|
|
if (res) { |
|
|
|
this.openScanPopup(); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
//创建盘盈的明细 |
|
|
|
createBackAddDetailInfo(subItem) { |
|
|
|
var detail = { |
|
|
|
scaned:true, |
|
|
|
isNewJobDetail: "true", |
|
|
|
batch: subItem.batch, |
|
|
|
countAllRecordList: [], |
|
|
|
currentQty: 0, |
|
|
|
id: "", |
|
|
|
inventoryStatus: subItem.inventoryStatus, |
|
|
|
itemCode: subItem.itemCode, |
|
|
|
itemName: subItem.itemName, |
|
|
|
itemDesc1: subItem.itemDesc1, |
|
|
|
itemDesc2: subItem.itemDesc2, |
|
|
|
packingNumber: subItem.packingNumber, |
|
|
|
qty: 0, |
|
|
|
totalRecordCountQty: 0, |
|
|
|
uom: subItem.uom, |
|
|
|
locationCode: subItem.locationCode |
|
|
|
} |
|
|
|
|
|
|
|
return detail; |
|
|
|
}, |
|
|
|
|
|
|
|
submitJob() { |
|
|
|
if (!this.checkData()) { |
|
|
|
this.showErrorMessage("当前扫描数据为0,请先扫描") |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
uni.showLoading({ |
|
|
|
title: "提交中....", |
|
|
|
mask: true |
|
|
|
}); |
|
|
|
//获取管理模式，封装参数 |
|
|
|
var itemCodes = [] |
|
|
|
this.allDetails.forEach(item => { |
|
|
|
itemCodes.push(item.itemCode) |
|
|
|
// item.scaned = false |
|
|
|
var params = this.setParams() |
|
|
|
// return; |
|
|
|
countJobSubmit(params).then(res => { |
|
|
|
uni.hideLoading() |
|
|
|
const str = res.data || '' |
|
|
|
this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str) |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading() |
|
|
|
this.showErrorMessage(error) |
|
|
|
}) |
|
|
|
getManagementPrecisions(itemCodes, this.fromLocationCode, res => { |
|
|
|
if (res.success) { |
|
|
|
this.managementList = res.list; |
|
|
|
var params = this.setParams() |
|
|
|
console.log("提交参数", params); |
|
|
|
countJobSubmit(params).then(res => { |
|
|
|
uni.hideLoading() |
|
|
|
const str = res.data || '' |
|
|
|
this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + str) |
|
|
|
// if (res.data) { |
|
|
|
// this.showCommitSuccessMessage("提交成功\n生成盘点记录\n" + res.data) |
|
|
|
// } else { |
|
|
|
// this.showErrorMessage("提交失败[" + res.msg + "]") |
|
|
|
// } |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading() |
|
|
|
this.showErrorMessage(error) |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
checkData() { |
|
|
|
var isCheck = false; |
|
|
|
this.dataList.forEach(item => { |
|
|
|
if (item.scaned) { |
|
|
|
isCheck = true |
|
|
|
} |
|
|
|
}) |
|
|
|
return isCheck; |
|
|
|
}, |
|
|
|
|
|
|
|
setParams() { |
|
|
|
var submitData = { |
|
|
|
number: this.jobContent.number, |
|
|
|
locationCode: this.locationCode, |
|
|
|
recordList: [] |
|
|
|
} |
|
|
|
var subList = [] |
|
|
|
var creator = this.$store.state.user.id |
|
|
|
console.log(this.allDetails) |
|
|
|
this.allDetails.forEach(item => { |
|
|
|
if (item.scaned) { |
|
|
|
item.countQty = item.handleQty; |
|
|
|
var info = getPackingNumberAndBatch(this.managementList, item.itemCode, |
|
|
|
item.packingNumber, item.batch); |
|
|
|
item.toPackingNumber = info.packingNumber; |
|
|
|
item.packingNumber = info.packingNumber; |
|
|
|
item.fromPackingNumber = info.packingNumber; |
|
|
|
|
|
|
|
this.dataList.forEach(item => { |
|
|
|
if (item.scaned && item.recordList && item.recordList.length > 0) { |
|
|
|
submitData.recordList = submitData.recordList.concat(item.recordList) |
|
|
|
|
|
|
|
} |
|
|
|
subList.push(item) |
|
|
|
}) |
|
|
|
|
|
|
|
this.jobContent.subList = subList |
|
|
|
this.jobContent.creator = creator; |
|
|
|
return this.jobContent; |
|
|
|
}) |
|
|
|
return submitData; |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
@ -672,9 +667,6 @@ console.log(this.allDetails) |
|
|
|
getCountStageName(value) { |
|
|
|
return getCountStageName(value) |
|
|
|
}, |
|
|
|
isOpenCount(value) { |
|
|
|
return value == "TRUE" ? "明盘" : "盲盘" |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
