From 897d73183fe5249374ca95702a7b518b87ed9a90 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 28 Oct 2024 15:12:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=B0=E4=BB=98=E4=BB=B7=E6=A0=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=BA=A6=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E5=AE=A1=E5=8D=95=E7=9A=84=E6=9D=A1=E4=BB=B6=203.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=B8=E8=BD=A6=E5=88=86=E6=8B=A3=E6=89=93?= =?UTF-8?q?=E6=89=98=E9=87=8C=E9=9D=A2=E7=9A=84=E8=AF=AD=E9=9F=B3=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=89=98=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/warehouse/vo/ExportWarehouseWaybillVO.java | 8 ++++---- .../mapper/DistributionStockArticleMapper.xml | 3 +++ .../warehouse/mapper/WarehouseWaybillMapper.xml | 8 ++++---- .../service/impl/WarehouseTrayTypeServiceImpl.java | 12 ++++++++++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java index dc73e0168..34c7512e5 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java @@ -125,16 +125,16 @@ public class ExportWarehouseWaybillVO implements Serializable { private String payWay; @ExcelProperty(value = "现付") - private BigDecimal xPay; + private BigDecimal nowPay; @ExcelProperty(value = "到付") - private BigDecimal dPay; + private BigDecimal arrivePay; @ExcelProperty(value = "回付") - private BigDecimal hPay; + private BigDecimal backPay; @ExcelProperty(value = "月结") - private BigDecimal yPay; + private BigDecimal mouthPay; @ExcelProperty(value = "三方操作费") private BigDecimal thirdOperationFee; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 941f51f08..ae3ef04db 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -758,8 +758,11 @@ ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status from logpm_distribution_stock_article ldsa LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id + LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no + LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id ldsa.order_status in ('10','20','30','70') + AND lww.check_status = 1 and ldsa.reservation_status in ('10','20') AND EXISTS ( SELECT 1 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index 221d80d08..04b414089 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -950,10 +950,10 @@ lww.remark remark, lww.pay_type payType, lww.pay_way payWay, - lww.x_pay xPay, - lww.d_pay dPay, - lww.h_pay hPay, - lww.y_pay yPay, + lww.x_pay nowPay, + lww.d_pay arrivePay, + lww.h_pay backPay, + lww.y_pay mouthPay, lww.service_type serviceType, IFNULL(lww.update_status,0) updateStatus, IFNULL(lww.check_status,0) checkStatus, diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index 37182b678..5b05aac6f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -1057,7 +1057,15 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl updownGoodsEntityQueryWrapper = new QueryWrapper<>(); @@ -1785,7 +1793,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl