sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

上架模块fromInventoryStatus2024/6/14 19:01:24

hella_vue3
zhang_li 3 months ago
parent
922a6ca3ea
commit
59a863a9e6
7 changed files with 106 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      src/mycomponents/package/packageCard.vue
  2. 2
      src/mycomponents/recommend/recommend.vue
  3. 4
      src/mycomponents/scan/winScanPackAndLocation.vue
  4. 2
      src/pages/productPutaway/record/productPutawayRecord.vue
  5. 2
      src/pages/productReceipt/job/fgProductReceiptDetail.vue
  6. 1
      src/pages/putaway/job/putawayDetail.vue
  7. 2
      src/pages/putaway/record/putawayRecord.vue

70
src/mycomponents/package/packageCard.vue
View File

@ -1,30 +1,24 @@
<template>
<view :class="dataContent.scaned?'scan_view':''" style="background-color: #fff; ">
<view :class="dataContent.scaned ? 'scan_view' : ''" style="background-color: #fff">
<!-- border-bottom: 1upx solid #EEEEEE; -->
<view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉-->
<view style="word-break: break-all;">
<view style="word-break: break-all">
<!-- <container v-if="isShowContainer&&dataContent.containerNumber!=null" :container="dataContent.containerNumber">
</container> -->
<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
</pack>
<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
</location>
<pack v-if="isShowPack && dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"> </pack>
<batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location>
<!-- <to-location></to-location> -->
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">
</to-location>
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode"> </to-location>
</view>
<view class="uni-flex uni-row " style="word-break: break-all;align-items:center">
<view class="uni-flex uni-row" style="word-break: break-all; align-items: center">
<!-- ||dataContent.handleQty==0 可能会有扫描到0的情况-->
<recommend-qty v-if="dataContent.handleQty==null || dataContent.handleQty==undefined"
:dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
:handleQty="Number(dataContent.handleQty)" :isShowStdPack="false">
</compare-qty>
<recommend-qty v-if="dataContent.handleQty == null || dataContent.handleQty == undefined" :dataContent="dataContent" :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" :handleQty="Number(dataContent.handleQty)" :isShowStdPack="isShowStatus"> </compare-qty>
<view v-if="isDevlement()">
<image style='width: 26rpx;height: 26rpx;margin-top: 44rpx;' src="/static/icons/icon_copy.svg" alt="" @click="copy"/>
<image style="width: 26rpx; height: 26rpx; margin-top: 44rpx" src="/static/icons/icon_copy.svg" alt="" @click="copy" />
</view>
</view>
</view>
@ -32,15 +26,16 @@
</template>
<script setup lang="ts">
import container from '@/mycomponents/container/container.vue'
import pack from '@/mycomponents/balance/pack.vue'
import location from '@/mycomponents/balance/location.vue'
import toLocation from '@/mycomponents/balance/toLocation.vue'
import batch from '@/mycomponents/balance/batch.vue'
import recommendQty from '@/mycomponents/qty/recommendQty.vue'
import compareQty from '@/mycomponents/qty/compareQty.vue'
import config from '@/static/config.js'
const props = defineProps({
import container from '@/mycomponents/container/container.vue'
import pack from '@/mycomponents/balance/pack.vue'
import location from '@/mycomponents/balance/location.vue'
import toLocation from '@/mycomponents/balance/toLocation.vue'
import batch from '@/mycomponents/balance/batch.vue'
import recommendQty from '@/mycomponents/qty/recommendQty.vue'
import compareQty from '@/mycomponents/qty/compareQty.vue'
import config from '@/static/config.js'
const props = defineProps({
dataContent: {
type: Object,
default: null
@ -74,11 +69,10 @@
type: String,
default: '库位'
}
})
const copy = () => {
})
const copy = () => {
// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
var content = "HPQ;V1.0;I" + props.dataContent.itemCode + ";P" + props.dataContent.packingNumber + ";B" + props.dataContent
.batch + ";Q" + props.dataContent.qty
const content = `HPQ;V1.0;I${props.dataContent.itemCode};P${props.dataContent.packingNumber};B${props.dataContent.batch};Q${props.dataContent.qty}`
uni.setClipboardData({
data: content,
@ -88,11 +82,10 @@
})
}
})
}
const copyPro = () => {
}
const copyPro = () => {
// HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
var content = "HMQ;V1.0;I" + props.dataContent.itemCode + ";P" + props.dataContent.packingNumber + ";B" + props.dataContent
.batch + ";Q" + props.dataContent.qty
const content = `HMQ;V1.0;I${props.dataContent.itemCode};P${props.dataContent.packingNumber};B${props.dataContent.batch};Q${props.dataContent.qty}`
uni.setClipboardData({
data: content,
@ -102,11 +95,10 @@
})
}
})
}
const isDevlement = () => {
return config.isDevelopment;
}
}
const isDevlement = () => {
return config.isDevelopment
}
</script>
<style>
</style>
<style></style>

2
src/mycomponents/recommend/recommend.vue
View File

@ -14,7 +14,7 @@
<view style="word-break: break-all" class="uni-flex uni-row center">
<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
<recommend-qty v-if="detail.handleQty == null || detail.handleQty == undefined" :dataContent="detail" :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" :handleQty="Number(detail.handleQty)" :isShowStdPack="false"> </compare-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" :handleQty="Number(detail.handleQty)" :isShowStdPack="isShowStatus"> </compare-qty>
<view v-if="isDevlement()">
<image style="width: 26rpx; height: 26rpx; margin-top: 40rpx" src="/static/icons/icon_copy.svg" alt="" @click="copy" />

4
src/mycomponents/scan/winScanPackAndLocation.vue
View File

@ -241,7 +241,11 @@ const afterQueryBalance = (datas) => {
if (props.allowNullBalance) {
allowNoneBalance(datas)
} else if (props.noShowBalanceMessage) {
if (Array.isArray(datas)) {
countCallBack(datas[0])
} else {
countCallBack(datas)
}
} else {
mustHavaBalance(datas)
}

2
src/pages/productPutaway/record/productPutawayRecord.vue
View File

@ -114,6 +114,7 @@ const getScanResult = (result) => {
if (item == undefined) {
const itemp = createItemInfo(balance, pack)
const newDetail = createDetailInfo(balance, pack) //
newDetail.fromInventoryStatus = balance.inventoryStatus
itemp.subList.push(newDetail)
detailSource.value.push(itemp)
} else {
@ -124,6 +125,7 @@ const getScanResult = (result) => {
})
if (detail == undefined) {
const newDetail = createDetailInfo(balance, pack)
newDetail.fromInventoryStatus = balance.inventoryStatus
item.subList.push(newDetail)
} else if (detail.scaned == true) {
showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)

2
src/pages/productReceipt/job/fgProductReceiptDetail.vue
View File

@ -316,6 +316,8 @@ const print = () => {
barcodeString: item.barcodeString, // 标签
itemCode: item.itemCode || '', // 物品代码
itemName: item.itemName || '', // 物品名称
packName: item.packName || '', // 包装名称
itemType: item.itemType || '', // 物料类型
itemDesc1: item.itemDesc1 || '', // 物品描述
relateNumber: item.relateNumber || '', // relateNumber包装号
batch: item.batch || '', // 批次

1
src/pages/putaway/job/putawayDetail.vue
View File

@ -293,6 +293,7 @@ const getScanResult = (result) => {
scanedLength++
}
})
itemDetail.fromInventoryStatus = result.balance.inventoryStatus
if (itemDetail.scaned && scanedLength == itemDetail.packList.length) {
showMessage(`箱码【${packingNumber}】已经扫描`)
} else {

2
src/pages/putaway/record/putawayRecord.vue
View File

@ -128,6 +128,7 @@ const getScanResult = (result) => {
newDetail.poLine = poLine
newDetail.poNumber = poNumber
newDetail.supplierCode = supplierCode
newDetail.fromInventoryStatus = balance.inventoryStatus
itemp.subList.push(newDetail)
detailSource.value.push(itemp)
calcHandleQty(detailSource.value)
@ -145,6 +146,7 @@ const getScanResult = (result) => {
newDetail.toWarehouseCode = toLocation.toWarehouseCode
newDetail.poLine = poLine
newDetail.poNumber = poNumber
newDetail.fromInventoryStatus = balance.inventoryStatus
newDetail.supplierCode = supplierCode
item.subList.push(newDetail)
calcHandleQty(detailSource.value)

Write Preview
Loading…
Cancel
Save