From 0727c4e008aabe31908da29706525236882ca19c Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 5 Dec 2023 23:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/app/DistributionAppStockArticleVO.java | 6 ++++++ .../distribution/mapper/DistributionSignforMapper.xml | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java index 73c6b3952..14847a3ba 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java @@ -119,6 +119,12 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit @ApiModelProperty(value = "单位") private String logpmUnit; + /** + * 包件码 + */ + @ApiModelProperty(value = "包件码") + private String orderPackageCode; + @ApiModelProperty(value = "订单包件集合") private List distributionAppParcelListVOS; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 8ff48b6a9..43865214b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -308,16 +308,16 @@ lddl.vehicle_name vehicleName, lddl.task_time taskTime, lddl.loading_time AS signLoadingDate, - lds.received_quantity receivedQuantity, + (lds.received_quantity+receivedin_quantity) receivedQuantity, lds.examine_user_id examineUserId, lds.examine_user_name examineUserName, ldr.delivery_phone deliveryPhone, ldr.reservation_code reservationCode, ldr.delivery_address deliveryAddress, lds.delivery_sign_pictures deliverySignPictures, - ldr.reservation_num reservationNum, + (ldr.reservation_num + ldr.reservation_stock_list_num) reservationNum, lds.driver_signing driverSigning, - lds.loaded_number loadedNumber, + (lds.loaded_number+lds.loadedin_number) loadedNumber, lds.create_time createTime, CASE WHEN lds.signing_status ='2' THEN '文员签收' WHEN lds.driver_signing ='2' THEN '司机签收' @@ -332,8 +332,8 @@ ELSE '待签收' END sijiSigningStatus, lds.signing_status, - ldr.reservation_num - lds.received_quantity unsigneds, - ldr.reservation_num - lds.loaded_number withoutScanning, + (ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.received_quantity+receivedin_quantity) unsigneds, + (ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.loaded_number+lds.loadedin_number) withoutScanning, lds.reservation_id reservationId, CASE lddl.kind WHEN '1' THEN (SELECT driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id AND ldds.is_deleted = 0 AND ldds.is_master = 2)