diff --git a/src/i18n/locales/shipment/cnShipment.js b/src/i18n/locales/shipment/cnShipment.js
index e5a7c55..8bb45d3 100644
--- a/src/i18n/locales/shipment/cnShipment.js
+++ b/src/i18n/locales/shipment/cnShipment.js
@@ -176,6 +176,12 @@ export default {
inputInnerPackQty: '请输入内箱数量',
boxPackCount: '每箱内包数',
inputBoxPackCount: '请输入每箱内包数',
+ cartonWeight: '箱重',
+ inputCartonWeight: '请输入箱重',
+ netWeight: '净重',
+ inputNetWeight: '请输入净重',
+ productionDate: '生产日期',
+ selectProductionDate: '请选择生产日期',
printHint: '每张外箱标签数量 = 每箱内包数 × 内箱数量;外箱/内箱余数均单独成张标签',
calcResult: '计算结果(不可修改)',
outerBoxLabel: '外箱标签',
diff --git a/src/i18n/locales/shipment/enShipment.js b/src/i18n/locales/shipment/enShipment.js
index 44bf48c..7b5f3ee 100644
--- a/src/i18n/locales/shipment/enShipment.js
+++ b/src/i18n/locales/shipment/enShipment.js
@@ -175,6 +175,12 @@ export default {
inputInnerPackQty: 'Please enter inner-box qty',
boxPackCount: 'Inner packs per box',
inputBoxPackCount: 'Please enter inner packs per box',
+ cartonWeight: 'Carton weight',
+ inputCartonWeight: 'Please enter carton weight',
+ netWeight: 'Net weight',
+ inputNetWeight: 'Please enter net weight',
+ productionDate: 'Production date',
+ selectProductionDate: 'Please select production date',
printHint: 'Qty per outer-box label = inner packs per box × inner-box qty; remainders print as separate labels',
calcResult: 'Calculation result (read-only)',
outerBoxLabel: 'Outer-box label',
diff --git a/src/utils/printUtils.js b/src/utils/printUtils.js
index 2aa1f95..dd70d15 100644
--- a/src/utils/printUtils.js
+++ b/src/utils/printUtils.js
@@ -74,7 +74,8 @@ export class PrintService {
dpi: config.dpi,
userId: localStorage.getItem('userName'),
username: localStorage.getItem('userName'),
- site: this.vue.$store.state.user.site
+ site: this.vue.$store.state.user.site,
+ subSite: this.vue.$store.state.user.site
}
try {
diff --git a/src/views/modules/shipment/shipmentNotification.vue b/src/views/modules/shipment/shipmentNotification.vue
index b763fff..eaf9a8a 100644
--- a/src/views/modules/shipment/shipmentNotification.vue
+++ b/src/views/modules/shipment/shipmentNotification.vue
@@ -722,6 +722,24 @@
{{ $t('shipment.print.boxPackCount') }}
+
+ {{ $t('shipment.print.cartonWeight') }}
+
+
+
+ {{ $t('shipment.print.netWeight') }}
+
+
+
+ {{ $t('shipment.print.productionDate') }}
+
+
{{ $t('shipment.print.printHint') }}
@@ -2057,6 +2075,9 @@ export default {
outerTotal: '',
innerPackQty: '',
boxPackCount: '',
+ specialCartonWeight: '0',
+ specialNetWeight: '0',
+ specialProductionDate: '',
labelType: '外箱标签',
reportId: '',
printerName: '',
@@ -3456,6 +3477,9 @@ export default {
outerTotal: '',
innerPackQty: '',
boxPackCount: '',
+ specialCartonWeight: '0',
+ specialNetWeight: '0',
+ specialProductionDate: '',
labelType: '外箱标签',
reportId: '',
printerName: '',
@@ -3467,6 +3491,11 @@ export default {
return Math.round(Number(a) * Number(b) * precision) / precision
},
+ parsePrintWeight(value) {
+ const num = Number(value)
+ return Number.isFinite(num) ? num : 0
+ },
+
formatQtyValue(value) {
const num = Number(value)
if (Number.isNaN(num)) {
@@ -3524,6 +3553,10 @@ export default {
QTY: this.calculatedOuterQtyList.slice(),
// 与 QTY 一一对应:每个外箱对应的内包数,末箱不满则按实际包数
boxPackCount: this.calculatedOuterBoxPackCountList.slice(),
+ // 非数组字段由本次所有外箱标签共用,模板用 #{specialCartonWeight} 等替换
+ specialCartonWeight: this.parsePrintWeight(this.printForm.specialCartonWeight),
+ specialNetWeight: this.parsePrintWeight(this.printForm.specialNetWeight),
+ specialProductionDate: this.printForm.specialProductionDate || '',
}
if (row.inventoryPartNo) {
customFields.partNo = row.inventoryPartNo
diff --git a/src/views/modules/warehouse/ifsInventoryInit.vue b/src/views/modules/warehouse/ifsInventoryInit.vue
index e71b064..7050f22 100644
--- a/src/views/modules/warehouse/ifsInventoryInit.vue
+++ b/src/views/modules/warehouse/ifsInventoryInit.vue
@@ -813,7 +813,8 @@ export default {
dpi: this.dpi,
userId: localStorage.getItem('userName'),
username: localStorage.getItem('userName'),
- site: site,
+ site: localStorage.getItem('site'),
+ subSite: site,
unitId: unitId,
labelType: printLabelType
}
diff --git a/src/views/modules/warehouse/labelChangeForDaPanDian.vue b/src/views/modules/warehouse/labelChangeForDaPanDian.vue
index b2f86e1..88aa914 100644
--- a/src/views/modules/warehouse/labelChangeForDaPanDian.vue
+++ b/src/views/modules/warehouse/labelChangeForDaPanDian.vue
@@ -983,6 +983,7 @@ export default {
userId: localStorage.getItem('userName'),
username: localStorage.getItem('userName'),
site: localStorage.getItem('site'),
+ subSite: row.site,
unitId: row.unitId,
labelType:printLabelType
}
diff --git a/src/views/modules/warehouse/labelQuery.vue b/src/views/modules/warehouse/labelQuery.vue
index c45e887..91c62dd 100644
--- a/src/views/modules/warehouse/labelQuery.vue
+++ b/src/views/modules/warehouse/labelQuery.vue
@@ -766,7 +766,8 @@ export default {
dpi: this.dpi,
userId: localStorage.getItem('userName'),
username: localStorage.getItem('userName'),
- site: row.site,
+ site: localStorage.getItem('site'),
+ subSite: row.site,
unitId: row.unitId,
labelType:printLabelType
}