From c0d7e4b1094790c3775c0f369abb602c859d8500 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 2 Feb 2024 17:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=BB=B4=E6=8A=A4=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E3=80=81=E8=BD=A6=E6=AC=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionDeliveryListMapper.xml   |  2 ++
 .../mapper/DistrilbutionBillLadingMapper.xml    | 17 ++++++++++++++++-
 .../mapper/DistrilbutionBillStockMapper.xml     |  7 ++++---
 .../impl/DistributionSignforServiceImpl.java    |  1 -
 ...WarehouseUpdownStockupAreaApiController.java |  1 -
 .../IWarehouseUpdownStockupAreaService.java     |  2 +-
 .../WarehouseUpdownStockupAreaServiceImpl.java  | 11 +++++++++++
 7 files changed, 34 insertions(+), 7 deletions(-)

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 e1f5a6c4f..9fb6115de 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
@@ -273,6 +273,8 @@
         lddl.distribution_company ,
         lddl.delivery_status ,
         lddl.delivery_list_loading_status
+        ORDER BY
+        lddl.create_time DESC
 
     </select>
     <select id="selectdeliverOnevnopen" resultType="com.logpm.distribution.entity.DistributionLoadscaninvnEntity">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 7bda95f0d..d5ee6af23 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -56,7 +56,22 @@
         from  logpm_distribution_bill_lading_scan
         where bill_lading_id = dbl.id
         ) stopNum,
-        GROUP_CONCAT(DISTINCT dsa.order_code) orderCode
+        GROUP_CONCAT(DISTINCT dsa.order_code) orderCode,
+        (SELECT
+        GROUP_CONCAT(splice)
+        from
+        (
+        SELECT dbl2.id as id,
+        if(ldpl2.second=null or ldpl2.second='' ,'',CONCAT(ldpl2.second,'(',count(*),')') )
+        as splice from  logpm_distrilbution_bill_lading dbl2
+        LEFT JOIN logpm_distrilbution_bill_package dbp2 ON dbp2.bill_lading_id = dbl2.id AND dbp2.packet_bar_status IN ( 1, 3 )
+        LEFT JOIN logpm_distribution_parcel_list ldpl2 ON dbp2.parce_list_id = ldpl2.id
+        AND dbp2.tenant_id = '627683'
+        GROUP BY dbl2.pickup_batch,ldpl2.second
+        ) as aimdate
+        WHERE dbl.id=id
+        GROUP BY id
+        ) AS productInformation
         from logpm_distrilbution_bill_lading dbl
         LEFT JOIN logpm_distrilbution_bill_package dbp on dbp.bill_lading_id = dbl.id and dbp.packet_bar_status in (1,3)
         LEFT JOIN logpm_distribution_stock_article dsa on dbp.stock_article_id = dsa.id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
index 349ca8b9f..96e09f043 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml
@@ -135,12 +135,12 @@
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
         where  ldpl.stock_article_id = ldbs.stock_article_id) pallet ,
-        (select COALESCE(GROUP_CONCAT(DISTINCT lwug.allocation_title SEPARATOR ','), '')
+        (select COALESCE(GROUP_CONCAT(DISTINCT lwga.qr_code SEPARATOR ','), '')
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3'
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwug.allocation_id = lwga.id
         where ldpl.stock_article_id = ldbs.stock_article_id)  goodsAllocation,
         ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName
-
         from logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
         LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
@@ -156,10 +156,11 @@
         ldpl.order_package_code orderPackageCode,
         ldpl.warehouse,
         ldpl.firsts,
-        ldpl.SECOND,
+        ldpl.SECOND AS `second`,
         ldpl.third_product thirdProduct,
         ldpl.material_code materialCode,
         ldpl.material_name materialName,
+        ldpl.train_number trainNumber,
         ldpl.waybill_number waybillNumber,
         ldpl.send_warehouse_name sendWarehouseName,
         ldpl.order_code orderCode,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index d36eee7c8..26132137d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -795,7 +795,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public R searchNode(Integer searchType, String searchCode) {
 		List<DeliveryNodeVo> nodeVos = null;
-
 		switch (searchType) {
 			case 1:
 				//配送单查询
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java
index 28814e92b..9e99e4114 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java
@@ -106,7 +106,6 @@ public class WarehouseUpdownStockupAreaApiController {
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");
 		}
-
 	}
 
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java
index 21b65fbbd..3b022cd03 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java
@@ -61,7 +61,7 @@ public interface IWarehouseUpdownStockupAreaService extends BaseService<Warehous
 	/**
 	 * 备货库位扫描
 	 * @param allocationId
-	 * @param id
+	 * @param warehouseId
 	 * @return
 	 */
 	UpShelfAllocationVO upShelfScanAllocation(Long allocationId, Long warehouseId);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
index 612fd4376..93423564d 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java
@@ -303,6 +303,17 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 		upShelfAllocationVO.setShelfTitle(goodsShelfName);
 		upShelfAllocationVO.setAllocationId(allocationId);
 		upShelfAllocationVO.setAllocationTitle(goodsAllocationName);
+
+
+
+
+
+
+
+
+
+
+
 		return upShelfAllocationVO;
 	}
 }