|
|
@ -10,6 +10,7 @@ |
|
|
@scroll="scroll" class="scroll-detail"> |
|
|
@scroll="scroll" class="scroll-detail"> |
|
|
|
|
|
|
|
|
<view class="detail-list margin_top" v-for="(item, index) in details" :key="item.id"> |
|
|
<view class="detail-list margin_top" v-for="(item, index) in details" :key="item.id"> |
|
|
|
|
|
<!-- <comDeliverBoardDetail :dataContent="item" :isShowPacking="true"></comDeliverBoardDetail> --> |
|
|
<view class="detail-content"> |
|
|
<view class="detail-content"> |
|
|
<view class="choose_main"> |
|
|
<view class="choose_main"> |
|
|
<view class="ljh_box"> |
|
|
<view class="ljh_box"> |
|
|
@ -19,7 +20,6 @@ |
|
|
<view class="font_xs text_lightblue">{{ item.itemDesc1 }}</view> |
|
|
<view class="font_xs text_lightblue">{{ item.itemDesc1 }}</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<view class="list_form"> |
|
|
<view class="list_form"> |
|
|
<view class="uni-container"> |
|
|
<view class="uni-container"> |
|
|
<uni-table style="overflow-x: hidden;"> |
|
|
<uni-table style="overflow-x: hidden;"> |
|
|
@ -32,52 +32,32 @@ |
|
|
<uni-th width="120" align="center">实际</uni-th> |
|
|
<uni-th width="120" align="center">实际</uni-th> |
|
|
</uni-tr> |
|
|
</uni-tr> |
|
|
<uni-tr> |
|
|
<uni-tr> |
|
|
<uni-th width="50">数量</text></uni-th> |
|
|
<uni-th width="50">器具码</uni-th> |
|
|
<uni-th width="120" align="center"> |
|
|
|
|
|
<text class="text_black">{{item.recommendQty}}({{item.uom}})</text> |
|
|
|
|
|
</uni-th> |
|
|
|
|
|
<uni-th width="120" align="center"> |
|
|
|
|
|
<view v-if="item.scaned" |
|
|
|
|
|
style="display: flex;flex-direction: row;justify-content:center;align-items: center;"> |
|
|
|
|
|
|
|
|
|
|
|
<com-number-box :ref="'comNumberBox_'+index" v-model="item.handledQty" |
|
|
|
|
|
:max="99999" :min="0" style='width: 100px;' |
|
|
|
|
|
@change="qtyChanged($event,item,index)"> |
|
|
|
|
|
</com-number-box> |
|
|
|
|
|
<text class="text_black">({{item.uom}})</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
</uni-th> |
|
|
|
|
|
</uni-tr> |
|
|
|
|
|
<uni-tr> |
|
|
|
|
|
<uni-th width="50">箱码</uni-th> |
|
|
|
|
|
<uni-th width="120" align="center"> |
|
|
<uni-th width="120" align="center"> |
|
|
<view class="text_packingCode"> |
|
|
<view class="text_packingCode"> |
|
|
{{ item.recommendPackingCode }} |
|
|
{{ item.recommendContainerCode }} |
|
|
</view> |
|
|
</view> |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
<uni-th width="120" align="center"> |
|
|
<uni-th width="120" align="center"> |
|
|
<view v-if="item.scaned" class="text_packingCode"> |
|
|
<view v-if="item.scaned" class="text_packingCode"> |
|
|
{{ item.handledPackingCode }} |
|
|
{{ item.containerCode }} |
|
|
</view> |
|
|
</view> |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
</uni-tr> |
|
|
</uni-tr> |
|
|
<uni-tr> |
|
|
<uni-tr> |
|
|
<uni-th width="50">批次</uni-th> |
|
|
<uni-th width="50">数量</text></uni-th> |
|
|
<uni-th width="120" align="center"> |
|
|
<uni-th width="120" align="center"> |
|
|
<view class="text_black">{{item.recommendLot }}</view> |
|
|
<!-- <text class="text_black">{{item.recommendQty}}({{item.uom}})</text> --> |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
<uni-th width="120" align="center"> |
|
|
<uni-th width="120" align="center"> |
|
|
<view v-if="item.scaned" class="text_black">{{item.handledLot }}</view> |
|
|
<view v-if="item.scaned" |
|
|
</uni-th> |
|
|
style="display: flex;flex-direction: row;justify-content:center;align-items: center;"> |
|
|
</uni-tr> |
|
|
|
|
|
<uni-tr> |
|
|
<com-number-box ref="comNumberBox" v-model="item.handledQty" |
|
|
<uni-th width="60">库位</uni-th> |
|
|
:max="99999" :min="0" style='width: 100px;' |
|
|
<uni-th width="100" align="center"> |
|
|
@change="qtyChanged($event,item,index)"> |
|
|
<view class="text_black">{{ item.recommendFromLocationCode }}</view> |
|
|
</com-number-box> |
|
|
</uni-th> |
|
|
<text class="text_black">({{item.uom}})</text> |
|
|
<uni-th width="100" align="center"> |
|
|
|
|
|
<view class="text_black" v-if="item.scaned"> |
|
|
|
|
|
{{ item.handledFromLocationCode }} |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</uni-th> |
|
|
</uni-th> |
|
|
</uni-tr> |
|
|
</uni-tr> |
|
|
@ -88,8 +68,7 @@ |
|
|
<view class="choose_marked" v-if="item.scaned"> |
|
|
<view class="choose_marked" v-if="item.scaned"> |
|
|
<image src="@/static/image_marked.svg"></image> |
|
|
<image src="@/static/image_marked.svg"></image> |
|
|
</view> |
|
|
</view> |
|
|
<view class="fr" |
|
|
<view class="fr" > |
|
|
> |
|
|
|
|
|
<button class="btn_single" hover-class="btn_single_after" @click="unPacking(item)">拆箱</button> |
|
|
<button class="btn_single" hover-class="btn_single_after" @click="unPacking(item)">拆箱</button> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
@ -101,9 +80,7 @@ |
|
|
</view> |
|
|
</view> |
|
|
<com-balance ref='issueitems' @selectedItem='selectedBalanceItem'></com-balance> |
|
|
<com-balance ref='issueitems' @selectedItem='selectedBalanceItem'></com-balance> |
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-button @goScan='openScanPopup'></win-scan-button> |
|
|
<win-scan-by-pack ref="scanPopup" @getScanResult='getScanResult'></win-scan-by-pack> |
|
|
<winScanByContainer ref="scanPopup" @getScanResult='getScanResult'></winScanByContainer> |
|
|
|
|
|
|
|
|
<com-balance ref="balanceItems" @selectedItem='selectedBalanceItem'></com-balance> |
|
|
|
|
|
<comUnPacking ref='comUnPacking' |
|
|
<comUnPacking ref='comUnPacking' |
|
|
@getvalue="getUnPackingCount" title="拆箱"> |
|
|
@getvalue="getUnPackingCount" title="拆箱"> |
|
|
</comUnPacking> |
|
|
</comUnPacking> |
|
|
@ -114,9 +91,9 @@ |
|
|
|
|
|
|
|
|
<script> |
|
|
<script> |
|
|
import { |
|
|
import { |
|
|
getIssueDetail, |
|
|
getDeliverJobDetail, |
|
|
takeIssueJob, |
|
|
takeDeliverBoardJob, |
|
|
cancelTakeIssueJob, |
|
|
cancelTakeDeliverBoardJob, |
|
|
finshIssueJob, |
|
|
finshIssueJob, |
|
|
issueBalances |
|
|
issueBalances |
|
|
} from '@/api/index.js'; |
|
|
} from '@/api/index.js'; |
|
|
@ -127,14 +104,15 @@ |
|
|
goHome, |
|
|
goHome, |
|
|
compareDesc, |
|
|
compareDesc, |
|
|
compareStr, |
|
|
compareStr, |
|
|
getCurrDateTime |
|
|
getCurrDateTime, |
|
|
|
|
|
navigateBack |
|
|
} from '@/common/basic.js'; |
|
|
} from '@/common/basic.js'; |
|
|
import comMessage from '@/mycomponents/common/comMessage.vue' |
|
|
import comMessage from '@/mycomponents/common/comMessage.vue' |
|
|
import winScanButton from '@/mycomponents/wincom/winScanButton.vue' |
|
|
import winScanButton from '@/mycomponents/wincom/winScanButton.vue' |
|
|
import winMulitScan from '@/mycomponents/wincom/winMulitScan.vue' |
|
|
import winScanByContainer from '@/mycomponents/wincom/winScanByContainer.vue' |
|
|
import comBalance from '@/mycomponents/common/comBalance.vue' |
|
|
import comBalance from '@/mycomponents/common/comBalance.vue' |
|
|
import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue' |
|
|
import comJobScanDetail from '@/mycomponents/comjob/comJobScanDetail.vue' |
|
|
import winScanByPack from '@/mycomponents/wincom/winScanByPack.vue' |
|
|
import comDeliverBoardDetail from '@/mycomponents/coms/comDeliverBoardDetail.vue' |
|
|
import comNumberBox from '@/mycomponents/common/comNumberBox.vue'; |
|
|
import comNumberBox from '@/mycomponents/common/comNumberBox.vue'; |
|
|
import comUnPacking from '@/mycomponents/coms/comUnPacking.vue' |
|
|
import comUnPacking from '@/mycomponents/coms/comUnPacking.vue' |
|
|
|
|
|
|
|
|
@ -142,10 +120,10 @@ |
|
|
components: { |
|
|
components: { |
|
|
comMessage, |
|
|
comMessage, |
|
|
winScanButton, |
|
|
winScanButton, |
|
|
winMulitScan, |
|
|
winScanByContainer, |
|
|
comBalance, |
|
|
comBalance, |
|
|
comJobScanDetail, |
|
|
comJobScanDetail, |
|
|
winScanByPack, |
|
|
comDeliverBoardDetail, |
|
|
comNumberBox, |
|
|
comNumberBox, |
|
|
comUnPacking |
|
|
comUnPacking |
|
|
}, |
|
|
}, |
|
|
@ -163,28 +141,14 @@ |
|
|
balancesItem: null, |
|
|
balancesItem: null, |
|
|
currentItem: null, |
|
|
currentItem: null, |
|
|
received: false, |
|
|
received: false, |
|
|
currentScanLebel: null, |
|
|
|
|
|
allCount: 0, |
|
|
allCount: 0, |
|
|
scanCount: 0, |
|
|
scanCount: 0, |
|
|
byFIFO: false, |
|
|
jobStatus: "" |
|
|
isPack: true, |
|
|
|
|
|
titleArray: ['箱标签'], |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
filters: { |
|
|
|
|
|
statusStyle: function(val) { |
|
|
|
|
|
return getJobStatuStyle(val); |
|
|
|
|
|
}, |
|
|
|
|
|
statusColor: function(val) { |
|
|
|
|
|
return getJobStatuDesc(val); |
|
|
|
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
props: { |
|
|
|
|
|
itemCode: "", |
|
|
|
|
|
}, |
|
|
|
|
|
onLoad(param) { |
|
|
onLoad(param) { |
|
|
this.id = param.id; |
|
|
this.id = param.id; |
|
|
this.byFIFO = param.isByFIFO === 'true' ? true : false; |
|
|
|
|
|
if (param.jobStatus == 1) { |
|
|
if (param.jobStatus == 1) { |
|
|
this.receive((callback => { |
|
|
this.receive((callback => { |
|
|
this.received = true; |
|
|
this.received = true; |
|
|
@ -194,36 +158,32 @@ |
|
|
this.getDetail(); |
|
|
this.getDetail(); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
onReady() { |
|
|
|
|
|
// if (this.byFIFO) { |
|
|
|
|
|
// uni.setNavigationBarTitle({ |
|
|
|
|
|
// title: '发料任务详情' |
|
|
|
|
|
// }) |
|
|
|
|
|
// } else { |
|
|
|
|
|
// uni.setNavigationBarTitle({ |
|
|
|
|
|
// title: '非FIFO发料任务详情' |
|
|
|
|
|
// }) |
|
|
|
|
|
// } |
|
|
|
|
|
}, |
|
|
|
|
|
//返回首页 |
|
|
//返回首页 |
|
|
onNavigationBarButtonTap(e) { |
|
|
onNavigationBarButtonTap(e) { |
|
|
if (e.index === 0) { |
|
|
if (e.index === 0) { |
|
|
goHome(); |
|
|
goHome(); |
|
|
}else if(e.index === 1){ |
|
|
} else if (e.index === 1) { |
|
|
window.location.reload(); |
|
|
window.location.reload(); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
//拦截返回按钮事件 |
|
|
|
|
|
onBackPress(e) { |
|
|
onBackPress(e) { |
|
|
if (this.received) { |
|
|
//已经接收但是没提交任务 |
|
|
|
|
|
if (e.from == 'backbutton') { |
|
|
|
|
|
if (this.jobStatus == 2) { |
|
|
//取消承接任务 |
|
|
//取消承接任务 |
|
|
cancelTakeIssueJob(this.id) |
|
|
cancelTakeDeliverBoardJob(this.id).then(res => { |
|
|
.then(res => {}) |
|
|
uni.navigateBack(); |
|
|
.catch(err => { |
|
|
}).catch(error => { |
|
|
this.showMessage(err.message); |
|
|
uni.navigateBack(); |
|
|
}); |
|
|
}) |
|
|
|
|
|
} else { |
|
|
|
|
|
uni.navigateBack(); |
|
|
|
|
|
} |
|
|
|
|
|
return true; |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
mounted() { |
|
|
mounted() { |
|
|
uni.setNavigationBarColor({ |
|
|
uni.setNavigationBarColor({ |
|
|
frontColor: '#ffffff', |
|
|
frontColor: '#ffffff', |
|
|
@ -232,10 +192,6 @@ |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
openScanPopup() { |
|
|
openScanPopup() { |
|
|
// if (this.allCount === this.scanCount) { |
|
|
|
|
|
// this.showMessage("零件已经全部扫描完成"); |
|
|
|
|
|
// return; |
|
|
|
|
|
// } |
|
|
|
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
this.$refs.scanPopup.openScanPopup(); |
|
|
}, |
|
|
}, |
|
|
//加载零件信息 |
|
|
//加载零件信息 |
|
|
@ -251,11 +207,13 @@ |
|
|
let params = { |
|
|
let params = { |
|
|
id: that.id, |
|
|
id: that.id, |
|
|
}; |
|
|
}; |
|
|
getIssueDetail(params) |
|
|
getDeliverJobDetail(params) |
|
|
.then(item => { |
|
|
.then(item => { |
|
|
console.log('item', item); |
|
|
console.log('item', item); |
|
|
that.datacontent = item; |
|
|
that.datacontent = item; |
|
|
that.details = item.details; |
|
|
that.details = item.details; |
|
|
|
|
|
that.details[0].recommendContainerCode = "C19" |
|
|
|
|
|
that.jobStatus = item.jobStatus |
|
|
if (that.details != null) { |
|
|
if (that.details != null) { |
|
|
that.details.forEach( |
|
|
that.details.forEach( |
|
|
r => { |
|
|
r => { |
|
|
@ -282,280 +240,32 @@ |
|
|
|
|
|
|
|
|
getScanResult(result) { |
|
|
getScanResult(result) { |
|
|
//零件是否已经被扫描过 |
|
|
//零件是否已经被扫描过 |
|
|
let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r |
|
|
let item = this.details.find(r => r.recommendContainerCode == result.containerCode); |
|
|
.scanPackingCode != result.data.packingCode); |
|
|
if (item == undefined) { |
|
|
if (item != undefined && item.scaned) { |
|
|
this.showMessage("器具码【" + result.containerCode + "】不在列表中") |
|
|
showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode + |
|
|
|
|
|
'】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?', |
|
|
|
|
|
confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
this.handledPackCode(result, true); |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
return; |
|
|
if (item.scaned) { |
|
|
} |
|
|
this.showMessage("器具码【" + result.containerCode + "】已经扫描") |
|
|
}) |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
if (this.allCount === this.scanCount) { |
|
|
if (this.allCount == this.scanCount) { |
|
|
this.showMessage("零件已经全部扫描完成"); |
|
|
this.showMessage("零件已经全部扫描完成"); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
this.handledPackCode(result, false); |
|
|
item.containerCode = result.containerCode; |
|
|
} |
|
|
|
|
|
this.scrollToTop(); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
//处理箱标签 |
|
|
|
|
|
//scaned是否是重新匹配 |
|
|
|
|
|
handledPackCode(result, scaned) { |
|
|
|
|
|
//获取标签信息 |
|
|
|
|
|
let that = this; |
|
|
|
|
|
that.currentScanLebel = result; |
|
|
|
|
|
let scanItem = this.details.find(r => r.scanItemCode === that.currentScanLebel.data.itemCode && |
|
|
|
|
|
r.scanPackingCode === that.currentScanLebel.data.packingCode && |
|
|
|
|
|
r.scanLot === that.currentScanLebel.data.lot && |
|
|
|
|
|
r.scaned == true) |
|
|
|
|
|
if (scanItem != undefined) { |
|
|
|
|
|
this.showScanMessage('箱码【' + that.currentScanLebel.data.packingCode + '】已经扫描,请扫描下一箱零件'); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.dyIssue(result, scaned); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
dyIssue(result, scaned) { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
var itemCode = that.details.find(r => { |
|
|
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
|
|
r.scaned === scaned |
|
|
|
|
|
}) |
|
|
|
|
|
if (itemCode == undefined) { |
|
|
|
|
|
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中'); |
|
|
|
|
|
}else { |
|
|
|
|
|
//零件号相同、箱码相同 |
|
|
|
|
|
var itemCode1 = that.details.find(r => { |
|
|
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
|
|
r.recommendPackingCode === result.data.code |
|
|
|
|
|
r.scaned === scaned |
|
|
|
|
|
}) |
|
|
|
|
|
//零件号相同、箱码不相同 |
|
|
|
|
|
if(itemCode1 == undefined){ |
|
|
|
|
|
var itemCode2 = that.details.find(r => { |
|
|
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
|
|
r.recommendLot === result.data.lot |
|
|
|
|
|
&&r.scaned === scaned |
|
|
|
|
|
}) |
|
|
|
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
|
|
|
if(itemCode2==undefined){ |
|
|
|
|
|
//零件号相同、箱码不相同、批次不相同 |
|
|
|
|
|
console.log("零件号相同、箱码不相同、批次不相同") |
|
|
|
|
|
setTimeout(res => { |
|
|
|
|
|
showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.currentItem = itemCode; |
|
|
|
|
|
that.afterScanPackLabel(result); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.scanPopupGetFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, 100) |
|
|
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
console.log("零件号相同、箱码不相同、批次相同") |
|
|
|
|
|
//零件号相同、箱码不相同、批次相同 |
|
|
|
|
|
that.currentItem = itemCode2; |
|
|
|
|
|
that.afterScanPackLabel(result); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
//零件号相同、箱码相同、批次相同 |
|
|
|
|
|
var itemCode3 = that.details.find(r => { |
|
|
|
|
|
return r.itemCode === result.data.itemCode&& |
|
|
|
|
|
r.recommendPackingCode === result.data.code&& |
|
|
|
|
|
r.recommendLot === result.data.lot |
|
|
|
|
|
&&r.scaned === scaned |
|
|
|
|
|
}) |
|
|
|
|
|
if(itemCode3==undefined){ |
|
|
|
|
|
//零件号相同、箱码相同、批次不同 |
|
|
|
|
|
console.log("零件号相同、箱码相同、批次不同") |
|
|
|
|
|
setTimeout(res => { |
|
|
|
|
|
showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.currentItem = itemCode1; |
|
|
|
|
|
that.afterScanPackLabel(result); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.scanPopupGetFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, 100) |
|
|
|
|
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
console.log("零件号相同、箱码相同、批次相同") |
|
|
|
|
|
//零件号相同、箱码相同、批次相同 |
|
|
|
|
|
that.currentItem = itemCode3; |
|
|
|
|
|
that.afterScanPackLabel(result); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// that.currentItem = that.details.find(r => { |
|
|
|
|
|
// return r.itemCode === result.data.itemCode && |
|
|
|
|
|
// r.recommendPackingCode === result.data.code && |
|
|
|
|
|
// r.recommendLot === result.data.lot && |
|
|
|
|
|
// r.scaned === scaned |
|
|
|
|
|
// }); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// //没找到符合的箱码、零件号、箱码、批次都相等 |
|
|
|
|
|
// if (that.currentItem === undefined) { |
|
|
|
|
|
// var itemCode = that.details.find(res => { |
|
|
|
|
|
// return res.itemCode === result.data.itemCode && |
|
|
|
|
|
// res.scaned === scaned |
|
|
|
|
|
// }) |
|
|
|
|
|
// //零件号相等 |
|
|
|
|
|
// if (itemCode != undefined) { |
|
|
|
|
|
// var lot = that.details.find(res => { |
|
|
|
|
|
// return res.itemCode === result.data.itemCode && |
|
|
|
|
|
// res.recommendLot === result.data.lot && |
|
|
|
|
|
// res.scaned === scaned |
|
|
|
|
|
// }) |
|
|
|
|
|
// if (lot != undefined) { |
|
|
|
|
|
// //通过 |
|
|
|
|
|
// that.currentItem = lot; |
|
|
|
|
|
// that.afterScanPackLabel(result); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// //批次不相等 |
|
|
|
|
|
// // 提示未执行先进先出或者不是最先批次。 |
|
|
|
|
|
// setTimeout(res => { |
|
|
|
|
|
// showConfirmMsg('未执行先进先出或不是最先批次,是否继续?', confirm => { |
|
|
|
|
|
// if (confirm) { |
|
|
|
|
|
// that.currentItem = itemCode; |
|
|
|
|
|
// that.afterScanPackLabel(result); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// that.scanPopupGetFocus(); |
|
|
|
|
|
// } |
|
|
|
|
|
// }); |
|
|
|
|
|
// }, 100) |
|
|
|
|
|
|
|
|
|
|
|
// } |
|
|
|
|
|
// } else { |
|
|
|
|
|
// //零件号不相等 |
|
|
|
|
|
// var lot = that.details.find(res => { |
|
|
|
|
|
// return res.recommendLot === result.data.lot && |
|
|
|
|
|
// res.scaned === scaned |
|
|
|
|
|
// }) |
|
|
|
|
|
// //批次相等 |
|
|
|
|
|
// if (lot != undefined) { |
|
|
|
|
|
// // 在该任务中未找到零件。 |
|
|
|
|
|
// that.showScanMessage('在该任务中未找到零件'); |
|
|
|
|
|
// } else { |
|
|
|
|
|
// //零件号不相等,批次不相等 |
|
|
|
|
|
// that.showScanMessage('所扫描的物料不在任务中'); |
|
|
|
|
|
// } |
|
|
|
|
|
// } |
|
|
|
|
|
// } else { |
|
|
|
|
|
// that.afterScanPackLabel(result); |
|
|
|
|
|
// } |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
afterScanPackLabel(result) { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
that.getBalance(result, res => { |
|
|
|
|
|
if (res.totalCount === 1) { |
|
|
|
|
|
that.balancesItem = res.items[0]; |
|
|
|
|
|
if (that.balancesItem != null || that.balancesItem != undefined) { |
|
|
|
|
|
that.setBalanceInfo(this.currentItem, that.balancesItem); |
|
|
|
|
|
that.scanPopupGetFocus(); |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$refs['issueitems'].openPopup(res.items); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
//查询库存记录 |
|
|
|
|
|
getBalance(result, callback) { |
|
|
|
|
|
uni.showLoading({ |
|
|
|
|
|
title: '扫描中...', |
|
|
|
|
|
mask: true |
|
|
|
|
|
}) |
|
|
|
|
|
let params = { |
|
|
|
|
|
pageSize: 1000, |
|
|
|
|
|
pageIndex: 1, |
|
|
|
|
|
packingCode: result.data.code, |
|
|
|
|
|
itemCode: result.data.itemCode, |
|
|
|
|
|
lot: result.data.lot, |
|
|
|
|
|
inventoryStatus: 2, //库存状态默认2 |
|
|
|
|
|
locationTypes: [2, 3], |
|
|
|
|
|
sortBy: 'PackingCode asc' |
|
|
|
|
|
}; |
|
|
|
|
|
issueBalances(params) |
|
|
|
|
|
.then(res => { |
|
|
|
|
|
if (res.totalCount === 0) { |
|
|
|
|
|
this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' + |
|
|
|
|
|
result |
|
|
|
|
|
.data.lot + '】在【原料库、半成品库】未查询到库存信息'); |
|
|
|
|
|
} else { |
|
|
|
|
|
callback(res); |
|
|
|
|
|
} |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
}) |
|
|
|
|
|
.catch(err => { |
|
|
|
|
|
this.showScanMessage(err.message); |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
setBalanceInfo(item, balanceItem) { |
|
|
|
|
|
item.scaned = true; |
|
|
item.scaned = true; |
|
|
item.scanDate = new Date() //增加扫描信息属性 |
|
|
item.handleQty = 10; |
|
|
item.fromLocationCode = balanceItem.locationCode; |
|
|
this.calcScanCount() |
|
|
item.fromLocationErpCode = balanceItem.locationErpCode; |
|
|
|
|
|
item.toLocationCode = item.locationCode; |
|
|
|
|
|
item.toLocationErpCode = item.locationErpCode; |
|
|
|
|
|
|
|
|
|
|
|
//实际库存数量 |
|
|
|
|
|
item.handledContainerCode = balanceItem.containerCode; |
|
|
|
|
|
item.handledPackingCode = balanceItem.packingCode; |
|
|
|
|
|
item.handledBatch = balanceItem.batch; |
|
|
|
|
|
item.handledLot = balanceItem.lot; |
|
|
|
|
|
|
|
|
|
|
|
item.defaultHandleQty = balanceItem.qty; |
|
|
|
|
|
item.handledQty = balanceItem.qty; |
|
|
|
|
|
item.handledFromLocationCode = balanceItem.locationCode; |
|
|
|
|
|
item.handledFromLocationArea = balanceItem.locationArea; |
|
|
|
|
|
item.handledFromLocationGroup = balanceItem.locationErpCode; |
|
|
|
|
|
item.handledFromLocationErpCode = balanceItem.locationGroup; |
|
|
|
|
|
item.handledFromWarehouseCode = balanceItem.warehouseCode; |
|
|
|
|
|
|
|
|
|
|
|
item.toLocationArea = balanceItem.locationArea; |
|
|
|
|
|
item.toLocationGroup = balanceItem.locationGroup; |
|
|
|
|
|
item.toLocationErpCode = balanceItem.locationErpCode; |
|
|
|
|
|
|
|
|
|
|
|
//当前扫描标签的信息 |
|
|
|
|
|
item.scanItemCode = this.currentScanLebel.data.itemCode; |
|
|
|
|
|
item.scanPackingCode = this.currentScanLebel.data.code; |
|
|
|
|
|
item.scanLot = this.currentScanLebel.data.lot; |
|
|
|
|
|
|
|
|
|
|
|
item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; |
|
|
|
|
|
item.uom = balanceItem.uom; |
|
|
|
|
|
|
|
|
|
|
|
this.details.sort(compareDesc('scanDate')); //按扫描信息排 |
|
|
|
|
|
this.calcScanCount(); //计算扫描的数量 |
|
|
|
|
|
this.$forceUpdate(); |
|
|
this.$forceUpdate(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
selectedBalanceItem(balanceItem) { |
|
|
|
|
|
this.setBalanceInfo(this.currentItem, balanceItem); |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
// //接收 |
|
|
// //接收 |
|
|
receive(callback) { |
|
|
receive(callback) { |
|
|
let params = { |
|
|
let params = { |
|
|
id: this.id |
|
|
id: this.id |
|
|
}; |
|
|
}; |
|
|
takeIssueJob(params) |
|
|
takeDeliverBoardJob(params) |
|
|
.then(res => { |
|
|
.then(res => { |
|
|
callback(true); |
|
|
callback(true); |
|
|
}) |
|
|
}) |
|
|
@ -564,125 +274,45 @@ |
|
|
callback(false); |
|
|
callback(false); |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
|
|
|
calcScanCount() { |
|
|
|
|
|
this.scanCount = this.details.filter(r => r.scaned === true).length; |
|
|
|
|
|
this.closeScanPopup(); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
submit() { |
|
|
submit() { |
|
|
let that = this; |
|
|
this.calcScanCount() |
|
|
if (that.datacontent.details.length === 0) { |
|
|
if (this.scanCount != this.allCount) { |
|
|
this.showMessage('该任务没有要上架的零件'); |
|
|
this.showMessage('当前扫描数量【'+this.scanCount+"】,总数量为【"+this.allCount+"】,未全部扫描"); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
let checkItems = that.details.filter(r => r.scaned === true); |
|
|
|
|
|
if (checkItems.length < that.details.length) { |
|
|
|
|
|
showConfirmMsg('还有未扫描的零件,是否继续发料', confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.finsh(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.finsh(); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
handleLocation() { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
if (that.details[0].requestLocationCode != that.toLocation) { |
|
|
|
|
|
showConfirmMsg('目标库位【' + that.toLocation + '】与需求库位不一致,是否要将以上零件发到目标库位?', confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.handledPackingCode(); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.clearScanLocation(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} else { |
|
|
|
|
|
showConfirmMsg('是否要将以上零件发到目标库位:【' + that.toLocation + "】", confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.handledPackingCode(); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.clearScanLocation(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
//判断是否有推荐箱码为空的情况 |
|
|
|
|
|
handledPackingCode() { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
let items = this.details.filter(r => { |
|
|
|
|
|
return r.scaned && (r.handledPackingCode === null || r.handledPackingCode === '') |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
if (items.length > 0) { |
|
|
|
|
|
let packingCodes = ''; |
|
|
|
|
|
items.forEach(r => { |
|
|
|
|
|
packingCodes += r.recommendPackingCode + ',' |
|
|
|
|
|
}) |
|
|
|
|
|
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续发料?【' + packingCodes + "】", confirm => { |
|
|
|
|
|
if (confirm) { |
|
|
|
|
|
that.finsh(); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.clearScanLocation(); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} else { |
|
|
|
|
|
that.finsh(); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
finsh() { |
|
|
|
|
|
let that = this; |
|
|
|
|
|
uni.showLoading({ |
|
|
uni.showLoading({ |
|
|
title: "提交中...", |
|
|
title: "提交中...", |
|
|
mask: true |
|
|
mask: true |
|
|
}); |
|
|
}); |
|
|
that.datacontent.completeUserId = localStorage.getItem('userId') |
|
|
let params = that.datacontent; |
|
|
that.datacontent.completeUserName = localStorage.getItem('userName_CN') |
|
|
// finshIssueJob(that.id, params) |
|
|
that.datacontent.completeTime = getCurrDateTime(); |
|
|
// .then(res => { |
|
|
that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; |
|
|
// uni.hideLoading(); |
|
|
that.datacontent.details = that.details; |
|
|
// if (res != null) { |
|
|
let params = JSON.stringify(that.datacontent); |
|
|
// that.showCommitSuccessMessage(); |
|
|
finshIssueJob(that.id, params) |
|
|
// that.backJobList(); |
|
|
.then(res => { |
|
|
// } |
|
|
uni.hideLoading(); |
|
|
// }) |
|
|
if (res != null) { |
|
|
// .catch(err => { |
|
|
that.showCommitSuccessMessage(); |
|
|
// that.showMessage(err.message); |
|
|
that.backJobList(1000); |
|
|
// uni.hideLoading(); |
|
|
} |
|
|
// }); |
|
|
}) |
|
|
|
|
|
.catch(err => { |
|
|
|
|
|
that.showMessage(err.message); |
|
|
|
|
|
uni.hideLoading(); |
|
|
|
|
|
}); |
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//返回任务列表页 |
|
|
//返回任务列表页 |
|
|
backJobList(delay) { |
|
|
backJobList() { |
|
|
if (this.byFIFO) { |
|
|
navigateBack(1) |
|
|
setTimeout(() => { |
|
|
|
|
|
uni.navigateTo({ |
|
|
|
|
|
url: './issueByFIFO' |
|
|
|
|
|
}) |
|
|
|
|
|
}, 1000) |
|
|
|
|
|
} else { |
|
|
|
|
|
setTimeout(() => { |
|
|
|
|
|
uni.navigateTo({ |
|
|
|
|
|
url: './issueNoFIFO' |
|
|
|
|
|
}) |
|
|
|
|
|
}, 1000) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
clear() { |
|
|
clear() { |
|
|
this.scanCount = 0; |
|
|
this.scanCount = 0; |
|
|
this.currentItem = null; |
|
|
|
|
|
this.currentScanLebel = null; |
|
|
|
|
|
this.getDetail(); |
|
|
this.getDetail(); |
|
|
}, |
|
|
}, |
|
|
clearScanLocation() { |
|
|
|
|
|
this.currentItem = null; |
|
|
|
|
|
}, |
|
|
|
|
|
unPacking(item) { |
|
|
|
|
|
this.$refs.comUnPacking.openPopup3(item,item.handledQty,item.recommendQty,false); |
|
|
|
|
|
}, |
|
|
|
|
|
showMessage(message) { |
|
|
showMessage(message) { |
|
|
this.$refs.comMessage.showMessage(message); |
|
|
this.$refs.comMessage.showMessage(message); |
|
|
}, |
|
|
}, |
|
|
@ -744,14 +374,10 @@ |
|
|
qtyChanged(value, item, index) { |
|
|
qtyChanged(value, item, index) { |
|
|
if (value <= 0) { |
|
|
if (value <= 0) { |
|
|
this.showMessage('发料数量不能小于或等于0') |
|
|
this.showMessage('发料数量不能小于或等于0') |
|
|
item.handledQty = item.defaultHandleQty |
|
|
|
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
|
|
|
} else if (value > item.defaultHandleQty) { |
|
|
|
|
|
item.handledQty = item.defaultHandleQty |
|
|
|
|
|
this.showMessage('发料数量不能大于库存数量:' + item.handledQty) |
|
|
|
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
</script> |
|
|
</script> |
|
|
|
