|
|
|
@ -3,17 +3,18 @@ |
|
|
|
<uni-popup ref="popup" :maskClick='false'> |
|
|
|
<view class=""> |
|
|
|
<view class="popup_box"> |
|
|
|
|
|
|
|
<view class="pop_title uni-flex space-between"> |
|
|
|
<view class="" style="font-size: 35rpx;"> |
|
|
|
扫描箱码 |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class=""> |
|
|
|
|
|
|
|
<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" |
|
|
|
@click="closeScanPopup()"></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
<!-- <view class="uni-flex uni-row" style="align-items: center; |
|
|
|
background-color: #fff; |
|
|
|
margin-left: 20rpx; |
|
|
|
@ -32,28 +33,29 @@ |
|
|
|
@confirm="confirmSelect"></u-select> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<u-line class='line_color'></u-line> --> |
|
|
|
</view> --> |
|
|
|
<!-- <u-line class='line_color'></u-line> --> |
|
|
|
|
|
|
|
<view class="uni-flex uni-row" style="align-items: center; |
|
|
|
<!-- <view class="uni-flex uni-row" style="align-items: center; |
|
|
|
background-color: #fff; |
|
|
|
margin-left: 20rpx; |
|
|
|
margin-right: 20rpx; |
|
|
|
margin-top: 8rpx; |
|
|
|
border-radius: 8rpx;"> |
|
|
|
<view class="uni-center" style="width: 25%; "> |
|
|
|
<view class="uni-center" style="width: 25%; font-size: 35rpx; "> |
|
|
|
来源库位 |
|
|
|
</view> |
|
|
|
<view class="" style="width: 75%; padding: 8rpx;"> |
|
|
|
<uni-combox :candidates="fromLocationList" v-model="fromLocationCode" placeholder="请选择库位" |
|
|
|
@confirm="fromLocationUpdate"></uni-combox> |
|
|
|
</view> |
|
|
|
<uni-combox class="my-combox" :candidates="fromLocationList" v-model="fromLocationCode" |
|
|
|
placeholder="请选择库位" @confirm="fromLocationUpdate" |
|
|
|
:inputStyle="inputStyleObject"></uni-combox> |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
|
|
|
|
<view class=""> |
|
|
|
<view class=""> |
|
|
|
<win-com-scan ref="comscan" placeholder="箱标签" @getResult="onScan" :clearResult="true" |
|
|
|
:headerType="headerType" :isShowHistory="false"> |
|
|
|
headerType="HPQ,HMQ" :isShowHistory="false" :locationCode='locationCode'> |
|
|
|
</win-com-scan> |
|
|
|
|
|
|
|
<view style="width: 100%;"> |
|
|
|
@ -76,7 +78,7 @@ |
|
|
|
<uni-swipe-action-item @click="swipeClick($event,record,index)" |
|
|
|
:right-options="scanOptions"> |
|
|
|
<view style="padding: 0px 10px"> |
|
|
|
<balance :dataContent="record" :isShowLocation="false" |
|
|
|
<balance :dataContent="record" :isShowFromLocation="false" |
|
|
|
:isShowStdPack="false"></balance> |
|
|
|
</view> |
|
|
|
</uni-swipe-action-item> |
|
|
|
@ -95,6 +97,10 @@ |
|
|
|
<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select> |
|
|
|
<comMessage ref="comMessage"></comMessage> |
|
|
|
<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit> |
|
|
|
<!-- 模拟扫描功能 --> |
|
|
|
<!-- <win-com-scan v-show="false" ref="comscansimulate" placeholder="箱标签" @getResult="onScan" :clearResult="true" |
|
|
|
headerType="HPQ,HMQ" :isShowHistory="false"> |
|
|
|
</win-com-scan> --> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -108,24 +114,33 @@ |
|
|
|
getDetailOption, |
|
|
|
getDetailEditRemoveOption |
|
|
|
} from '@/common/array.js'; |
|
|
|
import { |
|
|
|
getWorkShopLineStation, |
|
|
|
getBalanceByFilter, |
|
|
|
getBalanceByParams, |
|
|
|
} from '@/api/request2.js'; |
|
|
|
import { |
|
|
|
uniqueArray |
|
|
|
} from '@/common/basic.js'; |
|
|
|
|
|
|
|
import { |
|
|
|
getDirectoryItemArray, |
|
|
|
} from '@/common/directory.js'; |
|
|
|
getLabelInfo |
|
|
|
} from '@/common/label.js'; |
|
|
|
|
|
|
|
import { |
|
|
|
calc |
|
|
|
} from '@/common/calc.js'; |
|
|
|
import { |
|
|
|
getWorkShopLineStation |
|
|
|
} from '@/api/request2.js'; |
|
|
|
|
|
|
|
import { |
|
|
|
getBalanceByManagementPrecision |
|
|
|
} from '@/common/balance.js'; |
|
|
|
import { |
|
|
|
getDirectoryItemArray |
|
|
|
} from '../../../common/directory.js'; |
|
|
|
|
|
|
|
export default { |
|
|
|
name: 'winScanPack', |
|
|
|
emits: ["afterScan", "closeScan"], |
|
|
|
components: { |
|
|
|
winComScan, |
|
|
|
balance, |
|
|
|
@ -137,12 +152,10 @@ |
|
|
|
type: String, |
|
|
|
default: '' |
|
|
|
}, |
|
|
|
headerType: { |
|
|
|
locationCode:{ |
|
|
|
type: String, |
|
|
|
default: "HPQ,HMQ" |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
default: '' |
|
|
|
} |
|
|
|
}, |
|
|
|
data() { |
|
|
|
return { |
|
|
|
@ -163,9 +176,14 @@ |
|
|
|
positionInfo: "请选择位置", |
|
|
|
positionList: [], |
|
|
|
defaultValueList: [], |
|
|
|
fromInventoryStatuses: "", |
|
|
|
packageInfo: {}, |
|
|
|
label: {}, |
|
|
|
fromInventoryStatuses: [], |
|
|
|
packageInfo: {} |
|
|
|
inputStyleObject: { |
|
|
|
fontSize: "100rpx" |
|
|
|
}, |
|
|
|
bussinessCode: 'Issue', |
|
|
|
toLocationAreaTypeList: [] |
|
|
|
} |
|
|
|
}, |
|
|
|
created() { |
|
|
|
@ -177,13 +195,29 @@ |
|
|
|
this.scanOptions = getDetailEditRemoveOption(); |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
openScanPopupForJobSimulate(content, jobcontent, scanMessage) { |
|
|
|
this.issueRecord = []; |
|
|
|
this.dataContent = content; |
|
|
|
this.jobContent = jobcontent; |
|
|
|
this.initData(); |
|
|
|
getLabelInfo(scanMessage, "HPQ,HMQ", callback => { |
|
|
|
if (callback.success) { |
|
|
|
this.onScan(callback); |
|
|
|
} else { |
|
|
|
this.showErrorMessage(callback.message, res => {}) |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
openScanPopup(content, jobcontent) { |
|
|
|
this.issueRecord = []; |
|
|
|
this.dataContent = content; |
|
|
|
this.jobContent = jobcontent; |
|
|
|
this.initData(); |
|
|
|
this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + |
|
|
|
"-" + this.jobContent.subList[0].workStationCode |
|
|
|
// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + |
|
|
|
// "-" + this.jobContent.subList[0].workStationCode |
|
|
|
this.$refs.popup.open('bottom') |
|
|
|
setTimeout(res => { |
|
|
|
this.getfocus(); |
|
|
|
@ -202,57 +236,58 @@ |
|
|
|
let that = this; |
|
|
|
that.fromLocationList = []; |
|
|
|
if (that.dataContent != null) { |
|
|
|
that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses) |
|
|
|
that.toLocation =that.dataContent.subList; |
|
|
|
that.toLocationCode = that.dataContent.subList[0].toLocationCode; |
|
|
|
that.fromLocationList = that.getFromLocationList(); |
|
|
|
that.fromInventoryStatuses = this.jobContent.outInventoryStatuses |
|
|
|
that.toLocation = that.dataContent[0]; |
|
|
|
that.toLocationCode = that.dataContent[0].toLocationCode; |
|
|
|
that.toLocationAreaTypeList = getDirectoryItemArray(this.jobContent.toAreaTypes) |
|
|
|
// that.fromLocationList = that.getFromLocationList(); |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
showBalanceSelect(items, packageInfo) { |
|
|
|
this.packageInfo = packageInfo; |
|
|
|
showBalanceSelect(items) { |
|
|
|
this.$refs.balanceSelect.openPopup(items); |
|
|
|
}, |
|
|
|
|
|
|
|
getFromLocationList() { |
|
|
|
let list = []; |
|
|
|
let location = this.dataContent.subList.find(r => r.toLocationCode == this.toLocationCode); |
|
|
|
if (location != undefined) { |
|
|
|
this.dataContent.subList.forEach(item => { |
|
|
|
list.push(item.fromLocationCode) |
|
|
|
}) |
|
|
|
this.fromLocationCode = list[0]; |
|
|
|
return list; |
|
|
|
} else { |
|
|
|
this.$refs.comMessage.showErrorMessages('需求库位【' + this.toLocationCode + '】不存在', res => { |
|
|
|
this.toLocationCode = ''; |
|
|
|
}); |
|
|
|
} |
|
|
|
}, |
|
|
|
// getFromLocationList() { |
|
|
|
// let list = []; |
|
|
|
// this.dataContent.forEach(location => { |
|
|
|
// location.Items.forEach(item => { |
|
|
|
// item.Locations.forEach(f => { |
|
|
|
// let item = list.find(l => l == f.fromLocationCode); |
|
|
|
// if (item == undefined) { |
|
|
|
// list.push(f.fromLocationCode) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// }) |
|
|
|
// }); |
|
|
|
// //去掉重复库位 |
|
|
|
// list = uniqueArray(list); |
|
|
|
// this.fromLocationCode = list[0]; |
|
|
|
// return list; |
|
|
|
// }, |
|
|
|
|
|
|
|
fromLocationUpdate(fromlocation) { |
|
|
|
let location = this.fromLocationList.find(r => r == fromlocation) |
|
|
|
// 成品发货任务--同一物料，可以扫描提交不在任务中的库位 |
|
|
|
// if (location == undefined) { |
|
|
|
this.fromLocationCode = fromlocation |
|
|
|
// this.showErrorMessage('发货库位【' + fromlocation + '】不存在') |
|
|
|
// } |
|
|
|
if (location == undefined) { |
|
|
|
this.fromLocationCode = '' |
|
|
|
this.showErrorMessage('发货库位【' + fromlocation + '】不存在') |
|
|
|
} |
|
|
|
}, |
|
|
|
onScan(result) { |
|
|
|
|
|
|
|
queryBalance(result) { |
|
|
|
try { |
|
|
|
let that = this; |
|
|
|
|
|
|
|
if (that.fromLocationCode == '') { |
|
|
|
that.showErrorMessage('请选择来源库位', res => { |
|
|
|
that.$refs.toLocationCombox.onFocus(); |
|
|
|
}); |
|
|
|
return; |
|
|
|
} |
|
|
|
// if (that.fromLocationCode == '') { |
|
|
|
// that.showErrorMessage('请选择来源库位', res => { |
|
|
|
// that.$refs.toLocationCombox.onFocus(); |
|
|
|
// }); |
|
|
|
// return; |
|
|
|
// } |
|
|
|
let packageInfo = result.package; |
|
|
|
let itemCode = result.label.itemCode; |
|
|
|
let packingCode = result.label.packingNumber; |
|
|
|
let lot = result.label.batch; |
|
|
|
let item = that.toLocation.find(r => r.itemCode == itemCode); |
|
|
|
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); |
|
|
|
if (item == undefined) { |
|
|
|
that.showErrorMessage('未查找到物料【' + itemCode + '】的发货明细', |
|
|
|
res => { |
|
|
|
@ -261,89 +296,268 @@ |
|
|
|
) |
|
|
|
return; |
|
|
|
} else { |
|
|
|
//查找库存信息 |
|
|
|
|
|
|
|
var params = { |
|
|
|
itemCode: result.package.itemCode, |
|
|
|
batch: result.label.batch, |
|
|
|
packingNumber: result.label.packingNumber, |
|
|
|
parentPackingNumber: result.package.parentNumber, |
|
|
|
inventoryStatus: this.jobContent.outInventoryStatuses.split(','), |
|
|
|
areaType: this.jobContent.fromAreaTypes.split(','), |
|
|
|
bussinessCode: this.jobContent.businessType |
|
|
|
} |
|
|
|
uni.showLoading({ |
|
|
|
title: '加载中', |
|
|
|
title: '查询中', |
|
|
|
mask: true |
|
|
|
}) |
|
|
|
getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses, |
|
|
|
balanceRes => { |
|
|
|
if (balanceRes.success) { |
|
|
|
if (balanceRes.data.list.length == 0) { |
|
|
|
this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录', |
|
|
|
getBalanceByParams(params).then(res => { |
|
|
|
if (res.data.length == 0) { |
|
|
|
var status = getInventoryStatusDesc(params.inventoryStatus) |
|
|
|
var areaType = getListLocationAreaTypeDesc(params.areaType) |
|
|
|
var hint = |
|
|
|
"按物料号 [" + params.itemCode + "] \n" + |
|
|
|
"包装号 [" + params.packingNumber + "] \n" + |
|
|
|
"批次 [" + params.batch + "] \n" + |
|
|
|
"状态 [" + status + "] \n" + |
|
|
|
"库区 [" + areaType + "] \n" + |
|
|
|
"未查找到库存余额" |
|
|
|
this.showErrorMessage(hint, |
|
|
|
res => { |
|
|
|
this.packGetFocus(); |
|
|
|
that.getfocus(); |
|
|
|
}) |
|
|
|
} else if (balanceRes.data.list.length == 1) { |
|
|
|
let balance = balanceRes.data.list[0]; |
|
|
|
this.afterGetBalance(result.label, balance, packageInfo); |
|
|
|
} else if (res.data.length == 1) { |
|
|
|
result.balance = res.data[0] |
|
|
|
|
|
|
|
if (result.label.packingNumber != result.balance.packingNumber) { |
|
|
|
result.balance.qty = Number(result.label.qty) |
|
|
|
} else { |
|
|
|
this.label = result.label; |
|
|
|
this.showBalanceSelect(balanceRes.data.list, packageInfo); |
|
|
|
result.balance.qty = Number(result.balance.qty) |
|
|
|
} |
|
|
|
this.afterGetBalance(result.label, result.balance, result.package); |
|
|
|
} else { |
|
|
|
this.showErrorMessage(balanceRes.message.message); |
|
|
|
//多条记录 |
|
|
|
this.$refs.balanceSelect.openPopup(res.data); |
|
|
|
} |
|
|
|
uni.hideLoading(); |
|
|
|
}); |
|
|
|
uni.hideLoading() |
|
|
|
}).catch(error => { |
|
|
|
uni.hideLoading() |
|
|
|
this.showErrorMessage(error, |
|
|
|
res => { |
|
|
|
that.getfocus(); |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} catch (e) { |
|
|
|
this.showErrorMessage(e.stack) |
|
|
|
this.showErrorMessage(e.stack, res => { |
|
|
|
that.getfocus(); |
|
|
|
}) |
|
|
|
uni.hideLoading(); |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
getBalance(label, packageInfo, callback) { |
|
|
|
var filters = [] |
|
|
|
if (packageInfo.parentNumber) { |
|
|
|
var packingNumber = packageInfo.parentNumber + "," + label.packingNumber; |
|
|
|
filters.push({ |
|
|
|
column: "packingNumber", |
|
|
|
action: "in", |
|
|
|
value: packingNumber |
|
|
|
}) |
|
|
|
} else { |
|
|
|
filters.push({ |
|
|
|
column: "packingNumber", |
|
|
|
action: "==", |
|
|
|
value: label.packingNumber |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
filters.push({ |
|
|
|
column: "itemCode", |
|
|
|
action: "==", |
|
|
|
value: label.itemCode |
|
|
|
}) |
|
|
|
filters.push({ |
|
|
|
column: "batch", |
|
|
|
action: "==", |
|
|
|
value: label.batch |
|
|
|
}) |
|
|
|
|
|
|
|
if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") { |
|
|
|
filters.push({ |
|
|
|
column: "inventoryStatus", |
|
|
|
action: "in", |
|
|
|
value: this.fromInventoryStatuses |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
var params = { |
|
|
|
filters: filters, |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
} |
|
|
|
getBalanceByFilter(params).then(res => { |
|
|
|
callback(res.data) |
|
|
|
}).catch(err => { |
|
|
|
this.showErrorMessage(err.message); |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
onScan(result) { |
|
|
|
if (!result.package) { |
|
|
|
this.showErrorMessage('扫描数据错误[' + result.label.code + "]", |
|
|
|
res => { |
|
|
|
this.getfocus(); |
|
|
|
} |
|
|
|
) |
|
|
|
return; |
|
|
|
} |
|
|
|
if (this.toLocation) { |
|
|
|
let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode); |
|
|
|
if (!item) { |
|
|
|
this.showErrorMessage('扫描物料代码不属于该任务'); |
|
|
|
return |
|
|
|
} |
|
|
|
this.getToLocationBalance(result) |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
//查询到目标库位的库存余额 |
|
|
|
getToLocationBalance(result) { |
|
|
|
uni.showLoading({ |
|
|
|
title: '查询中', |
|
|
|
mask: true |
|
|
|
}) |
|
|
|
var filters = [] |
|
|
|
if (result.package.parentNumber) { |
|
|
|
var packingNumber = result.package.parentNumber + "," + result.package.number; |
|
|
|
filters.push({ |
|
|
|
column: "packingNumber", |
|
|
|
action: "in", |
|
|
|
value: packingNumber |
|
|
|
}) |
|
|
|
} else { |
|
|
|
filters.push({ |
|
|
|
column: "packingNumber", |
|
|
|
action: "==", |
|
|
|
value: result.package.number |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
filters.push({ |
|
|
|
column: "itemCode", |
|
|
|
action: "==", |
|
|
|
value: result.package.itemCode |
|
|
|
}) |
|
|
|
filters.push({ |
|
|
|
column: "batch", |
|
|
|
action: "==", |
|
|
|
value: result.package.batch |
|
|
|
}) |
|
|
|
|
|
|
|
filters.push({ |
|
|
|
column: "areaType", |
|
|
|
action: "in", |
|
|
|
value: this.toLocationAreaTypeList.join(',') |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
var params = { |
|
|
|
filters: filters, |
|
|
|
pageNo: 1, |
|
|
|
pageSize: 100, |
|
|
|
} |
|
|
|
getBalanceByFilter(params).then(res => { |
|
|
|
uni.hideLoading() |
|
|
|
if (res.data.list.length > 0) { |
|
|
|
this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额"); |
|
|
|
} else { |
|
|
|
this.queryBalance(result); |
|
|
|
} |
|
|
|
// callback(res.data) |
|
|
|
}).catch(err => { |
|
|
|
uni.hideLoading() |
|
|
|
this.showErrorMessage(err.message); |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
selectBalanceItem(balance) { |
|
|
|
this.afterGetBalance(balance, balance, this.packageInfo); |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
afterGetBalance(label, balance, packageInfo) { |
|
|
|
let that = this; |
|
|
|
try { |
|
|
|
let itemCode = label.itemCode; |
|
|
|
let packingCode = label.packingNumber; |
|
|
|
let lot = label.batch; |
|
|
|
let item = that.toLocation.find(r => r.itemCode == itemCode); |
|
|
|
// item.scaned =true |
|
|
|
let fromLocation = that.toLocation.find(l => l.fromLocationCode == that.fromLocationCode); |
|
|
|
// 成品发货任务--同一物料，可以扫描提交不在任务中的库位 |
|
|
|
if(!fromLocation){ |
|
|
|
fromLocation = { |
|
|
|
Batchs:[{ |
|
|
|
Recommends:[], |
|
|
|
Records: [], |
|
|
|
batch: label.batch, |
|
|
|
detail:{ |
|
|
|
...packageInfo, |
|
|
|
fromLocationCode: balance.locationCode, |
|
|
|
toLocationCode:this.toLocationCode |
|
|
|
}, |
|
|
|
handleQty: 0, |
|
|
|
packingNumber: null, |
|
|
|
// packingNumber: label.packingNumber, |
|
|
|
qty: label.qty, |
|
|
|
uom: label.uom |
|
|
|
}], |
|
|
|
toLocationCode:this.toLocationCode, |
|
|
|
fromLocationCode: balance.locationCode, |
|
|
|
handleQty: 0, |
|
|
|
qty: label.qty, |
|
|
|
uom: label.uom |
|
|
|
let item = that.toLocation.Items.find(r => r.itemCode == itemCode); |
|
|
|
that.fromLocationCode = balance.locationCode; |
|
|
|
let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode); |
|
|
|
//扫描的库位在列表中存在 |
|
|
|
if (fromLocation){ |
|
|
|
//不是在任务列表中的，是新加的库位 |
|
|
|
// if(fromLocation.isNewAdd){ |
|
|
|
|
|
|
|
// }else { |
|
|
|
// //在任务列表中。 |
|
|
|
|
|
|
|
// } |
|
|
|
|
|
|
|
let batch = fromLocation.Batchs.find(r => r.batch == lot); |
|
|
|
if (batch != undefined) { |
|
|
|
if (batch.Records == undefined) { |
|
|
|
batch.Records = []; |
|
|
|
} |
|
|
|
|
|
|
|
let record = batch.Records.find(r => r.packingNumber == packingCode); |
|
|
|
if (record == undefined) { |
|
|
|
//如果有推荐箱码 |
|
|
|
if (batch.Recommends != undefined && batch.Recommends.length > 0) { |
|
|
|
let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); |
|
|
|
if (recommend != undefined) { |
|
|
|
that.addRecord(batch, label, balance, packageInfo) |
|
|
|
} else { |
|
|
|
//允许修改箱码 |
|
|
|
if (this.jobContent.allowModifyPackingNumber == 'TRUE') { |
|
|
|
that.addRecord(batch, label, balance, packageInfo); |
|
|
|
} else { |
|
|
|
that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', |
|
|
|
res => { |
|
|
|
that.getfocus(); |
|
|
|
return; |
|
|
|
} |
|
|
|
) |
|
|
|
} |
|
|
|
item.Locations.push(fromLocation) |
|
|
|
} |
|
|
|
if (fromLocation != undefined) { |
|
|
|
let batch = fromLocation.batch; |
|
|
|
if (batch != undefined) { |
|
|
|
that.addRecord(item.batch, label, balance, packageInfo) |
|
|
|
} else { |
|
|
|
that.addRecord(batch, label, balance, packageInfo) |
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
// that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// } |
|
|
|
// ) |
|
|
|
that.addRecord(batch, label, balance, packageInfo) |
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
if (this.jobContent.allowModifyBatch == "TRUE") { |
|
|
|
this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + |
|
|
|
'】的发货明细,是否要继续发货?', res => { |
|
|
|
if (res) { |
|
|
|
let batch = that.createBatchInfo(label, balance,packageInfo); |
|
|
|
let batch = that.createBatchInfo(label, balance, packageInfo); |
|
|
|
//新增加的批次赋值details |
|
|
|
if (fromLocation.Batchs.length > 0) { |
|
|
|
batch.detail = fromLocation.Batchs[0].detail; |
|
|
|
} |
|
|
|
fromLocation.Batchs.unshift(batch); |
|
|
|
this.getfocus(); |
|
|
|
that.$emit("afterScan"); |
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
@ -353,13 +567,168 @@ |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}else { |
|
|
|
//扫描的不在任务列表中，询问是否可以添加， |
|
|
|
if (this.jobContent.allowModifyLocation == "TRUE") { |
|
|
|
this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + |
|
|
|
"】与推荐的库位不一致,是否要继续发货?", res => { |
|
|
|
if (res) { |
|
|
|
let locaion = that.createLocationInfo(label, balance, packageInfo); |
|
|
|
item.Locations.push(locaion); |
|
|
|
this.getfocus(); |
|
|
|
that.$emit("afterScan"); |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
} else { |
|
|
|
that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的发货明细', |
|
|
|
res => { |
|
|
|
that.getfocus(); |
|
|
|
this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + |
|
|
|
"】与推荐的库位不一致,不允许继续发货?") |
|
|
|
} |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
// if (fromLocation && !fromLocation.isNewAdd) { |
|
|
|
// let batch = fromLocation.Batchs.find(r => r.batch == lot); |
|
|
|
// if (batch != undefined) { |
|
|
|
// if (batch.Records == undefined) { |
|
|
|
// batch.Records = []; |
|
|
|
// } |
|
|
|
|
|
|
|
// let record = batch.Records.find(r => r.packingNumber == packingCode); |
|
|
|
// if (record == undefined) { |
|
|
|
// //如果有推荐箱码 |
|
|
|
// if (batch.Recommends != undefined && batch.Recommends.length > 0) { |
|
|
|
// let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); |
|
|
|
// if (recommend != undefined) { |
|
|
|
// that.addRecord(batch, label, balance, packageInfo) |
|
|
|
// } else { |
|
|
|
// //允许修改箱码 |
|
|
|
// if (this.jobContent.allowModifyPackingNumber == 'TRUE') { |
|
|
|
// that.addRecord(batch, label, balance, packageInfo); |
|
|
|
// } else { |
|
|
|
// that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// return; |
|
|
|
// } |
|
|
|
// ) |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } else { |
|
|
|
// that.addRecord(batch, label, balance, packageInfo) |
|
|
|
// } |
|
|
|
|
|
|
|
// } else { |
|
|
|
// that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// } |
|
|
|
// ) |
|
|
|
// } |
|
|
|
|
|
|
|
// } else { |
|
|
|
// if (this.jobContent.allowModifyBatch == "TRUE") { |
|
|
|
// this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + |
|
|
|
// '】的发货明细,是否要继续发货?', res => { |
|
|
|
// if (res) { |
|
|
|
// let batch = that.createBatchInfo(label, balance, packageInfo); |
|
|
|
// //新增加的批次赋值details |
|
|
|
// if (fromLocation.Batchs.length > 0) { |
|
|
|
// batch.detail = fromLocation.Batchs[0].detail; |
|
|
|
// } |
|
|
|
// fromLocation.Batchs.unshift(batch); |
|
|
|
// this.getfocus(); |
|
|
|
// that.$emit("afterScan"); |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// that.showErrorMessage('未查找到批次【' + lot + '】的发货明细', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// }); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } else { |
|
|
|
// if (fromLocation&&fromLocation.isNewAdd) { |
|
|
|
// let batch = fromLocation.Batchs.find(r => r.batch == lot); |
|
|
|
// if (batch != undefined) { |
|
|
|
// if (batch.Records == undefined) { |
|
|
|
// batch.Records = []; |
|
|
|
// } |
|
|
|
|
|
|
|
// let record = batch.Records.find(r => r.packingNumber == packingCode); |
|
|
|
// if (record == undefined) { |
|
|
|
// //如果有推荐箱码 |
|
|
|
// if (batch.Recommends != undefined && batch.Recommends.length > 0) { |
|
|
|
// let recommend = batch.Recommends.find(r => r.packingNumber == packingCode); |
|
|
|
// if (recommend != undefined) { |
|
|
|
// that.addRecord(batch, label, balance, packageInfo) |
|
|
|
// } else { |
|
|
|
// //允许修改箱码 |
|
|
|
// if (this.jobContent.allowModifyPackingNumber == 'TRUE') { |
|
|
|
// that.addRecord(batch, label, balance, packageInfo); |
|
|
|
// } else { |
|
|
|
// that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// return; |
|
|
|
// } |
|
|
|
// ) |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } else { |
|
|
|
// that.addRecord(batch, label, balance, packageInfo) |
|
|
|
// } |
|
|
|
|
|
|
|
// } else { |
|
|
|
// that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// } |
|
|
|
// ) |
|
|
|
// } |
|
|
|
|
|
|
|
// } else { |
|
|
|
// if (this.jobContent.allowModifyBatch == "TRUE") { |
|
|
|
// this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot + |
|
|
|
// '】的发货明细,是否要继续发货?', res => { |
|
|
|
// if (res) { |
|
|
|
// let batch = that.createBatchInfo(label, balance, packageInfo); |
|
|
|
// //新增加的批次赋值details |
|
|
|
// if (fromLocation.Batchs.length > 0) { |
|
|
|
// batch.detail = fromLocation.Batchs[0].detail; |
|
|
|
// } |
|
|
|
// fromLocation.Batchs.unshift(batch); |
|
|
|
// this.getfocus(); |
|
|
|
// that.$emit("afterScan"); |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// that.showErrorMessage('未查找到批次【' + lot + '】的发货明细', |
|
|
|
// res => { |
|
|
|
// that.getfocus(); |
|
|
|
// }); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } else { |
|
|
|
// if (this.jobContent.allowModifyLocation == "TRUE") { |
|
|
|
// this.showQuestionMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + |
|
|
|
// "】与推荐的库位不一致,是否要继续发货?", res => { |
|
|
|
// if (res) { |
|
|
|
// let locaion = that.createLocationInfo(label, balance, packageInfo); |
|
|
|
// item.Locations.push(locaion); |
|
|
|
// this.getfocus(); |
|
|
|
// that.$emit("afterScan"); |
|
|
|
// } |
|
|
|
// }) |
|
|
|
|
|
|
|
// } else { |
|
|
|
// this.showErrorMessage("扫描物料[" + itemCode + "]的库位【" + that.fromLocationCode + |
|
|
|
// "】与推荐的库位不一致,不允许继续发货?") |
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
// } |
|
|
|
} catch (e) { |
|
|
|
that.showErrorMessage(e.stack, |
|
|
|
res => { |
|
|
|
@ -369,27 +738,32 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
//增加不是任务中的库位，实际扫描的明细 |
|
|
|
createLocationInfo(label, balance, packageInfo) { |
|
|
|
let location = { |
|
|
|
fromLocationCode: balance.locationCode, |
|
|
|
qty: balance.qty, |
|
|
|
uom: balance.uom, |
|
|
|
handleQty: 0, |
|
|
|
isNewAdd: true, |
|
|
|
Batchs: [] |
|
|
|
} |
|
|
|
let batch = this.createBatchInfo(label, balance, packageInfo); |
|
|
|
batch.detail = balance; |
|
|
|
batch.detail.fromLocationCode = balance.locationCode; |
|
|
|
location.Batchs.push(batch); |
|
|
|
return location; |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
createBatchInfo(data, balance, packageInfo) { |
|
|
|
let batch = { |
|
|
|
batch: data.lot||data.batch, |
|
|
|
isNewAdd: true, |
|
|
|
batch: data.batch, |
|
|
|
qty: 0, |
|
|
|
uom: data.uom, |
|
|
|
handleQty: Number(data.qty), |
|
|
|
Records: [], |
|
|
|
detail:{ |
|
|
|
fromLocationCode:this.fromLocationCode, //balance.locationCode |
|
|
|
toLocationCode:this.toLocationCode, |
|
|
|
itemCode:data.itemCode, |
|
|
|
handleQty: Number(data.qty), |
|
|
|
packingNumber:data.packingNumber, |
|
|
|
qty: 0, |
|
|
|
uom:data.uom, |
|
|
|
itemName:packageInfo.itemName, |
|
|
|
itemDesc1:packageInfo.itemDesc1, |
|
|
|
itemDesc2:packageInfo.itemDesc2, |
|
|
|
singlePrice:balance.singlePrice, |
|
|
|
amount:balance.amount |
|
|
|
} |
|
|
|
handleQty: Number(balance.qty), |
|
|
|
Records: [] |
|
|
|
} |
|
|
|
let record = this.creatRecord(data, balance, packageInfo); |
|
|
|
batch.Records.push(record); |
|
|
|
@ -409,45 +783,83 @@ |
|
|
|
// qty: Number(balance.qty), |
|
|
|
// qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty), |
|
|
|
qty: Number(balance.qty), |
|
|
|
handleQty:0, |
|
|
|
handleQty: Number(balance.qty), |
|
|
|
uom: balance.uom, |
|
|
|
inventoryStatus: balance.inventoryStatus, |
|
|
|
balance: balance, |
|
|
|
toLocationCode: this.toLocationCode, |
|
|
|
supplierCode: label.supplierCode, |
|
|
|
packUnit: packageInfo.packUnit, |
|
|
|
packQty: packageInfo.packQty, |
|
|
|
fromLocationCode:balance.locationCode, |
|
|
|
packQty: packageInfo.packQty |
|
|
|
} |
|
|
|
|
|
|
|
return record; |
|
|
|
}, |
|
|
|
|
|
|
|
calcBatchHandleQty(batch,label,balance) { |
|
|
|
this.dataContent.subList.forEach(item => { |
|
|
|
if(item.itemCode == label.itemCode&&item.batch == label.batch){ |
|
|
|
item.handleQty = item.handleQty || 0 |
|
|
|
item.handleQty = calc.add(item.handleQty, label.qty); |
|
|
|
} |
|
|
|
calcBatchHandleQty(batch) { |
|
|
|
let handleQty = 0; |
|
|
|
batch.Records.forEach(res => { |
|
|
|
handleQty = calc.add(handleQty, res.qty) |
|
|
|
}) |
|
|
|
batch.handleQty = handleQty; |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
addRecord(batch, label, balance, packageInfo) { |
|
|
|
var checkData = this.dataContent.subList.find(r => { |
|
|
|
if (r.batch == balance.batch) { |
|
|
|
if (packageInfo.parentNumber) { |
|
|
|
var checkData = batch.Records.find(r => { |
|
|
|
if (r.packingNumber == packageInfo.parentNumber && |
|
|
|
r.batch == balance.batch) { |
|
|
|
return r; |
|
|
|
} |
|
|
|
}) |
|
|
|
if (checkData) { |
|
|
|
//提示已经扫描 |
|
|
|
this.showErrorMessage("箱码[" + packageInfo.number + "]批次[" + balance.batch + |
|
|
|
"]的父包装已经扫描") |
|
|
|
} else { |
|
|
|
let record = this.creatRecord(label, balance, packageInfo); |
|
|
|
batch.Records.push(record); |
|
|
|
this.issueRecord.unshift(record) |
|
|
|
this.calcBatchHandleQty(batch); |
|
|
|
this.getfocus(); |
|
|
|
this.$emit("afterScan"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
//扫描的是父包装 |
|
|
|
var checkData = batch.Records.find(r => { |
|
|
|
if (r.parentPackingNumber == packageInfo.number && |
|
|
|
r.batch == balance.batch) { |
|
|
|
return r; |
|
|
|
} |
|
|
|
}) |
|
|
|
if (checkData) { |
|
|
|
checkData.scaned = true |
|
|
|
this.calcBatchHandleQty(batch,label,balance); |
|
|
|
//是否移除 |
|
|
|
this.$refs.comMessage.showQuestionMessage("扫描箱码[" + checkData.parentPackingNumber + "]" + "批次[" + |
|
|
|
balance |
|
|
|
.batch + "]是父包装，是否移除子包装", res => { |
|
|
|
if (res) { |
|
|
|
batch.Records = []; |
|
|
|
let record = this.creatRecord(label, balance, packageInfo); |
|
|
|
batch.Records.push(record); |
|
|
|
this.issueRecord.unshift(record) |
|
|
|
this.calcBatchHandleQty(batch); |
|
|
|
this.getfocus(); |
|
|
|
this.$emit("afterScan"); |
|
|
|
} |
|
|
|
}) |
|
|
|
console.log("扫描的是父包装，是否移除子包装") |
|
|
|
} else { |
|
|
|
let record = this.creatRecord(label, balance, packageInfo); |
|
|
|
this.dataContent.subList.push(record); |
|
|
|
this.calcBatchHandleQty(batch,label,balance); |
|
|
|
batch.Records.push(record); |
|
|
|
this.issueRecord.unshift(record) |
|
|
|
this.calcBatchHandleQty(batch); |
|
|
|
this.getfocus(); |
|
|
|
this.$emit("afterScan"); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
getfocus() { |
|
|
|
@ -496,13 +908,17 @@ |
|
|
|
|
|
|
|
let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode); |
|
|
|
if (item != undefined) { |
|
|
|
|
|
|
|
item.Locations.forEach(l => { |
|
|
|
let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b |
|
|
|
.batch == record.batch); |
|
|
|
|
|
|
|
if (batch && batch.Records && batch.Records.length > 0) { |
|
|
|
let rIndex = batch.Records.findIndex(r => r.packingNumber == record |
|
|
|
.packingNumber && r |
|
|
|
.batch == record.batch); |
|
|
|
.packingNumber && r.batch == record.batch); |
|
|
|
batch.Records.splice(rIndex, 1); |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
} |
|
|
|
this.$emit('updateData', item); |
|
|
|
@ -511,10 +927,16 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
packGetFocus() { |
|
|
|
if (this.$refs.comscan) { |
|
|
|
this.$refs.comscan.getfocus(); |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
packLoseFocus() { |
|
|
|
if (this.$refs.comscan) { |
|
|
|
this.$refs.comscan.losefocus(); |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
showMessage(message, callback) { |
|
|
|
setTimeout(r => { |
|
|
|
@ -561,4 +983,8 @@ |
|
|
|
max-height: 300rpx; |
|
|
|
padding: 10rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.my-combox { |
|
|
|
font-size: 50px; |
|
|
|
} |
|
|
|
</style> |
