From 5d484d88ec57a6c3f9e5a7f0fb3411fd5e873fc9 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 7 Aug 2023 18:49:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A3=85=E8=BD=A6=E6=95=B0=E9=87=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/app/DistributionAppParcelListVO.java | 5 +++ .../DistributionDeliveryAppController.java | 4 +-- .../DistributionSignforAppController.java | 4 +-- .../mapper/DistributionDeliveryInfoMapper.xml | 23 +++++++----- .../DistributionDeliveryListMapper.java | 4 +-- .../mapper/DistributionDeliveryListMapper.xml | 23 ++++++++---- .../mapper/DistributionSigndetailMapper.java | 2 +- .../mapper/DistributionSigndetailMapper.xml | 35 +++++++++---------- .../mapper/DistributionSignforMapper.java | 2 +- .../mapper/DistributionSignforMapper.xml | 29 ++++++++------- .../IDistributionDeliveryListService.java | 2 +- .../service/IDistributionSignforService.java | 2 +- .../DistributionDeliveryInfoServiceImpl.java | 1 + .../DistributionDeliveryListServiceImpl.java | 20 +++++++++-- .../impl/DistributionSignforServiceImpl.java | 6 ++-- 15 files changed, 100 insertions(+), 62 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java index e08c97486..976a9ecc1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java @@ -50,6 +50,11 @@ public class DistributionAppParcelListVO extends DistributionParcelListEntity { */ @ApiModelProperty(value = "物品名称") private String materialName; + /** + * 包装号 + */ + @ApiModelProperty(value = "包装号") + private String packetBarCode; /** * 是否扫描 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java index 53a8c5cb3..ec74ffebc 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java @@ -115,8 +115,8 @@ public class DistributionDeliveryAppController { @GetMapping("/wrapIn") @ApiOperationSupport(order = 5) @ApiOperation(value = "查看配送明细", notes = "DistributionAppDeliveryListDTO") - public R> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) { - IPage page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO); + public R> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) { + IPage page = distributionDeliveryListService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO); return R.data(page); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index f2ee36c5e..b20d571e3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -101,8 +101,8 @@ public class DistributionSignforAppController { @GetMapping("/wrapIn") @ApiOperationSupport(order = 5) @ApiOperation(value = "查看签收库存品明细", notes = "DistributionAppDeliveryListDTO") - public R> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) { - IPage page = distributionSignforService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO); + public R> wrapIn(DistributionAppDeliveryListDTO distributionAppDeliveryListDTO, Query query) { + IPage page = distributionSignforService.selectDistributionAppDeliverywrapIn(Condition.getPage(query), distributionAppDeliveryListDTO); return R.data(page); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index 4997343ac..0c1ab262f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -150,9 +150,9 @@ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java index 874b5d1a8..27ed5281b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java @@ -231,11 +231,11 @@ public interface DistributionDeliveryListMapper extends BaseMapper selectListbypack(IPage page,@Param("param") DistributionAppDeliveryListDTO distributionAppDeliveryListDTO); /** - * 查询库存 + * 车次查询库存 * * @return */ - List selectListbyink(IPage page,Long id); + List selectListbyink(IPage page,Long id); /** * 签收完成数 * diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 8a9283fbd..81a1a9c6d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -797,14 +797,23 @@ join logpm_distribution_stock_article ldsa on ldsa.id =ldr.stock_article_id where lds.delivery_id = #{param.id} - + SELECT + distinct ldsl.id id, + ldsl.sku sku, + ldsl.cargo_number cargoNumber, + ldsl.description_goods descriptionGoods, + ldl.signfor_state signforState, + ldl.order_package_code coding, + lbm.specification specification, + lbm.logpm_unit logpmUnit FROM - logpm_distribution_signfor lds - JOIN logpm_distribution_stock ldsk on ldsk.reservation_id = lds.reservation_id - left join logpm_distribution_loadscaninvn ldls on ldsk.stock_list_id = ldls.inventory_id + logpm_distribution_signfor lds join + logpm_distribution_reservation ldr on lds.reservation_id =ldr.id + join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id + join logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id + LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id + left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id where lds.delivery_id = #{id} SELECT - ldsa.id id, + distinct ldsa.id id, ldr.service_number serviceNumber, + ldsa.order_code orderCode, lddl.train_number trainNumber, lddl.type type, - ldsa.order_code orderCode, ldsa.mall_name mallName, ldsa.warehouse warehouse, ldsa.brand brand, @@ -131,8 +131,8 @@ ldr.delivery_address deliveryAddress, lds.signing_time signingTime, lds.sjsigning_time sjsigningTime, - (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.id = ldrp.parce_list_id) materialName, - (SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldr.id = ldrpp.reservation_id) totalNumber, + (SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName, + (SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id =ldrs.reservation_id) totalNumber, (select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.signfor_state =2) signfornum FROM logpm_distribution_delivery_list lddl @@ -227,22 +227,21 @@ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java index df7c1ef00..35d5a4413 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.java @@ -154,7 +154,7 @@ public interface DistributionSignforMapper extends BaseMapper selectListbyink(IPage page, Long id); + List selectListbyink(IPage page, Long id); /** * 部分扫 * 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 d06edc923..7fc2d39d3 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 @@ -650,20 +650,23 @@ AND ldr.id = #{param.reservationId} - + SELECT + distinct ldsl.id id, + ldsl.sku sku, + ldsl.cargo_number cargoNumber, + ldsl.description_goods descriptionGoods, + ldl.signfor_state signforState, + ldl.order_package_code coding, + lbm.specification specification, + lbm.logpm_unit logpmUnit FROM - logpm_distribution_signfor lds - JOIN logpm_distribution_stock ldsk on ldsk.reservation_id = lds.reservation_id - left join logpm_distribution_loadscaninvn ldls on ldsk.stock_list_id = ldls.inventory_id - left join logpm_distribution_parcel_list ldpl on ldsk.parcel_list_id = ldpl.id - left join logpm_basicdata_material lbm on lbm.id = ldpl.material_id + logpm_distribution_signfor lds join + logpm_distribution_reservation ldr on lds.reservation_id =ldr.id + join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id + join logpm_distribution_stock_list ldsl on ldsl.id = ldrs.stocklist_id + LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id + left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id where lds.delivery_id = #{id}