From b47a2f210d940eff8c7de4185305bc4e0184c590 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 17 十二月 2025 23:26:10 +0800
Subject: [PATCH] 新增空箱与回库功能，优化打印样式与逻辑printView1.vue**: 修复数据绑定拼写错误，优化打印逻辑与样式，调整二维码布局与大小。outboundOrder.js移除无用代码，清理gridBody` 和 `rowId`。 - **outPicking.vue**: 引入 `stationManager`，在 API 参数中增加 `station` 字段，优化样式。 - **ReturnToWarehouseDTO.cs**: 新增 DTO，支持 `palletCode`、`orderNo` 和 `station`。 - **IOutboundService.cs**: 定义 `EmptyBox` 和 `ReturnToWarehouse` 接口。 - **Dt_StockInfo_Hty.cs**: 修改继承关系，新增字段与导航属性。 - **OutboundService.cs**: 实现 `EmptyBox` 和 `ReturnToWarehouse` 方法，使用 `Mapster` 进行实体转换。 - **WIDESEA_OutboundService.csproj**: 引入 `Mapster` 依赖。 - **OutboundController.cs**: 新增 `EmptyBox` 和 `ReturnToWarehouse` 的 API 路由。
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
index 8ad79b4..d5e94f0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
@@ -17,7 +17,7 @@
</div>
<div class="column">
<span class="label">渚涘簲鍟嗙紪鐮�</span>
- <span class="value full-width">{{ item.supplierCode }}</span>
+ <span class="value full-width">{{ item.suplierCode }}</span>
</div>
</div>
@@ -28,36 +28,36 @@
</div>
<div class="column">
<span class="label">閲囪喘鍗曞彿</span>
- <span class="value full-width">{{ item.purchaseOrderNo }}</span>
+ <span class="value full-width">{{ item.pruchaseOrderNo }}</span>
</div>
</div>
<div class="row dual-column">
<div class="column">
<span class="label">瑙勬牸</span>
- <span class="value full-width">{{ item.specification }}</span>
+ <span class="value full-width">{{ item.materialSpec }}</span>
</div>
<div class="column">
<span class="label">鏁伴噺/鎬绘暟</span>
- <span class="value full-width">{{ item.quantityTotal }}</span>
+ <span class="value full-width">{{ item.quantity }}</span>
</div>
</div>
<div class="row dual-column">
<div class="column">
<span class="label">鎵瑰彿</span>
- <span class="value full-width">{{ item.batchNumber }}</span>
+ <span class="value full-width">{{ item.barcode }}</span>
</div>
<div class="column">
<span class="label">鎵规</span>
- <span class="value full-width">{{ item.batch }}</span>
+ <span class="value full-width">{{ item.batchNo }}</span>
</div>
</div>
<div class="row dual-column">
<div class="column">
<span class="label">鍘傚尯</span>
- <span class="value full-width">{{ item.factory }}</span>
+ <span class="value full-width">{{ item.factoryArea }}</span>
</div>
<div class="column">
<span class="label">鏃ユ湡</span>
@@ -87,7 +87,7 @@
</div>
<div class="column-preview">
<span class="label-preview">渚涘簲鍟嗙紪鐮�</span>
- <span class="value-preview full-width">{{ item.supplierCode }}</span>
+ <span class="value-preview full-width">{{ item.suplierCode }}</span>
</div>
</div>
@@ -98,36 +98,36 @@
</div>
<div class="column-preview">
<span class="label-preview">閲囪喘鍗曞彿</span>
- <span class="value-preview full-width">{{ item.purchaseOrderNo }}</span>
+ <span class="value-preview full-width">{{ item.pruchaseOrderNo }}</span>
</div>
</div>
<div class="row-preview dual-column">
<div class="column-preview">
<span class="label-preview">瑙勬牸</span>
- <span class="value-preview full-width">{{ item.specification }}</span>
+ <span class="value-preview full-width">{{ item.materialSpec }}</span>
</div>
<div class="column-preview">
<span class="label-preview">鏁伴噺/鎬绘暟</span>
- <span class="value-preview full-width">{{ item.quantityTotal }}</span>
+ <span class="value-preview full-width">{{ item.quantity }}</span>
</div>
</div>
<div class="row-preview dual-column">
<div class="column-preview">
<span class="label-preview">鎵瑰彿</span>
- <span class="value-preview full-width">{{ item.batchNumber }}</span>
+ <span class="value-preview full-width">{{ item.barcode }}</span>
</div>
<div class="column-preview">
<span class="label-preview">鎵规</span>
- <span class="value-preview full-width">{{ item.batch }}</span>
+ <span class="value-preview full-width">{{ item.batchNo }}</span>
</div>
</div>
<div class="row-preview dual-column">
<div class="column-preview">
<span class="label-preview">鍘傚尯</span>
- <span class="value-preview full-width">{{ item.factory }}</span>
+ <span class="value-preview full-width">{{ item.factoryArea }}</span>
</div>
<div class="column-preview">
<span class="label-preview">鏃ユ湡</span>
@@ -167,7 +167,7 @@
},
methods: {
generateQr(item) {
- return `${item.batchNumber}`
+ return `${item.barcode}`
},
open(rows) {
@@ -192,6 +192,7 @@
return
}
+
printWindow.document.write(`
<!DOCTYPE html>
<html>
@@ -235,27 +236,40 @@
margin: 0 !important;
padding: 0 !important;
}
-
- body {
+
+ html {
+ height: auto !important;
width: 80mm !important;
- height: 60mm !important;
margin: 0 !important;
padding: 0 !important;
background: white !important;
}
-
+
+ body {
+ height: auto !important;
+ width: 80mm !important;
+ margin: 0 !important;
+ padding: 0 !important;
+ background: white !important;
+ overflow: visible !important;
+ min-height: 0 !important;
+ max-height: none !important;
+ }
+
.print-page {
width: 80mm !important;
height: 60mm !important;
- page-break-after: always !important;
margin: 0 !important;
padding: 1mm !important;
display: block !important;
background: white !important;
+ page-break-inside: avoid !important;
+ position: relative !important;
+ page-break-after: always !important;
}
-
+
.print-page:last-child {
- page-break-after: avoid !important;
+ page-break-after: auto !important;
}
.material-card {
@@ -285,7 +299,6 @@
}
.content {
- height: calc(100% - 10mm) !important;
position: relative !important;
}
--
Gitblit v1.9.3