Merge branch 'pre-production'

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionSignforClient.java

@@ -24,6 +24,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Map;
+
 /**
  * 签收管理 Feign接口类
  *
@@ -52,7 +54,7 @@ public interface IDistributionSignforClient {
 
 
 	@GetMapping(TOP+"push0ldSystemSignInfo")
-    void push0ldSystemSignInfo(@RequestParam("current") Long signingId);
+	Map<String ,Object> push0ldSystemSignInfo(@RequestParam("current") Long signingId);
 
 
 	/**
@@ -61,5 +63,5 @@ public interface IDistributionSignforClient {
 	 * @return
 	 */
 	@GetMapping(CLERKCHECKPUSHDATA)
-	Boolean clerkCheckPushData(@RequestParam("id") Long id);
+	Map<String,Object> clerkCheckPushData(@RequestParam("id") Long id);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOldSignPushClient.java

@@ -20,7 +20,7 @@ public interface IOldSignPushClient {
 	String API_PREFIX = "/client";
 
 	@PostMapping(API_PREFIX + "/pushOldSystemSignInfo")
-	Boolean pushOldSystemSignInfo(@RequestBody SignPushDataDTO signPushDataDTO);
+	Map<String,Object> pushOldSystemSignInfo(@RequestBody SignPushDataDTO signPushDataDTO);
 
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java

@@ -51,6 +51,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -98,8 +99,8 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 	 * @param signingId
 	 */
 	@Override
-	public void push0ldSystemSignInfo(Long signingId) {
-		distributionSignforService.push0ldSystemSignInfo(signingId);
+	public Map<String ,Object> push0ldSystemSignInfo(Long signingId) {
+	return 	distributionSignforService.push0ldSystemSignInfo(signingId);
 
 	}
 
@@ -109,7 +110,7 @@ public class DistributionSignforClient implements IDistributionSignforClient {
 	 * @return
 	 */
 	@Override
-	public Boolean clerkCheckPushData(Long id) {
+	public Map<String,Object> clerkCheckPushData(Long id) {
 
 		return distributionSignforService.clerkCheckPushData(id);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

@@ -64,8 +64,8 @@ public class ClerkCheckPushDataQueueHandler {
 				log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
 				return;
 			}
-			Boolean b = distributionSignforService.clerkCheckPushData(t);
-			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列 成功状态： {}",b);
+			Map<String,Object> map1= distributionSignforService.clerkCheckPushData(t);
+			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列 成功状态： {}",map1);
 		} catch (Exception e) {
 			log.error(">>>>> 推送老系统签收信息报错", e);
 		}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java

@@ -335,11 +335,11 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 * 推送老系统
 	 * @param signingId
 	 */
-    void push0ldSystemSignInfo(Long signingId);
+	Map<String ,Object> push0ldSystemSignInfo(Long signingId);
 
     SignforPageCountVO selectDistributionSignforPageCount( DistributionSignforVO distributionSignfor);
 
-	Boolean clerkCheckPushData(Long id);
+	Map<String,Object> clerkCheckPushData(Long id);
 
 	/**
 	 * 导出签收详情列表

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

@@ -910,13 +910,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		//统计客户装车数
 		Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda()
-			.eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId())
-			.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
+				.eq(DistributionLoadscanEntity::getReservationId, signforEntity.getReservationId())
+				.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
 			.intValue();
 
 		Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda()
-			.eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())
-			.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
+				.eq(DistributionLoadscaninvnEntity::getReservationId, signforEntity.getReservationId())
+				.ne(DistributionLoadscaninvnEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()))
 			.intValue();
 		signforEntity.setLoadedNumber(lad);
 		signforEntity.setLoadedinNumber(nad);
@@ -1592,13 +1592,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	 * @param signingId
 	 */
 	@Override
-	public void push0ldSystemSignInfo(Long signingId) {
+	public Map<String, Object> push0ldSystemSignInfo(Long signingId) {
 		try {
 			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列");
 			//得到审核的任务ＩＤ
 			if (ObjectUtil.isEmpty(signingId)) {
 				log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
-				return;
+				return null;
 			}
 
 			//得到签收对象
@@ -1608,20 +1608,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 			if (ObjectUtil.isEmpty(distributionSignforEntity)) {
 				log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
-				return;
+				return null;
 			}
 			//　得到配送计划
 			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
 			if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
 				log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
-				return;
+				return null;
 			}
 
 			// 得到配送客户
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
 			if (ObjectUtil.isEmpty(distributionReservationEntity)) {
 				log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
-				return;
+				return null;
 			}
 
 
@@ -1727,12 +1727,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 
 
-			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
+			Map<String, Object> map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
+			return map;
 		} catch (Exception e) {
 			log.error(">>>>> 推送老系统签收信息报错", e);
 		}
 
-
+		return null;
 	}
 
 
@@ -2466,7 +2467,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				signforExcel.setDeliveryStatusName(d.getSijiSigningStatus());
 				signforExcel.setExamineUserName(d.getExamineUserName());
 				signforExcel.setWarehouseName(d.getWarehouseName());
-				int unsigneds =d.getReservationNum() - d.getReceivedQuantity();
+				int unsigneds = d.getReservationNum() - d.getReceivedQuantity();
 				signforExcel.setUnsigneds(unsigneds);
 
 				a.add(signforExcel);
@@ -2514,7 +2515,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return R.fail(403, "仓库信息不能为空");
 		}
 		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distrilbutionloadingscanDTO.getDeliveryId());
-        //查询是否完成复核
+		//查询是否完成复核
 		DistributionSignforEntity signforEntity = this.getOne(Wrappers.<DistributionSignforEntity>query().lambda()
 			.eq(DistributionSignforEntity::getReservationId, distrilbutionloadingscanDTO.getReservationId())
 		);
@@ -2809,7 +2810,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return Resp.scanSuccessWithData("签收成功", str, orderPackageCodes);
 		} catch (Exception e) {
 			log.error(">>>>> 签收异常报错", e);
-			throw new CustomerException("签收异常报错"+e.getMessage());
+			throw new CustomerException("签收异常报错" + e.getMessage());
 		}
 	}
 
@@ -2981,7 +2982,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanService.updateById(distributionLoadscanEntity);
 						packageLockIds.add(distributionLoadscanEntity.getPackageId());
 						//缺少一个异步维护包件签收的方法
-	//				distributionAsyncService.changeOrderSignforStatus(collect.get(0));
+						//				distributionAsyncService.changeOrderSignforStatus(collect.get(0));
 						Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						//更新签收人
 						Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
@@ -3013,7 +3014,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							return Resp.scanFail("服务器正忙...", "服务器正忙");
 						}
 						//查询配送计划的计划司机
-						 distributionLoadscanEntity = new DistributionLoadscanEntity();
+						distributionLoadscanEntity = new DistributionLoadscanEntity();
 						if (StringUtils.isNotBlank(distributionDeliverySelfEntity.getDriverPhone())) {
 							distributionLoadscanEntity.setDriverPhone(distributionDeliverySelfEntity.getDriverPhone());
 						}
@@ -3071,7 +3072,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 						//更新签收人
 						Integer m = distributionSignforMapper.updateSignUser(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), AuthUtil.getUser());
-	//					包件解托下架
+						//					包件解托下架
 						content = "包件在" + myCurrentWarehouse.getName() + "由" + AuthUtil.getNickName() + "后台签收,装车方式:补录装车,配送车次号:" + deliveryListEntity.getTrainNumber() + "预约任务号:" + distributionReservationEntity.getReservationCode();
 						try {
 							trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), distributionLoadscanEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode(), deliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
@@ -3088,7 +3089,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//维护签收包件状态
 					distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), myCurrentWarehouse.getId());
 					//推送信息至工厂
-	//				distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(), nickName);
+					//				distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), distributionReservationEntity.getId(), distributionReservationEntity.getReservationCode(), myCurrentWarehouse.getName(), nickName);
 					sendNodeWorkDataBroadcast(parcelListEntity, distributionReservationEntity, distributionLoadscanEntity.getSigningTime(), myCurrentWarehouse);
 
 					//收集包件
@@ -3097,14 +3098,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					// 推送商家端
 
 					// 推送
-	//				try {
-	//					sendMessage(orderPackageCode, distributionReservationEntity.getReservationCode(),
-	//						deliveryListEntity.getTrainNumber(), deliveryListEntity.getVehicleName(), deliveryListEntity.getDriverName(),
-	//						AuthUtil.getUserName(), myCurrentWarehouse.getId(), AuthUtil.getTenantId());
-	//				} catch (Exception e) {
-	////				throw new RuntimeException(e);
-	//					log.error(">>>> 签收推送报错", e);
-	//				}
+					//				try {
+					//					sendMessage(orderPackageCode, distributionReservationEntity.getReservationCode(),
+					//						deliveryListEntity.getTrainNumber(), deliveryListEntity.getVehicleName(), deliveryListEntity.getDriverName(),
+					//						AuthUtil.getUserName(), myCurrentWarehouse.getId(), AuthUtil.getTenantId());
+					//				} catch (Exception e) {
+					////				throw new RuntimeException(e);
+					//					log.error(">>>> 签收推送报错", e);
+					//				}
 
 				} else {
 					//一个客户下出现重复包条码
@@ -3271,7 +3272,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (Func.isEmpty(distributionDeliveryListEntity)) {
 			return R.fail(403, "配送错误!!!");
 		}
-		if (distributionDeliveryListEntity.getKind().equals("2")){
+		if (distributionDeliveryListEntity.getKind().equals("2")) {
 			return Resp.scanFail("请调整配送计划", "请调整配送计划");
 		}
 		List<Long> packageLockIds = new ArrayList<>();
@@ -3390,7 +3391,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setIsAbnormalLoading(2);
 						distributionLoadscanEntity.setIsAbnormalSigning(2);
 						distributionLoadscanEntity.setAbnormalNote("异常签收");
-						loadscanEntity =distributionLoadscanEntity;
+						loadscanEntity = distributionLoadscanEntity;
 						log.info("异常签收>>>>>>>>>>>>>>>reservationId:{},deliveryId:{},orderPackageCode:{}", distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getOrderPackageCode());
 						//进行签收数量的修改
 						Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
@@ -3422,7 +3423,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getId().toString(), parcelListEntity.getWarehouseEntryTimeEnd());
 						aaa.add(trunklinePackageTrackLog);
 
-                    } else {
+					} else {
 						return Resp.scanFail("操作失败", "不属于该客户");
 					}
 
@@ -5272,8 +5273,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			loadingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 			signingPackageNum += parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
 			for (DistributionParcelListEntity parcelListEntity : parcelListEntityList) {
-				if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())){
-					log.info("司机一键签收   >>>>>包件已签收:{}",parcelListEntity.getOrderPackageCode());
+				if (OrderPackageStatusConstant.yiqianshou.getValue().equals(parcelListEntity.getOrderPackageStatus())) {
+					log.info("司机一键签收   >>>>>包件已签收:{}", parcelListEntity.getOrderPackageCode());
 					continue;
 				}
 				//查询是否进行装车
@@ -6097,8 +6098,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 							distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
 							distributionLoadscanEntity.setSigningUser(user.getNickName());
-							loadingNumber += distributionLoadscanEntity.getLoadedNub()+signforEntity.getLoadedNumber();
-							signingNumber += distributionLoadscanEntity.getReceivedQuantity()+signforEntity.getReceivedQuantity();
+							loadingNumber += distributionLoadscanEntity.getLoadedNub() + signforEntity.getLoadedNumber();
+							signingNumber += distributionLoadscanEntity.getReceivedQuantity() + signforEntity.getReceivedQuantity();
 							//进行签收数量的统计
 							distributionLoadscanService.updateById(distributionLoadscanEntity);
 							JSONObject jsonObject = new JSONObject();
@@ -6445,13 +6446,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	@Override
-	public Boolean clerkCheckPushData(Long id) {
+	public Map<String, Object> clerkCheckPushData(Long id) {
+		Map<String, Object> resultMap = new HashMap<>();
 		try {
 			log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 推送老系统签收队列");
 			//得到审核的任务ＩＤ
 			if (ObjectUtil.isEmpty(id)) {
 				log.info(">>>>>>>>>>>>> clerkCheckPushDataHandler 签收ID为空");
-				return false;
+				resultMap.put("result", false);
+				return resultMap;
 			}
 
 			//得到签收对象
@@ -6461,20 +6464,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 			if (ObjectUtil.isEmpty(distributionSignforEntity)) {
 				log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionSignforEntity {}", distributionSignforEntity);
-				return false;
+				resultMap.put("result", false);
+				return resultMap;
 			}
 			//　得到配送计划
 			DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distributionSignforEntity.getDeliveryId());
 			if (ObjectUtil.isEmpty(distributionDeliveryListEntity)) {
 				log.info(">>>>>>>>>>> clerkCheckPushDataHandler distributionDeliveryListEntity {}", distributionDeliveryListEntity);
-				return false;
+				resultMap.put("result", false);
+				return resultMap;
 			}
 
 			// 得到配送客户
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionSignforEntity.getReservationId());
 			if (ObjectUtil.isEmpty(distributionReservationEntity)) {
 				log.info(">>>>>>>>>>>> clerkCheckPushDataHandler distributionReservationEntity {}", distributionReservationEntity);
-				return false;
+				resultMap.put("result", false);
+				return resultMap;
 			}
 
 
@@ -6582,14 +6588,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 
 			log.info(">>>> clerkCheckPushData SignPushDataDTO :{}", delivery);
-			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
-			return b;
+			resultMap = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
+			return resultMap;
 		} catch (Exception e) {
 			log.error(">>>>> 推送老系统签收信息报错", e);
 		}
 
+		return resultMap;
 
-		return false;
 	}
 
 	@Override
@@ -6747,7 +6753,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		List<DistributionAddvaluePackageDTO> list = new ArrayList<>();
 		if (!addvaluePackageVOS.isEmpty()) {
-			addvaluePackageVOS.forEach(a->{
+			addvaluePackageVOS.forEach(a -> {
 				DistributionAddvaluePackageDTO dto = Func.copy(a, DistributionAddvaluePackageDTO.class);
 				list.add(dto);
 			});
@@ -6853,11 +6859,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					if (k.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.yizhuangche.getValue())
 						&& k.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
 						String content = "包件在" + warehouse.getName() + "由" + user.getNickName() + "完成复核,配送车次号:" + trainNumber + "预约任务号:" + reservationEntity.getReservationCode();
-						JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CLERK_REVIEW.getCode(),trainNumber,new Date());
+						JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CLERK_REVIEW.getCode(), trainNumber, new Date());
 						aaa.add(js);
 					} else {
 						String content = "包件在" + warehouse.getName() + "由" + user.getNickName() + "复核取消计划无操作包件,配送车次号:" + trainNumber + "预约任务号:" + reservationEntity.getReservationCode();
-						JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(),trainNumber,new Date());
+						JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), k.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode(), trainNumber, new Date());
 						aaa.add(js);
 					}
 				});
@@ -6927,8 +6933,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 
-
-
 	private JSONObject handleLogJSONObject(BasicdataWarehouseEntity warehouse, BladeUser user, String orderPackageCode, String content, Integer node, String trainNumber, Date warehouseEntryTimeEnd) {
 		JSONObject trunklinePackageTrackLog = new JSONObject();
 		trunklinePackageTrackLog.put("tenantId", user.getTenantId());
@@ -6951,6 +6955,4 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 
-
-
 }

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

@@ -109,6 +109,7 @@ import com.logpm.oldproject.dto.SignPushDataUnitDTO;
 import com.logpm.oldproject.feign.IOldSignPushClient;
 import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
 import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.log4j.Log4j2;
 import org.apache.logging.log4j.util.Strings;
 import org.jetbrains.annotations.NotNull;
@@ -1266,8 +1267,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			// 转换仓库ID
 //			modifyWarehouseId(delivery);
 
-			Boolean b = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
-			return b;
+			Map<String,Object> map = oldSystemDataPushClient.pushOldSystemSignInfo(delivery);
+			Boolean flag = (Boolean) map.get("result");
+			return flag;
 		} catch (Exception e) {
 			log.error(">>>>> 推送老系统自提签收信息报错", e);
 			return false;
@@ -3575,7 +3577,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				}
 				List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
 					.eq(DistributionBillLadingScanEntity::getBillLadingId, Long.parseLong(s))
-					.eq(DistributionBillLadingScanEntity::getMaterialType, "2")
 				);
 				if (ladingScanEntities.isEmpty()){
 					return R.fail("无签收数据!!");
@@ -3596,7 +3597,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 
 
 				if (Func.isNotEmpty(ladingScanEntities)) {
-					int sum = ladingScanEntities.stream().mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
+					int sum = ladingScanEntities.stream().filter(f->f.getMaterialType().equals("2")).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 //					if (sum == 0){
 //						//未进行任何签收扫描的操作这里需要进行拦截
 //						throw new ServiceException("无签收数据");

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java

@@ -26,11 +26,11 @@ public class SignPushClient implements IOldSignPushClient {
 	@Autowired
 	private   OldSystemProperties oldSystemProperties;
 	@Override
-	public Boolean pushOldSystemSignInfo(SignPushDataDTO signPushDataDTO) {
+	public Map<String,Object> pushOldSystemSignInfo(SignPushDataDTO signPushDataDTO) {
 
 		//todo  这里存在调用老系统的接口 将数据会写给老系统
 		int timeoutMilliseconds = 60000;
-
+		Map<String,Object> resultMap = new HashMap<>();
 		Boolean result =false;
 		log.info(">>>> pushOldSystemSignInfo 程序执行 start time: {}",System.currentTimeMillis());
 		String authCode = oldLogin(signPushDataDTO.getWarehouseId()+"");
@@ -41,21 +41,24 @@ public class SignPushClient implements IOldSignPushClient {
 
 		log.info(">>>> pushOldSystemSignInfo request url:{}  data:{}",url,data);
 		String body = HttpRequest.post(url).body(data).header("token", authCode).setConnectionTimeout(timeoutMilliseconds).execute().body();
+		log.info(">>>> pushOldSystemSignInfo body :{}",body);
 		if (StringUtil.isNotBlank(body)) {
 			JSONObject res = JSON.parseObject(body);
 			if ("200".equals(res.getString("code"))) {
 				result= true;
 			}else {
 				String msg = res.getString("msg");
+				resultMap.put("msg",msg);
 				log.info(">>>> pushOldSystemSignInfo response msg:{}",msg);
 				log.info(">>>> pushOldSystemSignInfo 推送配送ID signPushDataDTO ID:{}",signPushDataDTO.getId());
 			}
 		}
 		log.info(">>>> pushOldSystemSignInfo response url:{}  body:{}",url,body);
-
 		log.info(">>>> pushOldSystemSignInfo 程序执行 end  time : {} >>  return result :{} ",System.currentTimeMillis(),result);
+		resultMap.put("result",result);
+
 
-		return result;
+		return resultMap;
 	}
 
 	@Override

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -82,20 +82,22 @@ public class DistributionDatarepair {
 			Map<Long, List<DistributionParcelListEntity>> packageMap = deliveryParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getWarehouseId));
 			packageMap.forEach((k, v) -> {
 				String orderPackageCodes = v.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
-				stringBuffer.append("仓库:"+k).append("包件下架"+orderPackageCodes);;
-				Map<String,Object> map = new HashMap<>();
-				map.put("orderPackageCode",orderPackageCodes);
-				map.put("warehouseId",k);
+				stringBuffer.append("仓库:" + k).append("包件下架" + orderPackageCodes);
+				;
+				Map<String, Object> map = new HashMap<>();
+				map.put("orderPackageCode", orderPackageCodes);
+				map.put("warehouseId", k);
 				warehouseUpdownTypeClient.downDeliveryPackage(map);
 			});
 		}
-		log.info("执行包件下架操作>>>>>>>>>>>>>"+stringBuffer.toString());
+		log.info("执行包件下架操作>>>>>>>>>>>>>" + stringBuffer.toString());
 		return ReturnT.SUCCESS;
 	}
 
 
 	/**
 	 * 对已签收包件进行解托
+	 *
 	 * @return
 	 */
 	@XxlJob("downTrayOldPackage")
@@ -108,144 +110,156 @@ public class DistributionDatarepair {
 			Map<Long, List<DistributionParcelListEntity>> packageMap = deliveryParcelListEntities.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getWarehouseId));
 			packageMap.forEach((k, v) -> {
 				String orderPackageCodes = v.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));
-				stringBuffer.append("仓库:"+k).append("包件解托"+orderPackageCodes);;
-				warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes, k,"签收下架解托");
+				stringBuffer.append("仓库:" + k).append("包件解托" + orderPackageCodes);
+				;
+				warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes, k, "签收下架解托");
 			});
 		}
-		log.info("执行包件下架操作>>>>>>>>>>>>>"+stringBuffer.toString());
+		log.info("执行包件下架操作>>>>>>>>>>>>>" + stringBuffer.toString());
 		return ReturnT.SUCCESS;
 	}
 
 
 	/**
 	 * 维护配送状态
+	 *
 	 * @return
 	 */
 	@XxlJob("maintenanceDeliveryStatus")
 	public ReturnT<String> maintenanceDeliveryStatus(String params) {
 		//维护配送的状态
 		String method = "######################DistributionDatarepair.maintenanceDeliveryStatus";
-		log.info(method+"维护配送订单id:{}",params);
+		log.info(method + "维护配送订单id:{}", params);
 		deliveryListClient.maintenanceDeliveryInfo(params);
-		log.info(method+"维护配送订单结束");
+		log.info(method + "维护配送订单结束");
 		return ReturnT.SUCCESS;
 	}
 
 	/**
 	 * 维护预约单信息
+	 *
 	 * @return
 	 */
 	@XxlJob("maintenanceReservationInfo")
 	public ReturnT<String> maintenanceReservationInfo(String params) {
 		//维护配送的状态
 		String method = "######################DistributionDatarepair.maintenanceDeliveryStatus";
-		log.info(method+"维护配送订单id:{}",params);
+		log.info(method + "维护配送订单id:{}", params);
 		distributionReservationClient.maintenanceReservationInfo(params);
-		log.info(method+"维护配送订单结束");
+		log.info(method + "维护配送订单结束");
 		return ReturnT.SUCCESS;
 	}
 
 
 	/**
 	 * 维护指定取消预约信息
+	 *
 	 * @return
 	 */
 	@XxlJob("maintenanceCancelReservation")
 	public ReturnT<String> maintenanceCancelReservation(String params) {
 		//维护配送的状态
 		String method = "######################DistributionDatarepair.maintenanceDeliveryStatus";
-		log.info(method+"维护配送订单id:{}",params);
+		log.info(method + "维护配送订单id:{}", params);
 		distributionReservationClient.maintenanceCancelReservation(params);
-		log.info(method+"维护配送订单结束");
+		log.info(method + "维护配送订单结束");
 		return ReturnT.SUCCESS;
 	}
 
 
-
 	/**
 	 * 维护指定取消预约信息
+	 *
 	 * @return
 	 */
 	@XxlJob("maintenanceDeliveryInfo")
 	public ReturnT<String> maintenanceDeliveryInfo(String params) {
 		//维护配送的状态
 		String method = "######################DistributionDatarepair.maintenanceDeliveryStatus";
-		log.info(method+"维护配送订单id:{}",params);
+		log.info(method + "维护配送订单id:{}", params);
 		deliveryListClient.maintenanceDeliveryInfoByWarehouseId(params);
-		log.info(method+"维护配送订单结束");
+		log.info(method + "维护配送订单结束");
 		return ReturnT.SUCCESS;
 	}
 
 
-
-
 	/**
 	 * 推送老系统系统
+	 *
 	 * @return
 	 */
 	@XxlJob("pushNotification")
 	public ReturnT<String> pushNotification(String params) {
 		// 得到当前仓库所有的签收任务
 		Integer parmeId = null;
-		if(StringUtil.isNotBlank(params)){
+		if (StringUtil.isNotBlank(params)) {
 			parmeId = Integer.parseInt(params);
 		}
 		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllSignfor(parmeId);
 		for (JSONObject entries : allSignfor) {
 			Long id = entries.getLong("singnforId");
 
-			Boolean b = distributionSignforClient.clerkCheckPushData(id);
-			if(b!=null&&b){
+			Map<String, Object> map = distributionSignforClient.clerkCheckPushData(id);
+			Boolean b = (Boolean) map.get("result");
+			if (b != null && b) {
 				warehouseMappingDataMapper.updateClearSignforStatus(id, entries.getLong("warehouseId"), 1);
-				log.info(">>> 推送成功 {}",id);
-			}else{
-				log.error(">>> 推送失败 id="+id);
+				log.info(">>> 推送成功 {}", id);
+			} else {
+				String remarks = (String) map.get("msg");
+				//进行错误记录
+				warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks);
+				log.error(">>> 推送失败 id=" + id);
 			}
 		}
 		return ReturnT.SUCCESS;
 	}
 
 
-
 	/**
 	 * 推送单个   老系统系统
+	 *
 	 * @return
 	 */
 	@XxlJob("pushSingleNotification")
 	public ReturnT<String> pushSingleNotification(String params) {
-			Boolean b = distributionSignforClient.clerkCheckPushData(Long.parseLong(params));
-			if(b!=null&&b){
-				warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1);
-				log.info(">>> 推送成功 {}",Long.parseLong(params));
-			}else{
-				log.error(">>> 推送失败 id="+Long.parseLong(params));
-			}
+		Map<String, Object> map = distributionSignforClient.clerkCheckPushData(Long.parseLong(params));
+		Long id = Long.parseLong(params);
+		Boolean b = (Boolean) map.get("result");
+		if (b != null && b) {
+			warehouseMappingDataMapper.updateClearSignforStatusBysignforId(Long.parseLong(params), 1);
+			log.info(">>> 推送成功 {}", Long.parseLong(params));
+		} else {
+			String remarks = (String) map.get("msg");
+			warehouseMappingDataMapper.updateClearSignforRemarks(id, remarks);
+			log.error(">>> 推送失败 id=" + Long.parseLong(params));
+		}
 		return ReturnT.SUCCESS;
 	}
 
 	/**
 	 * 推送自提签收老系统系统
+	 *
 	 * @return
 	 */
 	@XxlJob("pushBillNotification")
 	public ReturnT<String> pushBillNotification(String params) {
 		// 得到当前仓库所有的签收任务
 		Long parmeId = null;
-		if(StringUtil.isNotBlank(params)){
+		if (StringUtil.isNotBlank(params)) {
 			parmeId = Long.parseLong(params);
 		}
 		List<JSONObject> allSignfor = warehouseMappingDataMapper.findAllBillSign(parmeId);
 		for (JSONObject entries : allSignfor) {
 			try {
 				Long id = entries.getLong("billId");
-				Boolean b =distrilbutionBillLadingClient.clerkBillCheckPushData(id);
-				if(b!=null&&b){
+				Boolean b = distrilbutionBillLadingClient.clerkBillCheckPushData(id);
+				if (b != null && b) {
 					warehouseMappingDataMapper.updateClearBillSignforStatus(entries.getLong("id"), entries.getLong("warehouseId"), 1);
-					log.info(">>> pushBillNotification 成功 id={}",id);
-				}else{
-					log.error(">>> pushBillNotification 失败 id="+id);
+					log.info(">>> pushBillNotification 成功 id={}", id);
+				} else {
+					log.error(">>> pushBillNotification 失败 id=" + id);
 				}
-				Thread.sleep(1000*60);
+				Thread.sleep(1000 * 60);
 			} catch (InterruptedException e) {
 				throw new RuntimeException(e);
 			} finally {
@@ -257,22 +271,17 @@ public class DistributionDatarepair {
 	}
 
 
-
 	/**
 	 * 推送自提签收信息至工厂
+	 *
 	 * @return
 	 */
 	@XxlJob("sendFactorySignforInfo")
 	public ReturnT<String> sendFactorySignforInfo(String params) {
 		// 得到当前仓库所有的签收任务
-		Boolean b =distrilbutionBillLadingClient.sendFactorySignforInfo(params);
+		Boolean b = distrilbutionBillLadingClient.sendFactorySignforInfo(params);
 		return ReturnT.SUCCESS;
 	}
 
 
-
-
-
-
-
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java

@@ -123,5 +123,12 @@ public interface WarehouseMappingDataMapper {
 	List<StockAllocationInfoVO> findStockAllocationInfo();
 
 	void updateClearSignforStatusBysignforId(@Param("singnforId")Long singnforId,  @Param("dealStatus") Integer dealStatus);
+
+	/**
+	 * 修改备注
+	 * @param id
+	 * @param remarks
+	 */
+	void updateClearSignforRemarks(@Param("singnforId")Long id,@Param("remarks") String remarks);
 }
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -354,6 +354,11 @@
         set deal_status = #{dealStatus}
         where singnfor_id = #{singnforId}
     </update>
+    <update id="updateClearSignforRemarks">
+        update clear_singnfor_status_record
+        set  singnfor_id= #{singnforId}
+        where remarks = #{remarks}
+    </update>
 
     <select id="findPackageTraysInfo" resultType="com.logpm.patch.vo.PackageTrayInfoVO">
         select lwtg.association_value orderPackageCode,

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -196,7 +196,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 		trainCustomQuery(query, queryWrapper);
 		// 仓库权限
 		ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient);
-		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",5000L, ReportExcelUtil.SHEETDATANUM);
+		reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",2000L, ReportExcelUtil.SHEETDATANUM);
 	}
 
 	@Override