diff --git a/klp-ui/src/components/CoilSelector/index.vue b/klp-ui/src/components/CoilSelector/index.vue index 1185589e..de8560ed 100644 --- a/klp-ui/src/components/CoilSelector/index.vue +++ b/klp-ui/src/components/CoilSelector/index.vue @@ -105,6 +105,19 @@ +
+
+
+ 总卷数: + {{ totalCoils }} +
+
+ 总净重: + {{ totalNetWeight }}t +
+
+
+ @@ -130,8 +143,8 @@ @node-click="handleNodeClick" :expand-on-click-node="false" highlight-current class="warehouse-tree"> - + @@ -295,6 +308,17 @@ export default { } else { return this.selectedCoil ? new Set([this.selectedCoil.coilId]) : new Set(); } + }, + // 已选钢卷总数量 + totalCoils() { + return this.selectedCoils.length; + }, + // 已选钢卷总净重 + totalNetWeight() { + return this.selectedCoils.reduce((total, item) => { + const weight = parseFloat(item.netWeight) || 0; + return total + weight; + }, 0).toFixed(2); } }, watch: { @@ -363,7 +387,7 @@ export default { this.selectedNodeId = data.actualWarehouseId; this.getWarehouseList(data.actualWarehouseId); }, - // 获取树形数据 + // 获取树形数据 getWarehouseTree() { this.treeLoading = true; treeActualWarehouseTwoLevel() @@ -692,6 +716,31 @@ export default { text-align: right; } +// 已选钢卷统计信息样式 +.selected-stats { + .stats-content { + display: flex; + gap: 24px; + + .stat-item { + display: flex; + align-items: center; + gap: 8px; + + .stat-label { + color: #666; + font-size: 14px; + } + + .stat-value { + color: #333; + font-size: 16px; + font-weight: 600; + } + } + } +} + // 响应式调整 @media (max-width: 768px) { .selected-coil-info { diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue index b3b6548f..911383d7 100644 --- a/klp-ui/src/views/wms/delivery/waybill/index.vue +++ b/klp-ui/src/views/wms/delivery/waybill/index.vue @@ -20,6 +20,10 @@ + + + 搜索 重置 diff --git a/klp-ui/src/views/wms/report/zha/comprehensive.vue b/klp-ui/src/views/wms/report/zha/comprehensive.vue index 703bcd50..0e4e7a08 100644 --- a/klp-ui/src/views/wms/report/zha/comprehensive.vue +++ b/klp-ui/src/views/wms/report/zha/comprehensive.vue @@ -19,7 +19,7 @@ export default { return { actionTypes: [11, 120], actionQueryParams: { - updateBy: 'suanzhakuguan' + createBy: 'suanzhakuguan' }, baseQueryParams: { createBy: 'suanzhakuguan', diff --git a/klp-ui/src/views/wms/report/zha/day.vue b/klp-ui/src/views/wms/report/zha/day.vue index b5ff84e4..5ad1c7f3 100644 --- a/klp-ui/src/views/wms/report/zha/day.vue +++ b/klp-ui/src/views/wms/report/zha/day.vue @@ -19,7 +19,7 @@ export default { return { actionTypes: [11, 120], actionQueryParams: { - updateBy: 'suanzhakuguan' + createBy: 'suanzhakuguan' }, baseQueryParams: { createBy: 'suanzhakuguan', diff --git a/klp-ui/src/views/wms/report/zha/month.vue b/klp-ui/src/views/wms/report/zha/month.vue index fa448026..3f24bca6 100644 --- a/klp-ui/src/views/wms/report/zha/month.vue +++ b/klp-ui/src/views/wms/report/zha/month.vue @@ -19,7 +19,7 @@ export default { return { actionTypes: [11, 120], actionQueryParams: { - updateBy: 'suanzhakuguan' + createBy: 'suanzhakuguan' }, baseQueryParams: { createBy: 'suanzhakuguan', diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java index 3872acab..1dffc81d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java @@ -71,7 +71,7 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService qw.like(StringUtils.isNotBlank(bo.getWaybillName()), "wd.waybill_name", bo.getWaybillName()); qw.eq(bo.getPlanId() != null, "wd.plan_id", bo.getPlanId()); qw.eq(bo.getOrderId() != null, "wd.order_id", bo.getOrderId()); - qw.eq(StringUtils.isNotBlank(bo.getLicensePlate()), "wd.license_plate", bo.getLicensePlate()); + qw.like(StringUtils.isNotBlank(bo.getLicensePlate()), "wd.license_plate", bo.getLicensePlate()); qw.eq(StringUtils.isNotBlank(bo.getConsigneeUnit()), "wd.consignee_unit", bo.getConsigneeUnit()); qw.eq(StringUtils.isNotBlank(bo.getSenderUnit()), "wd.sender_unit", bo.getSenderUnit()); qw.eq(bo.getDeliveryTime() != null, "wd.delivery_time", bo.getDeliveryTime());