完善采购入库单,一物一码设备扫码功能

pull/744/head
没钱 2025-03-14 20:08:26 +08:00
parent 1984f0faa6
commit ec1b0a80f5
4 changed files with 177 additions and 12 deletions

View File

@ -224,6 +224,7 @@ export enum DICT_TYPE {
ERP_PRODUCT_COMMON_PROPERTIES = 'erp_product_common_properties', // 产品普通属性
ERP_PRODUCT_INPUT_PROPERTIES = 'erp_product_input_properties', // 产品输入属性
ERP_PRODUCT_BRAND = 'erp_product_brand', // 产品品牌
ERP_PRODUCT_QR_MATCH='erp_product_qr_match', // 产品二维码匹配方式

View File

@ -1,4 +1,43 @@
import { toNumber } from 'lodash-es'
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
/**
*
*/
export const matchRulesFromDictOptions = (s : string) => {
// 从字典获取规则
const dictOptions = getStrDictOptions(DICT_TYPE.ERP_PRODUCT_QR_MATCH)
//获取长度相关
const longMatch = dictOptions.filter((item) => {
return item.value === 'long'
})
const longMatchValue = longMatch[0].label
//将长度拼接字符串转换为数组
const longMatchArr = longMatchValue.split(',')
//判断数组中元素是否包含传入的字符串长度
const longMatchResult = longMatchArr.some((item) => {
return item === s.length.toString()
})
if (!longMatchResult) {
return false
}
//获取头部正则相关
const headMatch = dictOptions.filter((item) => {
return item.value === 'head'
})
const headMatchValue = headMatch[0].label
//将头部正则拼接字符串转换为数组
const headMatchArr = headMatchValue.split(',')
//判断数组中元素是否包含传入的字符串头部
const headMatchResult = headMatchArr.some((item) => {
return s.startsWith(item)
})
if (!headMatchResult) {
return false
}
return true
}
/**
*

View File

@ -286,6 +286,19 @@ const submitForm = async () => {
//
await formRef.value.validate()
await itemFormRef.value.validate()
//
const items = formData.value.items
for (let i = 0; i < items.length; i++) {
const item = items[i]
//
if (item.ifQr) {
continue;
}
if (item.qrCodeLineCount !== item.count) {
message.error(`${i + 1} 行的入库数量和码的数量不同`)
return
}
}
//
formLoading.value = true
try {

View File

@ -1,4 +1,6 @@
<template>
<div>
<div>
<el-form
ref="formRef"
:model="formData"
@ -87,27 +89,29 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="原数量"
label="已入库/原数量"
fixed="right"
min-width="80"
min-width="120"
v-if="formData[0]?.totalCount != null"
>
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.totalCount" :formatter="erpCountInputFormatter" />
<el-input disabled :value="`${row.inCount}/${row.totalCount}`" />
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="已入库"
<el-table-column
label=""
fixed="right"
min-width="80"
v-if="formData[0]?.inCount != null"
min-width="40"
>
<template #default="{ row }">
<template #default="{ row , $index}">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.inCount" :formatter="erpCountInputFormatter" />
<el-button :disabled="row.ifQr" @click="openQrDialog($index)" link>
<Icon icon="fa:qrcode" />
</el-button>
</el-form-item>
</template>
</el-table-column>
@ -187,22 +191,48 @@
<el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }">
<el-button :disabled="formData.length === 1" @click="handleDelete($index)" link>
<span v-show="formData.length > 1 && !disabled" style="color: red;"></span>
<span v-show="formData.length === 1 || disabled"></span>
</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
<div>
<div>
<!-- 一物一码扫码弹窗 -->
<Dialog
:title="productName"
v-model="qrDialogVisible"
:appendToBody="true"
>
<!-- 显示有效行数 -->
<div>输入的有效行数: {{ qrCodeLineCount }}</div>
<div>需要扫描数: {{ qrNeedCount }}</div>
<el-input type="textarea" v-model="qrCodes" :rows="10" @input="onQrCodeChange" />
<template #footer>
<el-button @click="submitQr" type="primary">
</el-button>
<el-button @click="qrDialogVisible = false"> </el-button>
</template>
</Dialog>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { WarehouseApi as WarehouseLocactionApi ,WarehouseLocationVO} from '@/api/erp/warehouse'
import { StockApi } from '@/api/erp/stock/stock'
import {
erpCountInputFormatter,
erpPriceInputFormatter,
erpPriceMultiply,
getSumValue
getSumValue,
matchRulesFromDictOptions
} from '@/utils'
import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
@ -210,6 +240,7 @@ const props = defineProps<{
items: undefined
disabled: false
}>()
const formLoading = ref(false) //
const formData = ref([])
const formRules = reactive({
@ -222,6 +253,87 @@ const formRef = ref([]) // 表单 Ref
const warehouseList = ref<WarehouseVO[]>([]) //
const locationList = ref<WarehouseLocationVO[]>([]) //
const defaultWarehouse = ref<WarehouseVO>(undefined) //
//
const qrDialogVisible = ref(false)
//
const qrCodes = ref('')
//
const currentRow = ref<typeof props.items[0]>(undefined)
//
const currentRowIndex = ref(-1)
//
const productName = ref('')
//
const qrCodeLineCount = ref(0);
const message = useMessage() //
//
const qrNeedCount = computed(() => {
return currentRow.value?.count
})
//
const onQrCodeChange = () => {
// qrCode.value undefined null
if (qrCodes.value) {
const lines = qrCodes.value.split('\n');
//
const trimmedLines = lines.map(line => line.trim());
const validLines = trimmedLines.filter(line =>{
return matchRulesFromDictOptions(line)
});
//
const uniqueLines = [...new Set(validLines)];
qrCodeLineCount.value = uniqueLines.length;
// row.count
if (currentRow.value && qrCodeLineCount.value > currentRow.value.count) {
message.warning('输入的有效行数不能超过该产品的数量!');
//
qrCodes.value = validLines.slice(0, currentRow.value.count).join('\n');
qrCodeLineCount.value = currentRow.value.count;
}
} else {
qrCodeLineCount.value = 0;
}
};
//
const openQrDialog = (index:number) => {
// currentRow
currentRow.value = formData.value[index] ; // 使
currentRowIndex.value = index;
//
if (currentRow.value.qrcodes) {
qrCodes.value = currentRow.value.qrcodes;
} else {
qrCodes.value = ''; //
}
//
productName.value = currentRow.value.productName;
//
onQrCodeChange();
//
qrDialogVisible.value = true;
};
/** 提交扫码 */
const submitQr = async () => {
//
if (qrCodes.value == null || qrCodes.value == undefined || qrCodes.value === '') {
return;
}
// formData
const index = currentRowIndex.value; //
if (index !== -1 && formData.value[index]) { //
// formData qrcode
formData.value[index].qrcodes = qrCodes.value;
//
formData.value[index].qrCodeLineCount = qrCodeLineCount.value;
}
//
qrDialogVisible.value = false;
};
/** 初始化设置入库项 */
watch(