Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1438,7 +1438,6 @@ public class DistributionStockupAppController extends BladeController {
 						entity.setOutboundType(stockupEntity.getTypeService());
 //						entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 //						entity.setStockupArea(stockupDTO.getStockupAllocationName());
-						distributionStockService.save(entity);
 //						//修改备货时间
 						distributionAsyncService.updateStockupStockListDate(stockupDTO);
 //								dataSourceTransactionManager.commit(transactionStatus);//提交
@@ -1469,7 +1468,9 @@ public class DistributionStockupAppController extends BladeController {
 							jsonObject.put("type", 2);
 							jsonObject.put("num", 1);
 							warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+							entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 						}
+						distributionStockService.save(entity);
 
 						//扫码成功
 						return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillLadingController.java

@@ -362,9 +362,15 @@ public class DistrilbutionBillLadingController extends BladeController {
 		return  distrilbutionBillLadingService.batchSign(distrilbutionBillLading);
 	}
 
-
-
-
+	/**
+	 * 查询自提单的包件ID列表
+	 */
+	@GetMapping("/getBillLadingPackageIds")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "查询自提单的包件ID列表", notes = "传入ids")
+	public R getBillLadingPackageIds( @RequestParam Long id,@RequestParam Long orderId) {
+		return  distrilbutionBillLadingService.getBillLadingPackageIds(id,orderId);
+	}
 
 	/**
 	 * 导出数据

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/IDistrilbutionBillLadingService.java

@@ -270,4 +270,11 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	 * @return
 	 */
 	DistributionBillLadingExcelDTO exportDistributionBillLadingDetail(Long id);
+
+	/**
+	 * 查询自提单的包件ID列表
+	 * @param id
+	 * @return
+	 */
+	R getBillLadingPackageIds(Long id,Long orderId);
 }

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

@@ -2384,32 +2384,34 @@ 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 {
+//				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();
 				//查询库存品签收件数

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

@@ -2623,8 +2623,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		stockEntity.setGoodsName(stockArticleEntity.getDescriptionGoods());
 		stockEntity.setMarketId(stockArticleEntity.getMallId());
 		stockEntity.setReservationCode(reservationEntity.getReservationCode());
-		stockEntity.setStockupArea(stockupDTO.getStockupAllocationName());
-//		stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 		if (Func.isNotEmpty(stockupDTO.getAllocationId())) {
 			log.info(method + "库位备货");
 			//查询库位零担
@@ -2692,7 +2690,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		} else {
 			log.info(method + "无库位无托盘备货");
 		}
-		distributionStockService.save(stockEntity);
 		if (!Func.isEmpty(stockupDTO.getStockupAllocationId())){
 			JSONObject jsonObject = new JSONObject();
 			jsonObject.put("warehouseId", myCurrentWarehouse.getId());
@@ -2702,7 +2699,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			jsonObject.put("num", stockupDTO.getNum());
 			//备货库位上架
 			warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+			stockEntity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 		}
+		distributionStockService.save(stockEntity);
 		return Resp.scanSuccess("备货成功", "本次成功备货" + stockupDTO.getNum() + "件");
 	}
 

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

@@ -1362,6 +1362,19 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return distributionBillLadingExcelDTO;
 	}
 
+	@Override
+	public R getBillLadingPackageIds(Long id,Long orderId) {
+		List<DistrilbutionBillPackageEntity> list = distrilbutionBillPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
+			.eq(DistrilbutionBillPackageEntity::getBillLadingId, id)
+			.eq(DistrilbutionBillPackageEntity::getStockArticleId, orderId)
+			.ne(DistrilbutionBillPackageEntity::getPacketBarStatus, "2")
+		);
+		if (list.isEmpty()) {
+			return null;
+		}
+		return R.data(list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()));
+	}
+
 	/**
 	 * 转换老系统的ID
 	 *