装车展示备货区域

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -573,10 +573,19 @@
 		AND ldrs.stock_article_status IN ( 1, 3 )
 	) ordNub,
 	COALESCE ( lds.received_quantity + lds.receivedin_quantity, 0 ) signNub,
-	ldsk.stockup_area stockupArea,
 	(SELECT SUM(reservation_num) FROM logpm_distribution_reservation_stocklist  WHERE reservation_id = ldr.id ) inventoryNub,
         IFNULL((SELECT SUM(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = lds.reservation_id AND is_abnormal_loading != 2 AND is_deleted = 0 ),0) + IFNULL((SELECT SUM(loaded_nub) FROM logpm_distribution_loadscaninvn WHERE reservation_id = lds.reservation_id AND scan_status != 1 AND is_deleted = 0 ),0) AS loadingNub,
-        IFNULL((SELECT SUM(stock_quantity) FROM logpm_distribution_stock WHERE reservation_id = lds.reservation_id AND is_deleted = 0 ),0) AS stockupNum
+        IFNULL((SELECT SUM(stock_quantity) FROM logpm_distribution_stock WHERE reservation_id = lds.reservation_id AND is_deleted = 0 ),0) AS stockupNum,
+        (SELECT
+        GROUP_CONCAT( DISTINCT lwga.qr_code ) stockupArea
+        FROM
+        logpm_distribution_signfor AS sign
+        LEFT JOIN logpm_distribution_stock AS lds ON lds.reservation_id = sign.reservation_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lds.stockup_area_id = lwga.id
+        WHERE
+        sign.reservation_id = ldr.id
+        GROUP BY
+        sign.delivery_id) AS stockupArea
 FROM
 	logpm_distribution_signfor lds
 	LEFT JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -1052,7 +1052,17 @@
         (select lds.reservation_id
         from logpm_distribution_signfor lds
         where lds.delivery_id = lddl.id ) and ldr.reservation_status != '40'
-        ) consignee
+        ) consignee,
+        (SELECT
+        GROUP_CONCAT( DISTINCT lwga.qr_code ) stockupArea
+        FROM
+        logpm_distribution_signfor AS sign
+        LEFT JOIN logpm_distribution_stock AS lds ON lds.reservation_id = sign.reservation_id
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lds.stockup_area_id = lwga.id
+        WHERE
+        sign.delivery_id = lddl.id
+        GROUP BY
+        sign.delivery_id) AS stockupArea
         FROM
         logpm_distribution_delivery_list lddl
         left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -2384,31 +2384,33 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			log.info(">>>>>>>>>>>>>>>>> distributionAppDeliveryListVOS 司机配送任务列表 {}", distributionAppDeliveryListVOS);
 			//转换字典字段
 			for (DistributionAppDeliveryListVO distributionAppDeliveryListVO : distributionAppDeliveryListVOS) {
-
 				distributionAppDeliveryListVO.setScannedNumber(getCarLaodNum(distributionAppDeliveryListVO.getId()));
 				// 调用下 查询装车件数的方法
 				//查询备货区
-				if (StringUtils.isNotBlank(distributionAppDeliveryListVO.getReservationId())) {
-					List<String> list = CommonUtil.stringNum(distributionAppDeliveryListVO.getReservationId());
-					QueryWrapper<DistributionStockupInfoEntity> queryWrapper = new QueryWrapper();
-
-					if (list.size() > 1) {
-						queryWrapper.in("reservation_id", list);
-					} else {
-						queryWrapper.eq("reservation_id", distributionAppDeliveryListVO.getReservationId());
-					}
-					List<DistributionStockupInfoEntity> list1 = distributionStockupInfoService.list(queryWrapper);
-					if (!list1.isEmpty()) {
-						DistributionStockupInfoEntity distributionStockupInfoEntity = list1.get(0);
-						DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectById(distributionStockupInfoEntity.getStockupId());
-						if (ObjectUtils.isNotNull(distributionStockupEntity)) {
-							distributionAppDeliveryListVO.setStockupArea(distributionStockupEntity.getStockupArea());
-						} else {
-							distributionAppDeliveryListVO.setStockupArea("无数据");
-						}
-					} else {
-						distributionAppDeliveryListVO.setStockupArea("无数据");
-					}
+//				if (StringUtils.isNotBlank(distributionAppDeliveryListVO.getReservationId())) {
+//					List<String> list = CommonUtil.stringNum(distributionAppDeliveryListVO.getReservationId());
+//					QueryWrapper<DistributionStockupInfoEntity> queryWrapper = new QueryWrapper();
+//
+//					if (list.size() > 1) {
+//						queryWrapper.in("reservation_id", list);
+//					} else {
+//						queryWrapper.eq("reservation_id", distributionAppDeliveryListVO.getReservationId());
+//					}
+//					List<DistributionStockupInfoEntity> list1 = distributionStockupInfoService.list(queryWrapper);
+//					if (!list1.isEmpty()) {
+//						DistributionStockupInfoEntity distributionStockupInfoEntity = list1.get(0);
+//						DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectById(distributionStockupInfoEntity.getStockupId());
+//						if (ObjectUtils.isNotNull(distributionStockupEntity)) {
+//							distributionAppDeliveryListVO.setStockupArea(distributionStockupEntity.getStockupArea());
+//						} else {
+//							distributionAppDeliveryListVO.setStockupArea("无数据");
+//						}
+//					} else {
+//						distributionAppDeliveryListVO.setStockupArea("无数据");
+//					}
+//				}
+				if (StringUtils.isBlank(distributionAppDeliveryListVO.getStockupArea())){
+					distributionAppDeliveryListVO.setStockupArea("无数据");
 				}
 				//查询包件签收件数
 				Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda().eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListVO.getId()).eq(DistributionLoadscanEntity::getSignforState, 2)).intValue();