diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue index 9e552662..27f275b9 100644 --- a/src/mycomponents/balance/location.vue +++ b/src/mycomponents/balance/location.vue @@ -1,23 +1,21 @@ - + diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index e1c0d657..30bf08ec 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -10,7 +10,7 @@ - 来源库位 + 来源库位 - + 阶段 : {{ handleGetCountStageName(dataContent.stage) }} 策略 : {{ isOpenCount(dataContent.isOpenCount) }} diff --git a/src/pages/count/job/countBlindDetail.vue b/src/pages/count/job/countBlindDetail.vue index 3de457b8..2bcb8a86 100644 --- a/src/pages/count/job/countBlindDetail.vue +++ b/src/pages/count/job/countBlindDetail.vue @@ -34,7 +34,7 @@ {{ index + 1 }}. - + @@ -54,7 +54,7 @@ - + @@ -207,15 +207,15 @@ export default { } else { that.jobContent = res.data that.jobStatus = res.data.status - that.fromLocationCode = that.jobContent.locationCode - // 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; + 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 that.initList() } }) @@ -297,18 +297,25 @@ export default { const { packingNumber } = result.label const pack = result.package const { batch } = result.label - const inventoryStatus = 'OK' - const qty = result.label.qty ? result.label.qty : 0 + const inventoryStatus = result.balance ? result.balance.inventoryStatus : 'OK' + const qty = result.balance ? result.balance.qty : 0 // 按物料、箱码、批次、状态匹配 const items = this.allDetails.filter((r) => r.itemCode === itemCode && r.packingNumber === packingNumber && r.batch === batch && r.inventoryStatus === inventoryStatus) // 不在任务列表中,是否添加库存 if (items.length == 0) { - const detail = this.createAddDetailInfo(pack, qty) - detail.countTime = new Date() - this.allDetails.push(detail) - this.updateList() - this.$refs.countQtyEdit.openEditPopupShowSeconds(detail, null) + this.$refs.comMessage.showQuestionMessage(`包装【${result.label.packingNumber}】不在任务列表中,是否要添加到列表中?`, (res) => { + // 创建盘点信息，标记为已经扫描 + if (res) { + const 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 { const selectItem = items[0] // 已经扫描 @@ -324,7 +331,7 @@ export default { } else { // 未扫描，赋值 selectItem.scaned = true - selectItem.recommendQty = Number(qty) + selectItem.balanceQty = Number(qty) selectItem.handleQty = Number(qty) selectItem.packQty = pack.packQty selectItem.packUnit = pack.packUnit @@ -372,7 +379,7 @@ export default { // 创建盘盈的明细 createAddDetailInfo(pack, qty) { const detail = { - id: this.jobContent.masterId, // 新增的明细 + masterId: this.jobContent.id, // 新增的明细 scaned: true, countDetailNumber: '', ownerCode: '', @@ -396,6 +403,7 @@ export default { countQty: 0, balanceQty: 0, fromLocationCode: this.fromLocationCode, + locationCode: this.fromLocationCode, creator: this.$store.state.user.id, countTime: new Date() } @@ -538,6 +546,7 @@ page { /* #ifdef H5 */ top: 88rpx; /* #endif */ + left: 0; width: 100%; background-color: #fff; diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue index 29d8d734..7d0e7bbb 100644 --- a/src/pages/count/job/countJob.vue +++ b/src/pages/count/job/countJob.vue @@ -126,6 +126,11 @@ const getList = (type) => { action: 'in', value: status.value }) + filters.push({ + column: 'countSplitType', + action: '==', + value: 'locationCode' + }) // filters.push({ // column: 'accept_user_id', // action: '==', @@ -167,9 +172,17 @@ const getList = (type) => { }) } const openJobDetail = (item) => { - uni.navigateTo({ - url: `./countDetail?id=${item.id}&status=${item.status}` - }) + // 明盘 + if (item.isOpenCount == 'TRUE') { + uni.navigateTo({ + url: `./countLightDetail?id=${item.id}&status=${item.status}` + }) + } else { + // 盲盘 + uni.navigateTo({ + url: `./countBlindDetail?id=${item.id}&status=${item.status}` + }) + } } const selectedItem = (item) => { openJobDetail(item) @@ -249,6 +262,11 @@ const getDataListByType = (code) => { action: '==', value: code }) + filters.push({ + column: 'countSplitType', + action: '==', + value: 'locationCode' + }) const params = { filters, pageNo: 1, diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue index bc2ca030..afe44967 100644 --- a/src/pages/count/job/countLightDetail.vue +++ b/src/pages/count/job/countLightDetail.vue @@ -58,7 +58,7 @@ - + @@ -196,7 +196,7 @@ const getDetail = () => { } else { jobContent.value = res.data jobStatus.value = res.data.status - fromLocationCode.value = jobContent.value.locationCode + fromLocationCode.value = jobContent.value.countSplitCode res.data.subList.forEach((item) => { item.recommendQty = item.qty item.handleQty = 0 @@ -365,7 +365,7 @@ const editClose = () => { // 创建盘盈的明细 const createAddDetailInfo = (pack, qty) => { const detail = { - id: jobContent.value.masterId, // 新增的明细 + id: jobContent.value.id, // 新增的明细 scaned: true, countDetailNumber: '', ownerCode: '', diff --git a/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue index 01a61335..1d2ba10c 100644 --- a/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue +++ b/src/uni_modules/uni-combox/components/uni-combox/uni-combox.vue @@ -240,7 +240,7 @@ export default { cursor: pointer; /* #endif */ line-height: 36px; - font-size: 60rpx; + font-size: 45rpx; text-align: center; // border-bottom: solid 1px #DDDDDD; padding: 0px 10px; @@ -290,6 +290,6 @@ export default { border: none; } .uni-input-input { - font-size: 60rpx; + font-size: 40rpx; }