diff --git a/src/apis/fullWorkOrder/fullWorkOrder.ts b/src/apis/fullWorkOrder/fullWorkOrder.ts index fef90ec..cd444e1 100644 --- a/src/apis/fullWorkOrder/fullWorkOrder.ts +++ b/src/apis/fullWorkOrder/fullWorkOrder.ts @@ -7,6 +7,7 @@ export interface FullWorkOrderResp { title: string orderNo: string materialCode: string + encodingPrint: string materialName: string batch: string mark: string diff --git a/src/apis/material/materialInfo.ts b/src/apis/material/materialInfo.ts index 1a5c0dc..6590924 100644 --- a/src/apis/material/materialInfo.ts +++ b/src/apis/material/materialInfo.ts @@ -6,6 +6,7 @@ export interface MaterialInfoResp { id: string materialName: string encoding: string + encodingPrint: string unitWeight: string materialSpec: string photoUrl: string @@ -22,6 +23,7 @@ export interface MaterialInfoResp { export interface MaterialInfoQuery { materialName: string | undefined encoding: string | undefined + encodingPrint: string | undefined batch: string | undefined mark: string | undefined sort: Array diff --git a/src/apis/weightManage/weightManage.ts b/src/apis/weightManage/weightManage.ts index 295e518..7ed1cd8 100644 --- a/src/apis/weightManage/weightManage.ts +++ b/src/apis/weightManage/weightManage.ts @@ -5,6 +5,7 @@ const BASE_URL = '/weighManage/workOrder' export interface WeighManageResp { id: string encoding: string + encodingPrint: string materialName: string materialSpec: string unitWeight: number diff --git a/src/apis/workOrder/workOrder.ts b/src/apis/workOrder/workOrder.ts index d2c6d1b..2064539 100644 --- a/src/apis/workOrder/workOrder.ts +++ b/src/apis/workOrder/workOrder.ts @@ -8,6 +8,7 @@ export interface WorkOrderResp { orderNo: string materialName: string encoding: string + encodingPrint: string unitWeight: string materialSpec: string photoUrl: string @@ -42,6 +43,7 @@ export interface WorkOrderQuery { materialName: string | undefined batch: string | undefined encoding: string | undefined + encodingPrint: string | undefined userName: string | undefined carNo: string | undefined startDate: string | undefined diff --git a/src/views/barcodePrint/index.vue b/src/views/barcodePrint/index.vue index 9d6132b..fa267c4 100644 --- a/src/views/barcodePrint/index.vue +++ b/src/views/barcodePrint/index.vue @@ -13,8 +13,8 @@
- - + +
@@ -199,6 +199,7 @@ const route = useRoute() const formData = reactive({ workerOrderId: '', encoding: '', + encodingPrint: '', materialName: '', orderNo: '', totalCalculatedWeight: '', @@ -297,7 +298,7 @@ const generateDetailLabel = async () => { for (const workOrderInfo of formData.workOrderInfos) { // 计算二维码数据 const orderNo = formData.orderNo + workOrderInfo.id; - const qrCodeData = `10#${formData.encoding}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY` + const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY` // 生成二维码图片 const qrCodeImage = await generateQRCode(qrCodeData) @@ -305,7 +306,7 @@ const generateDetailLabel = async () => { // 添加标签数据 labelDataList.push({ partName: formData.materialName || '', - partNumber: formData.encoding || '', + partNumber: formData.encodingPrint || '', totalCalculatedWeight: workOrderInfo.calculatedWeight || '', totalWeight: workOrderInfo.weight || '', productionDate: formattedDate, @@ -353,7 +354,7 @@ const generateOverallLabel = async () => { String(now.getDate()).padStart(2, '0') // 计算二维码数据 - const qrCodeData = `10#${formData.encoding}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY` + const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY` // 生成二维码图片 const qrCodeImage = await generateQRCode(qrCodeData) @@ -361,7 +362,7 @@ const generateOverallLabel = async () => { // 直接从 formData 中获取数据 Object.assign(labelData, { partName: formData.materialName || '', - partNumber: formData.encoding || '', + partNumber: formData.encodingPrint || '', totalCalculatedWeight: formData.totalCalculatedWeight || '', totalWeight: formData.totalWeight || '', productionDate: formattedDate, @@ -390,6 +391,7 @@ onMounted(() => { getWorkOrder(workerOrderId).then(res => { if (res.code == '0') { formData.encoding = res.data.encoding + formData.encodingPrint = res.data.encodingPrint formData.materialName = res.data.materialName formData.orderNo = res.data.orderNo formData.batch = res.data.batch @@ -501,7 +503,7 @@ const printLabel = async () => { .label-row { display: flex; align-items: center; } .label-field { font-size: 8pt; font-weight: bold; margin-right: 2mm; min-width: 25pt; } .label-value { font-size: 8pt; font-weight: bold; flex: 1; } - .qr-code img { width: 20mm; height: 20mm; margin: 1mm 0; } + .qr-code img { width: 23mm; height: 23mm; margin: 1mm 0; } .mark-number { font-size: 8pt; font-weight: bold; margin-top: 1mm; text-align: center; } .serial-number { font-size: 8pt; font-weight: bold; margin-top: 1mm; } @@ -641,9 +643,9 @@ defineOptions({ name: 'print' }) } .qr-code img { - width: 100px; - height: 100px; - margin: 5px 0; + width: 115px; + height: 120px; + margin: 0 0; } .qr-code .loading { diff --git a/src/views/fullClaim/FullWorkOrderAddModal.vue b/src/views/fullClaim/FullWorkOrderAddModal.vue index 3a2bf1c..4d45d2e 100644 --- a/src/views/fullClaim/FullWorkOrderAddModal.vue +++ b/src/views/fullClaim/FullWorkOrderAddModal.vue @@ -132,6 +132,7 @@ const weighingPageStatus = ref<'idle' | 'entering' | 'entered' | 'error'>('idle' const [form, resetForm] = useResetReactive({ materialCode: '', + encodingPrint: '', imgUrl: '', materialName: '', batch: '', @@ -178,6 +179,7 @@ const originalHandleMaterialCodeChange = async () => { form.materialName = '' form.inputMaterialCode2 = '' form.batch = '' + form.encodingPrint = '' form.count = undefined form.mark = undefined @@ -205,6 +207,7 @@ const fetchMaterialData = async (code: string) => { if (res.code === '0') { // 更新表单数据 form.materialCode = res.data?.encoding || '' + form.encodingPrint = res.data?.encodingPrint || '' form.materialName = res.data?.materialName || '' form.batch = res.data?.batch || '' } @@ -213,6 +216,7 @@ const fetchMaterialData = async (code: string) => { const handleMaterialCodeChange2 = async (code: string) => { if (!code || code?.trim()=== '') { form.materialCode = '' + form.encodingPrint = '' form.materialName = '' form.batch = '' form.mark = undefined @@ -227,6 +231,7 @@ const handleMaterialCodeChange2 = async (code: string) => { if (res.code === '0') { // 更新表单数据 form.materialCode = res.data?.encoding || '' + form.encodingPrint = res.data?.encodingPrint || '' form.materialName = res.data?.materialName || '' form.batch = res.data?.batch || '' } diff --git a/src/views/fullClaim/index.vue b/src/views/fullClaim/index.vue index a8c3f4b..927cda2 100644 --- a/src/views/fullClaim/index.vue +++ b/src/views/fullClaim/index.vue @@ -121,6 +121,7 @@ const columns = ref([ { title: '任务工单号', dataIndex: 'orderNo', slotName: 'orderNo' }, { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' }, { title: '物料编码', dataIndex: 'materialCode', slotName: 'materialCode' }, + { title: '打印编码(国产替代)', dataIndex: 'encodingPrint', slotName: 'encodingPrint' ,width: 120}, { title: '批次号', dataIndex: 'batch', slotName: 'batch' }, { title: '数量', dataIndex: 'count', slotName: 'count' }, { title: '标记号', dataIndex: 'mark', slotName: 'mark' }, @@ -202,7 +203,7 @@ const onPrint = async (record: FullWorkOrderResp) => { String(now.getDate()).padStart(2, '0') // 计算二维码数据 - const qrCodeData = `10#${record.materialCode || ''}$11#9DP$12#${record.batch || ''}$17#${record.count || ''}$20#${formattedDate2}$31#${record.orderNo || ''}$DY` + const qrCodeData = `10#${record.encodingPrint || record.materialCode || ''}$11#9DP$12#${record.batch || ''}$17#${record.count || ''}$20#${formattedDate2}$31#${record.orderNo || ''}$DY` // 生成二维码图片 const qrCodeImage = await generateQRCode(qrCodeData) @@ -227,7 +228,7 @@ const onPrint = async (record: FullWorkOrderResp) => { .label-row { display: flex; align-items: center; } .label-field { font-size: 8pt; font-weight: bold; margin-right: 2mm; min-width: 25pt; } .label-value { font-size: 8pt; font-weight: bold; flex: 1; } - .qr-code img { width: 20mm; height: 20mm; margin: 1mm 0; } + .qr-code img { width: 23mm; height: 23mm; margin: 1mm 0; } .mark-number { font-size: 8pt; font-weight: bold; margin-top: 1mm; text-align: center; } .serial-number { font-size: 8pt; font-weight: bold; margin-top: 1mm; } @@ -260,7 +261,7 @@ const onPrint = async (record: FullWorkOrderResp) => {
零件号
-
${record.materialCode || ''}
+
${record.encodingPrint || record.materialCode || ''}
diff --git a/src/views/material/MaterialInfoAddModal.vue b/src/views/material/MaterialInfoAddModal.vue index 849068a..5fd01ad 100644 --- a/src/views/material/MaterialInfoAddModal.vue +++ b/src/views/material/MaterialInfoAddModal.vue @@ -59,6 +59,13 @@ const columns: ColumnItem[] = reactive([ span: 24, required: true, }, + { + label: '打印编码(国产替代)', + field: 'encodingPrint', + type: 'input', + span: 24, + required: true, + }, { label: '物料单位重量(g)', field: 'unitWeight', diff --git a/src/views/material/index.vue b/src/views/material/index.vue index 6342a9f..71ce2c5 100644 --- a/src/views/material/index.vue +++ b/src/views/material/index.vue @@ -20,6 +20,7 @@ - - -