Merge remote-tracking branch 'origin/pre-production'

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/MerchantStatisticsController.java

@@ -181,7 +181,15 @@ public class MerchantStatisticsController {
 	public R<Boolean> calculateRealCost(@PathVariable("id") Long id) {
 		String method = "############calculateRealCost: ";
 		log.info(method + "请求参数{}", id);
-		return R.status(statisticsOrderInfoService.calculateRealCost(id));
+		try {
+			return R.status(statisticsOrderInfoService.calculateRealCost(id));
+		} catch (CustomerException e) {
+			log.error(e.message, e);
+			return R.fail(e.code, e.message);
+		} catch (Exception e) {
+			log.error(method + "系统异常", e);
+			return R.fail(500, "系统异常");
+		}
 	}
 
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

@@ -427,13 +427,13 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		StatisticsOrderInfoEntity orderInfoEntity = this.getOne(new QueryWrapper<StatisticsOrderInfoEntity>().lambda().eq(StatisticsOrderInfoEntity::getId, id));
 		if (ObjectUtil.isEmpty(orderInfoEntity)) {
 			log.warn("#############calculateRealCost: 订单信息不存在");
-			throw new CustomerException("订单信息不存在");
+			throw new CustomerException(405, "订单信息不存在");
 		}
 		Long brandId = orderInfoEntity.getBrandId();
 		Long consigneeId = orderInfoEntity.getConsigneeId();
 		if (!ObjectUtil.isAllNotEmpty(brandId, consigneeId)) {
 			log.warn("#############calculateRealCost: 品牌{} 收货单位{}", brandId, consigneeId);
-			throw new CustomerException("结算单信息不完整，缺少品牌和收货单位，请联系系统管理员。");
+			throw new CustomerException(405, "结算单信息不完整，缺少品牌和收货单位，请联系系统管理员。");
 		}
 		Date createTime = orderInfoEntity.getCreateTime();
 		// 根据 品牌 收货单位 开单时间 获取价格体系
@@ -444,14 +444,14 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 			.build());
 		if (ObjectUtil.isEmpty(price)) {
 			log.warn("#############calculateRealCost: 未维护价格，无法计算。");
-			throw new CustomerException("未维护价格，无法计算。");
+			throw new CustomerException(405, "未维护价格，无法计算。");
 		}
 		// 查询包件数据
 		List<StatisticsDistributionPackageEntity> distributionPackageEntities = distributionPackageService.list(new QueryWrapper<StatisticsDistributionPackageEntity>().lambda().eq(StatisticsDistributionPackageEntity::getOrderInfoId, id));
 		// 校验是否全部配送完成
 		if (distributionPackageEntities.stream().anyMatch(distributionPackageEntity -> distributionPackageEntity.getIsSign() == 0)) {
 			log.warn("#############calculateRealCost: 订单未全部配送完成，无法计算。");
-			throw new CustomerException("订单未全部配送完成，无法计算。");
+			throw new CustomerException(405, "订单未全部配送完成，无法计算。");
 		}
 		List<StatisticsWarehousePackageEntity> warehousePackageEntities = warehousePackageService.list(new QueryWrapper<StatisticsWarehousePackageEntity>().lambda().eq(StatisticsWarehousePackageEntity::getOrderInfoId, id));
 		PriceDispatchVO dispatch = price.getDispatch();
@@ -460,7 +460,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		BasicdataPriceTemplateEntity template = price.getTemplate();
 		if (ObjectUtil.isEmpty(template)) {
 			log.warn("#############calculateRealCost: 未维护模版，无法计算。");
-			throw new CustomerException("未维护模版，无法计算。");
+			throw new CustomerException(405, "未维护模版，无法计算。");
 		}
 		String serviceType = template.getServiceType();
 		Integer dispatchIsMinCost = template.getDispatchIsMinCost();

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -43,6 +43,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -198,6 +199,7 @@ public class InComingServiceImpl implements IInComingService {
 
 	@Transactional(rollbackFor = Exception.class)
 	public R incomingPackage(InComingDTO inComingDTO) {
+		AtomicReference<String> audio = new AtomicReference<>();
 		try{
 			String orderPackageCode = inComingDTO.getOrderPackageCode();//包件码
 			Long warehouseId = inComingDTO.getWarehouseId();//仓库id
@@ -235,6 +237,8 @@ public class InComingServiceImpl implements IInComingService {
 				}
 			}
 
+
+
 			//把advanceDetailEntityList通过packageStatus分组
 			Map<String, List<TrunklineAdvanceDetailEntity>> advanceDetailEntityMap = advanceDetailEntityList.stream().collect(Collectors.groupingBy(TrunklineAdvanceDetailEntity::getPackageStatus));
 
@@ -327,7 +331,11 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("trayCode", trayCode);
 									map.put("warehouseId", warehouseId);
 									map.put("orderPackageCode", packageCode);
-									warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
+									R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
+									Object data = r.getData();
+									if(!Objects.isNull(data)){
+										audio.set((String) data);
+									}
 								}
 							});
 						}
@@ -421,7 +429,11 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("trayCode", trayCode);
 									map.put("warehouseId", warehouseId);
 									map.put("orderPackageCode", packageCode);
-									warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+									R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
+									Object data = r.getData();
+									if(!Objects.isNull(data)){
+										audio.set((String) data);
+									}
 								}
 							});
 						}
@@ -469,6 +481,11 @@ public class InComingServiceImpl implements IInComingService {
 			throw e;
 		}
 
+		String a = audio.get();
+		if(StringUtil.isNotBlank(a)){
+			return Resp.scanSuccess("入库成功",a);
+		}
+
 		return R.success("入库成功");
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2290,12 +2290,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //			return R.fail(405, "包件已经装车");
 //		}
 
-		TrunklineCarsLoadScanEntity isExit = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndScanStatus(orderPackageCode, "1");
-		if (!Objects.isNull(isExit)) {
-			String loadCode = isExit.getLoadCode();
-			log.warn("##################loadingScan: 包件已经装车 orderPackageCode={}", orderPackageCode);
-			return R.fail(405, "包件已经装车到" + loadCode);
-		}
+//		TrunklineCarsLoadScanEntity isExit = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndScanStatus(orderPackageCode, "1");
+//		if (!Objects.isNull(isExit)) {
+//			String loadCode = isExit.getLoadCode();
+//			log.warn("##################loadingScan: 包件已经装车 orderPackageCode={}", orderPackageCode);
+//			return R.fail(405, "包件已经装车到" + loadCode);
+//		}
 
 		String audio = "";
 		String loadCode = carsLoadEntity.getCarsNo();
@@ -6293,13 +6293,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		//先判断包件是否在配载计划的装车扫描中
-		QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper = new QueryWrapper<>();
+ 		QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper = new QueryWrapper<>();
 		loadScanQueryWrapper.eq("load_id", loadId)
 			.eq("scan_code", orderPackageCode);
 		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
 		//判断是否有装车扫描记录
 		if (Objects.isNull(carsLoadScanEntity)) {
 			//没有装车扫码记录
+			//先判断是否在其他车次中
+//			QueryWrapper<TrunklineCarsLoadScanEntity> loadScanQueryWrapper = new QueryWrapper<>();
+//			loadScanQueryWrapper.eq("load_id", loadId)
+//				.eq("scan_code", orderPackageCode);
+//			carsLoadScanEntity = trunklineCarsLoadScanService.getOne(loadScanQueryWrapper);
+
 			//不在计划中，则查询在哪个仓库中
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByOrderPackageCodeAndStatus(orderPackageCode);
 			Long loadScanId = null;
@@ -7116,7 +7122,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//处理托盘的入库和货物的入库
 		trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId);
 
-		return R.success("卸车成功");
+		JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId,warehouseId);
+		Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum");
+		Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum");
+		StringBuilder audio = new StringBuilder();
+		audio.append("卸车").append(totalUnloadNum).append("件");
+		if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){
+			audio.append("异常卸车").append(abnormalUnloadNum).append("件");
+		}
+
+
+		return Resp.scanSuccess("卸车成功",audio.toString());
 	}
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -1277,7 +1277,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 		if(chuanFlag){
 			log.warn("#########orderScanOrderPackageCode: 不属于同一个"+msg+" 串货 filterValue={} orderPackageCode={}",filterValue,orderPackageCode);
-			return R.success("扫描成功");
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("audio","串货");
+			return R.data(jsonObject.toJSONString());
 		}else{
 			return R.success("扫描成功");
 		}