Browse Source

修改拆包组件的显示 2024/7/9 16:28:29

pull/1/head
张立 8 months ago
parent
commit
42fb46c61e
  1. 8
      src/pages/issue/coms/comScanIssuePack.vue
  2. 14
      src/pages/issue/job/issueJob.vue
  3. 100
      src/pages/package/coms/comPackageRecord.vue
  4. 333
      src/pages/package/record/splitPackageRecord.vue
  5. 78
      src/pages/repleinsh/job/repleinshJob.vue

8
src/pages/issue/coms/comScanIssuePack.vue

@ -7,7 +7,7 @@
<view class="" style="font-size: 35rpx"> 扫描箱码 </view> <view class="" style="font-size: 35rpx"> 扫描箱码 </view>
<view class=""> <view class="">
<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"></image> <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"> </image>
</view> </view>
</view> </view>
<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-flex uni-row" style="align-items: center; background-color: #fff; margin-left: 20rpx; margin-right: 20rpx; margin-top: 8rpx; border-radius: 8rpx">
@ -320,6 +320,12 @@ const getBalance = (label, packageInfoParams, callback) => {
}) })
} }
const onScan = (result) => { const onScan = (result) => {
if (!result.package) {
showErrorMessage(`扫描数据错误[${result.label.code}]`, (res) => {
getfocus()
})
return
}
if (toLocation.value && result.package.packUnit) { if (toLocation.value && result.package.packUnit) {
const item = toLocation.value.Items.find((r) => r.itemCode == result.package.itemCode) const item = toLocation.value.Items.find((r) => r.itemCode == result.package.itemCode)
if (result.package.packUnit !== item.packUnit) { if (result.package.packUnit !== item.packUnit) {

14
src/pages/issue/job/issueJob.vue

@ -323,6 +323,14 @@ const openScanPopup = () => {
scanPopup.value.openScanPopup() scanPopup.value.openScanPopup()
} }
const getScanResult = (result) => { const getScanResult = (result) => {
if (!result.label.batch) {
showMessage('批次为空')
return
}
if (!result.label.itemCode) {
showMessage('物料号为空')
return
}
try { try {
const filters = [ const filters = [
{ {
@ -344,7 +352,7 @@ const getScanResult = (result) => {
getIssueJobList({ getIssueJobList({
filters, filters,
pageNo: 1, pageNo: 1,
pageSize: 100, pageSize: 1000,
sort: 'createTime', sort: 'createTime',
by: 'asc' by: 'asc'
}) })
@ -362,9 +370,7 @@ const getScanResult = (result) => {
list.push(item) list.push(item)
} }
}) })
if (list.length > 1) { if (list.length > 0) {
jobListRef.value.openList(list)
} else {
selectItem(list[0]) selectItem(list[0])
} }
} else { } else {

100
src/pages/package/coms/comPackageRecord.vue

@ -1,55 +1,44 @@
<template> <template>
<view class="" style="background-color: #fff;"> <view class="" style="background-color: #fff">
<record-com-detail-card :dataContent="dataContent" @removeItem="removeItem(index,dataContent)" <record-com-detail-card :dataContent="dataContent" @removeItem="removeItem(index, dataContent)" :isShowItemQty="false"> </record-com-detail-card>
:isShowItemQty='false'>
</record-com-detail-card>
<view class="" v-for="(detail,index) in dataContent.subList"> <view class="" v-for="(detail, index) in dataContent.subList">
<view v-if="detail.Records!=undefined" style='margin-left: 20px;' v-for="(record,index) in detail.Records"> <view v-if="detail.Records != undefined" style="margin-left: 20px" v-for="(record, index) in detail.Records">
<uni-swipe-action ref=""> <uni-swipe-action ref="">
<uni-swipe-action-item @click="swipeClick($event,detail,record,index)" <uni-swipe-action-item @click="swipeClick($event, detail, record, index)" :right-options="record.scaned ? scanOptions : detailOptions">
:right-options="record.scaned?scanOptions:detailOptions">
<view class="uni-flex uni-row scan_view margin-top: 5px;"> <view class="uni-flex uni-row scan_view margin-top: 5px;">
<view <view style="width: 20px; display: flex; justify-content: center; align-items: center; color: #32c1e8"> {{ index + 1 }}. </view>
style=" width: 20px;display: flex;justify-content: center;align-items: center; color: #32C1E8;"> <view style="width: 300px">
{{index+1}}.
</view>
<view style="width: 300px;">
<!-- <recommend :dataContent="record" :packageContent="record.package" :isShowStatus="false" <!-- <recommend :dataContent="record" :packageContent="record.package" :isShowStatus="false"
:isShowLocation="false"></recommend> --> :isShowLocation="false"></recommend> -->
<balance :dataContent="record" :packageContent="record.package" :isShowStatus="false" <balance :dataContent="record" :packageContent="record.package" :isShowStatus="false" :isShowFromLocation="false" :isShowToLocation="false"></balance>
:isShowFromLocation="false"></balance>
</view> </view>
</view> </view>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>
</view> </view>
<recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty='editItem.qty' @confirm="confirm"> <recommend-qty-edit ref="recommendQtyEdit" :dataContent="editItem" :handleQty="editItem.qty" @confirm="confirm"> </recommend-qty-edit>
</recommend-qty-edit> <package-detail-popup ref="packageDetailPopup"></package-detail-popup>
<package-detail-popup ref='packageDetailPopup'></package-detail-popup>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
<script> <script>
import itemQty from '@/mycomponents/item/itemQty.vue' import itemQty from '@/mycomponents/item/itemQty.vue'
import recommend from '@/mycomponents/recommend/recommend.vue' import recommend from '@/mycomponents/recommend/recommend.vue'
import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue' import purchaseLabel from '@/mycomponents/balance/purchaseLabel.vue'
import record from '@/mycomponents/record/record.vue' import record from '@/mycomponents/record/record.vue'
import balance from '@/mycomponents/balance/balance.vue' import balance from '@/mycomponents/balance/balance.vue'
import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue' import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
import packageBalance from '@/mycomponents/package/packageBalance.vue' import packageBalance from '@/mycomponents/package/packageBalance.vue'
import packageHandle from '@/mycomponents/package/packageHandle.vue' import packageHandle from '@/mycomponents/package/packageHandle.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue' import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue' import packageDetailPopup from '@/mycomponents/package/packageDetailPopup.vue'
import { getDetailOption, getDetailEditRemoveOption, getClearOption } from '@/common/array.js'
import { export default {
getDetailOption,
getDetailEditRemoveOption,
getClearOption
} from '@/common/array.js';
export default {
components: { components: {
itemQty, itemQty,
recommend, recommend,
@ -73,11 +62,11 @@
}, },
fromInventoryStatus: { fromInventoryStatus: {
type: String, type: String,
default: "" default: ''
}, },
toInventoryStatus: { toInventoryStatus: {
type: String, type: String,
default: "" default: ''
}, },
isShowStatus: { isShowStatus: {
type: Boolean, type: Boolean,
@ -103,7 +92,7 @@
data() { data() {
return { return {
option: [], option: [],
title: "推荐详情", title: '推荐详情',
showItem: {}, showItem: {},
editItem: {}, editItem: {},
detailOptions: [], detailOptions: [],
@ -114,58 +103,55 @@
}, },
mounted() { mounted() {
this.detailOptions = getDetailOption(); this.detailOptions = getDetailOption()
this.scanOptions = getDetailEditRemoveOption(); this.scanOptions = getDetailEditRemoveOption()
this.removeOptions = getClearOption(); this.removeOptions = getClearOption()
}, },
methods: { methods: {
removeItem(e, dataContent) { removeItem(e, dataContent) {
if (e.content.text == "清空") { if (e.content.text == '清空') {
this.$refs.comMessage.showQuestionMessage("确定清空物料及箱码信息?", this.$refs.comMessage.showQuestionMessage('确定清空物料及箱码信息?', (res) => {
res => {
if (res) { if (res) {
this.$emit('removeItem') this.$emit('removeItem')
// this.$emit('removeItem', this.dataContent) // this.$emit('removeItem', this.dataContent)
} }
}); })
} }
}, },
swipeClick(e, detail, record, index) { swipeClick(e, detail, record, index) {
if (e.content.text == "详情") { if (e.content.text == '详情') {
this.detail(detail.package) this.detail(detail.package)
} else if (e.content.text == "编辑") { } else if (e.content.text == '编辑') {
this.edit(record) this.edit(record)
} else if (e.content.text == "移除") { } else if (e.content.text == '移除') {
this.remove(detail, index) this.remove(detail, index)
} }
}, },
edit(item) { edit(item) {
this.editItem = item; this.editItem = item
this.$refs.recommendQtyEdit.openRecordEditPopup(this.editItem.LabelQty); this.$refs.recommendQtyEdit.openRecordEditPopup(this.editItem.LabelQty)
}, },
detail(item) { detail(item) {
this.showItem = item; this.showItem = item
this.$refs.packageDetailPopup.openPopup(item) this.$refs.packageDetailPopup.openPopup(item)
}, },
remove(detail, index) { remove(detail, index) {
this.$refs.comMessage.showQuestionMessage("确定移除扫描信息?", this.$refs.comMessage.showQuestionMessage('确定移除扫描信息?', (res) => {
res => {
if (res) { if (res) {
detail.Records.splice(index, 1) detail.Records.splice(index, 1)
this.$emit('removePack') this.$emit('removePack')
} }
}); })
}, },
confirm(qty) { confirm(qty) {
this.editItem.qty = qty; this.editItem.qty = qty
this.$emit('updateData') this.$emit('updateData')
} }
} }
} }
</script> </script>
<style> <style></style>
</style>

333
src/pages/package/record/splitPackageRecord.vue

@ -1,80 +1,60 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class=""> <view class="">
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan="showFromLocationPopup" v-if="detailSource.length == 0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length > 0">
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<com-package-record :dataContent="item" @removeItem="removeItem(index,item)" <com-package-record :dataContent="item" @removeItem="removeItem(index, item)" @updateData="updateData" @removePack="updateData"> </com-package-record>
@updateData="updateData" @removePack='updateData'>
</com-package-record>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<view class="page-footer"> <view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10" <view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
style="background-color:ghostwhite; width: 100%; "> <view class=""> </view>
<view class=""> <view class="uni-flex uni-row">
</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="commit">提交</button>
</view> </view>
</view> </view>
</view> </view>
<win-scan-button @goScan='showScanPopupPack'></win-scan-button> <win-scan-button @goScan="showScanPopupPack"></win-scan-button>
</view> </view>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :allowModifyLocation="false"> <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" :allowModifyLocation="false"> </win-scan-pack-and-location>
</win-scan-pack-and-location> <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation="getLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation' <win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult="getScanPackResult"></win-scan-pack>
:locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
<win-scan-pack title="拆分标签" ref="scanPopupPack" @getResult='getScanPackResult'></win-scan-pack>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
</template> </template>
<script> <script>
import { import { goHome } from '@/common/basic.js'
goHome, import { splitPackageRecordSubmit } from '@/api/request2.js'
} from '@/common/basic.js';
import { import { calc } from '@/common/calc.js'
splitPackageRecordSubmit
} from '@/api/request2.js'; import { getInventoryStatusDesc, getDirectoryItemArray } from '@/common/directory.js'
import { import { getBusinessType, createItemInfo, createDetailInfo, calcHandleQty } from '@/common/record.js'
calc
} from '@/common/calc.js'; import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import { import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
getInventoryStatusDesc, import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
getDirectoryItemArray import comBlankView from '@/mycomponents/common/comBlankView.vue'
} from '@/common/directory.js'; import winScanLocation from '@/mycomponents/scan/winScanLocation.vue'
import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.vue'
import { import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
getBusinessType, import comPackageRecord from '@/pages/package/coms/comPackageRecord.vue'
createItemInfo,
createDetailInfo, export default {
calcHandleQty
} from '@/common/record.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
import comPackageRecord from '@/pages/package/coms/comPackageRecord.vue'
export default {
components: { components: {
winScanButton, winScanButton,
winScanPack, winScanPack,
@ -89,37 +69,37 @@
data() { data() {
return { return {
id: '', id: '',
detailSource: [], // detailSource: [], //
fromLocationCode: "", fromLocationCode: '',
toLocationCode: "", toLocationCode: '',
fromLocationAreaTypeList: [], fromLocationAreaTypeList: [],
inInventoryStatus: "", // inInventoryStatus: '', //
outInventoryStatus: "", // outInventoryStatus: '', //
businessType: {}, businessType: {},
dataContent: {}, dataContent: {},
currentItemCode: "", currentItemCode: '',
toPackingNumber: "" toPackingNumber: ''
}; }
}, },
onLoad(option) { onLoad(option) {
var typeCode = "SplitPackage" const typeCode = 'SplitPackage'
getBusinessType(typeCode, res => { getBusinessType(typeCode, (res) => {
if (res.success) { if (res.success) {
this.businessType = res.businessType; this.businessType = res.businessType
this.fromLocationAreaTypeList = res.fromLocationAreaTypeList; this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
this.showFromLocationPopup(); this.showFromLocationPopup()
} else { } else {
this.showErrorMessage(res.message) this.showErrorMessage(res.message)
} }
}); })
}, },
// //
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if (e.index === 0) { if (e.index === 0) {
goHome(); goHome()
} }
}, },
// //
onBackPress(e) {}, onBackPress(e) {},
onPullDownRefresh() {}, onPullDownRefresh() {},
@ -129,254 +109,243 @@
}, },
methods: { methods: {
showScanPopupPack() { showScanPopupPack() {
this.$refs.scanPopupPack.openScanPopup(); this.$refs.scanPopupPack.openScanPopup()
}, },
getScanResult(result) { getScanResult(result) {
let balance = result.balance; const { balance } = result
let label = result.label; const { label } = result
let pack = result.package; const pack = result.package
var item = this.detailSource.find(res => { const item = this.detailSource.find((res) => {
if (res.itemCode == balance.itemCode) { if (res.itemCode == balance.itemCode) {
return res return res
} }
}) })
if (item == undefined) { if (item == undefined) {
var itemp = createItemInfo(balance, pack); const itemp = createItemInfo(balance, pack)
let newDetail = createDetailInfo(balance, pack); // const newDetail = createDetailInfo(balance, pack) //
newDetail.scaned = false; newDetail.scaned = false
newDetail.Records = []; newDetail.Records = []
newDetail.handleQty = 0 newDetail.handleQty = 0
itemp.subList.push(newDetail); itemp.subList.push(newDetail)
this.detailSource.push(itemp) this.detailSource.push(itemp)
} else { } else {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") this.showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
} }
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.closeScanPopup()
this.showScanPopupPack(); this.showScanPopupPack()
}, },
getScanPackResult(result) { getScanPackResult(result) {
var packingNumber = result.label.packingNumber; const { packingNumber } = result.label
var batch = result.label.batch; const { batch } = result.label
var qty = result.label.qty; const { qty } = result.label
var itemCode = result.label.itemCode; const { itemCode } = result.label
var uom = result.package.uom; const { uom } = result.package
var item = this.detailSource.find(r => r.itemCode == itemCode); const item = this.detailSource.find((r) => r.itemCode == itemCode)
if (item == undefined) { if (item == undefined) {
this.showErrorMessage("物料号【" + itemCode + "】不在列表中") this.showErrorMessage(`物料号【${itemCode}】不在列表中`)
} else { } else {
var temp = { const temp = {
scaned: true, scaned: true,
packingNumber: packingNumber, packingNumber,
batch: batch, batch,
qty: Number(qty), qty: Number(qty),
LabelQty: Number(qty), LabelQty: Number(qty),
stdPackUnit: result.package.stdPackUnit, stdPackUnit: result.package.stdPackUnit,
stdPackQty: result.package.stdPackQty, stdPackQty: result.package.stdPackQty,
uom: uom uom
} }
var sumQty = 0; let sumQty = 0
item.subList[0].Records.forEach(function(item1, index) { item.subList[0].Records.forEach(function (item1, index) {
sumQty = calc.add(sumQty,item1.qty) sumQty = calc.add(sumQty, item1.qty)
}); })
if (calc.add(qty,sumQty)> item.subList[0].qty) { // if (calc.add(qty,sumQty)> item.subList[0].qty) {
this.showErrorMessage("扫描数量总和【" + (Number(qty) + sumQty) + "】(当前输入数量【" + qty + "】+已添加数量【" + // this.showErrorMessage("" + (Number(qty) + sumQty) + "(" + qty + "+" +
sumQty + // sumQty +
"】)已超过拆包箱码的数量【" + Number(item.subList[0].qty) + "】!"); // ")" + Number(item.subList[0].qty) + "!");
return; // return;
} // }
item.subList[0].Records.push(temp); item.subList[0].Records.push(temp)
this.$forceUpdate(); this.$forceUpdate()
} }
this.calcHandleQty(); this.calcHandleQty()
}, },
calcHandleQty() { calcHandleQty() {
for (let detail of this.detailSource[0].subList) { for (const detail of this.detailSource[0].subList) {
let hQty = 0; let hQty = 0
if (detail.Records.length > 0) { if (detail.Records.length > 0) {
detail.Records.forEach((r) => {
detail.Records.forEach(r => { hQty = calc.add(hQty, r.qty)
hQty = calc.add(hQty,r.qty)
}) })
} }
detail.handleQty = hQty; detail.handleQty = hQty
} }
this.$forceUpdate(); this.$forceUpdate()
}, },
showErrorMessage(message) { showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => { this.$refs.comMessage.showErrorMessage(message, (res) => {
if (res) { if (res) {
} }
}); })
}, },
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty()
}, },
removeItem(index, item) { removeItem(index, item) {
this.detailSource.splice(index, 1) this.detailSource.splice(index, 1)
}, },
openScanPopup() { openScanPopup() {
if (this.fromLocationCode == "") { if (this.fromLocationCode == '') {
this.showFromLocationPopup(); this.showFromLocationPopup()
return return
} }
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType); this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType)
}, },
showFromLocationPopup() { showFromLocationPopup() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup(); this.$refs.scanLocationCode.openScanPopup()
}) })
}, },
closeScanPopup() { closeScanPopup() {
if (this.$refs.scanPopup != undefined) { if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.closeScanPopup()
} }
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
if (this.$refs.scanPopup != undefined) { if (this.$refs.scanPopup != undefined) {
this.$refs.scanPopup.getfocus(); this.$refs.scanPopup.getfocus()
} }
}, },
commit() { commit() {
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) { if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
uni.showLoading({ uni.showLoading({
title: "提交中....", title: '提交中....',
mask: true mask: true
}); })
var params = this.setParams(); const params = this.setParams()
console.log("提交" + JSON.stringify(params)) console.log(`提交${JSON.stringify(params)}`)
splitPackageRecordSubmit(params).then(res => { splitPackageRecordSubmit(params)
.then((res) => {
uni.hideLoading() uni.hideLoading()
if (res.data) { if (res.data) {
this.showCommitSuccessMessage("提交成功<br>生成拆包记录<br>" + res.data) this.showCommitSuccessMessage(`提交成功<br>生成拆包记录<br>${res.data}`)
} else { } else {
this.showErrorMessage("提交失败[" + res.msg + "]") this.showErrorMessage(`提交失败[${res.msg}]`)
} }
}).catch(error => { })
.catch((error) => {
uni.hideLoading() uni.hideLoading()
this.showErrorMessage(error) this.showErrorMessage(error)
}) })
} else { } else {
this.showErrorMessage("没有要提交的数据") this.showErrorMessage('没有要提交的数据')
} }
}, },
setParams() { setParams() {
const subList = []
var subList = [] const creator = this.$store.state.user.id
var creator = this.$store.state.user.id this.detailSource.forEach((item) => {
this.detailSource.forEach(item => { item.subList.forEach((detail) => {
item.subList.forEach(detail => { detail.Records.forEach((record) => {
detail.Records.forEach(record => {
if (record.scaned) { if (record.scaned) {
var subItem = {}; const subItem = {}
Object.assign(subItem, detail) Object.assign(subItem, detail)
subItem.itemCode = subItem.itemCode; subItem.itemCode = subItem.itemCode
subItem.itemName = detail.package.itemName; subItem.itemName = detail.package.itemName
subItem.itemDesc1 = detail.package.itemDesc1; subItem.itemDesc1 = detail.package.itemDesc1
subItem.itemDesc2 = detail.package.itemDesc2; subItem.itemDesc2 = detail.package.itemDesc2
subItem.fromInventoryStatus = subItem.inventoryStatus; subItem.fromInventoryStatus = subItem.inventoryStatus
subItem.toInventoryStatus = subItem.inventoryStatus; subItem.toInventoryStatus = subItem.inventoryStatus
subItem.fromQty = subItem.qty subItem.fromQty = subItem.qty
subItem.toQty = record.qty subItem.toQty = record.qty
subItem.fromPackingNumber = subItem.packingNumber; subItem.fromPackingNumber = subItem.packingNumber
subItem.toPackingNumber = record.packingNumber; subItem.toPackingNumber = record.packingNumber
subItem.fromBatch = subItem.batch; subItem.fromBatch = subItem.batch
subItem.toBatch = record.batch; subItem.toBatch = record.batch
subItem.fromLocationCode = subItem.fromLocationCode; subItem.fromLocationCode = subItem.fromLocationCode
subItem.package = "" subItem.package = ''
subItem.Records = "" subItem.Records = ''
subList.push(subItem) subList.push(subItem)
} }
}) })
}) })
}) })
this.dataContent.subList = subList; this.dataContent.subList = subList
this.dataContent.creator = creator; this.dataContent.creator = creator
return this.dataContent; return this.dataContent
}, },
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, (res) => {
if (res) {} if (res) {
}); }
})
}, },
showErrorMessage(message) { showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => { this.$refs.comMessage.showErrorMessage(message, (res) => {
if (res) { if (res) {
} }
}); })
}, },
showScanMessage(message) { showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message); this.$refs.comMessage.showScanMessage(message)
}, },
afterCloseMessage() { afterCloseMessage() {
this.scanPopupGetFocus(); this.scanPopupGetFocus()
}, },
closeScanMessage() { closeScanMessage() {
this.scanPopupGetFocus(); this.scanPopupGetFocus()
}, },
getLocation(location, code) { getLocation(location, code) {
this.getFromLocationCode(location, code) this.getFromLocationCode(location, code)
}, },
getFromLocationCode(location, code) { getFromLocationCode(location, code) {
this.fromLocationCode = code; this.fromLocationCode = code
this.openScanPopup(); this.openScanPopup()
}, },
getToLocationCode(location, code) { getToLocationCode(location, code) {
if (this.fromLocationCode == code) { if (this.fromLocationCode == code) {
uni.showToast({ uni.showToast({
title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致", title: `来源库位[${this.fromLocationCode}]不能与目标库位[${code}]一致`,
duration: 2000 duration: 2000
}) })
return return
} }
this.toLocationCode = code; this.toLocationCode = code
}, },
showCommitSuccessMessage(hint) { showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => { this.$refs.comMessage.showSuccessMessage(hint, (res) => {
this.detailSource = [] this.detailSource = []
this.fromLocationCode = ''; this.fromLocationCode = ''
this.currentItemCode = "" this.currentItemCode = ''
this.dataContent = {} this.dataContent = {}
}) })
}, },
updateData() { updateData() {
this.calcHandleQty(); this.calcHandleQty()
}
} }
} }
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss"></style>
</style>

78
src/pages/repleinsh/job/repleinshJob.vue

@ -10,6 +10,8 @@
<repleinsh-job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></repleinsh-job-list-popup> <repleinsh-job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></repleinsh-job-list-popup>
<u-loadmore :status="loadingType" v-if="jobList.length > 0" /> <u-loadmore :status="loadingType" v-if="jobList.length > 0" />
</view> </view>
<win-scan-button @goScan="openScanPopup" v-if="jobList.length > 0"></win-scan-button>
<winScanPackJob ref="scanPopup" @getResult="getScanResult"></winScanPackJob>
<com-message ref="comMessageRef" /> <com-message ref="comMessageRef" />
</view> </view>
</template> </template>
@ -30,6 +32,8 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue'
import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue' import comRepleinshJobCard from '@/pages/repleinsh/coms/comRepleinshJobCard.vue'
import repleinshJobListPopup from '@/pages/repleinsh/coms/repleinshJobListPopup.vue' import repleinshJobListPopup from '@/pages/repleinsh/coms/repleinshJobListPopup.vue'
import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue' import repleinshInfoPopup from '@/pages/repleinsh/coms/repleinshInfoPopup.vue'
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPackJob from '@/mycomponents/scan/winScanPackJob.vue'
import { useCountStore } from '@/store' import { useCountStore } from '@/store'
// store // store
@ -46,6 +50,7 @@ const waitTask = ref(false)
const todayTime = ref('') const todayTime = ref('')
const status = ref('1,2') // const status = ref('1,2') //
const detailOptions = ref([]) const detailOptions = ref([])
const scanMessage = ref('')
const detailGiveupOptions = ref([]) const detailGiveupOptions = ref([])
const filter = ref() const filter = ref()
const comMessageRef = ref() const comMessageRef = ref()
@ -162,8 +167,8 @@ const fromLocationCode = (fromLocationCode) => {
console.log('fromLocationCode', fromLocationCode) console.log('fromLocationCode', fromLocationCode)
getList('refresh', fromLocationCode, '') getList('refresh', fromLocationCode, '')
} }
const openJobDetail = (item) => { const openJobDetail = (item, scanMessageParams = '') => {
proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}`) proxy.$tab.navigateTo(`./repleinshDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessageParams}`)
} }
const selectedItem = (item) => { const selectedItem = (item) => {
openJobDetail(item) openJobDetail(item)
@ -262,6 +267,75 @@ const showMessage = (message) => {
} }
}) })
} }
const openScanPopup = () => {
scanPopup.value.openScanPopup()
}
const selectItem = (item) => {
scanPopup.value.closeScanPopup()
openJobDetail(item, scanMessage.value)
}
const getScanResult = (result) => {
if (!result.label.batch) {
showMessage('批次为空')
return
}
if (!result.label.itemCode) {
showMessage('物料号为空')
return
}
try {
const filters = [
{
column: 'status',
action: 'in',
value: '1,2'
},
{
column: 'batch',
action: '==',
value: result.label.batch
},
{
column: 'itemCode',
action: '==',
value: result.label.itemCode
}
]
getRepleinshJobList({
filters,
pageNo: 1,
pageSize: 1000,
sort: 'createTime',
by: 'asc'
})
.then((res) => {
scanMessage.value = result.scanMessage
const resultList = res.data.list
if (resultList.length > 0) {
resultList.forEach((item) => {
item.title = item.number
item.selected = false
})
const list = []
resultList.forEach((item) => {
if (!list.find((subItem) => subItem.title == item.title)) {
list.push(item)
}
})
if (list.length > 0) {
selectItem(list[0])
}
} else {
showMessage(`物料号[${result.label.itemCode}]批次[${result.label.batch}]未查找到任务`)
}
})
.catch((error) => {
showMessage(error)
})
} catch (e) {
showMessage(e.message)
}
}
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss"></style>

Loading…
Cancel
Save