fix：代码优化

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockEntity.java

@@ -87,9 +87,9 @@ public class  DistributionStockEntity extends TenantEntity {
 	@ApiModelProperty(value = "包条码")
 	private String coding;
 	/**
-	 * 状态
+	 *  扫码类型 1包件 2库存品  3 订单零担
 	 */
-	@ApiModelProperty(value = "状态")
+	@ApiModelProperty(value = " 扫码类型 1包件 2库存品  3 订单零担")
 	private String conditions;
 	/**
 	 * 货物名称

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -1159,7 +1159,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 
 				// 假设有两个时间戳（秒数）
-				long timestamp1 = new Date().getTime() / 1000; // 现在时间
+				long timestamp1 = System.currentTimeMillis() / 1000; // 现在时间
 				long timestamp2 = i.getAssignTime().getTime() / 1000; // 修改时间
 
 				// 将时间戳转换为Instant对象
@@ -1555,7 +1555,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			List<User> userList = new ArrayList<>();
 			if (!listR.getData().isEmpty()) {
 				listR.getData().forEach(i -> {
-					long time = new Date().getTime() / 1000;
+					long time = System.currentTimeMillis() / 1000;
 					if (ObjectUtils.isNotNull(i.getDownTime())) {
 						long l = i.getDownTime().getTime() / 1000;
 						if (l > time) {

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataClientLogEntity;
-import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
 import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
 import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
 import com.logpm.basicdata.mapper.BasicdataTripartiteMallMapper;
@@ -34,6 +33,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -139,8 +139,8 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 	}
 
 	private Boolean judgeComparisonBasicdataTripartiteMall(BasicdataTripartiteMallEntity entity, BasicdataTripartiteMallEntity basicdataTripartiteMall) {
-		String str1 = entity.getTripartiteCoding().isEmpty() ? "空" : entity.getTripartiteCoding();
+		String str1 = StringUtil.isBlank(entity.getTripartiteCoding()) ? "空" : entity.getTripartiteCoding();
-		String str2 = basicdataTripartiteMall.getTripartiteCoding().isEmpty() ? "空" : basicdataTripartiteMall.getTripartiteCoding();
+		String str2 = StringUtil.isBlank(basicdataTripartiteMall.getTripartiteCoding()) ? "空" : basicdataTripartiteMall.getTripartiteCoding();
 		String oldTripartiteMall = "[名称:" + entity.getTripartiteMall() + ",编码:" + str1 + ",品牌:" + entity.getBrandName() + "]";
 		String newTripartiteMall = "[名称:" + basicdataTripartiteMall.getTripartiteMall() + ",编码:" + str2 + ",品牌:" + basicdataTripartiteMall.getBrandName() + "]";
 

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

@@ -187,7 +187,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	public Boolean getInventorySelfPickup(Long id) {
 		DistributionStockEntity distributionStock = new DistributionStockEntity();
 		distributionStock.setId(id);
-		distributionStock.setConditions("3");
+		distributionStock.setOutboundType("3");
 		int i = distributionStockService.updateById(distributionStock);
 		return i > 0;
 	}

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

@@ -372,7 +372,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //	}
 
 	private int calculateWeiqianshouFromZeroPackage(Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
-		if (!zeroPackageMap.containsKey(d.getReservationId())) return 0;
+		if (!zeroPackageMap.containsKey(d.getReservationId())){
+			return 0;
+		}
 		List<DistributionReservationZeroPackageEntity> entities = zeroPackageMap.get(d.getReservationId());
 		List<Long> zeroPackageIds = entities.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList());
 
@@ -406,7 +408,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //	}
 
 	private int calculateQianshouFromZeroPackage(Map<Long, List<DistributionReservationZeroPackageEntity>> zeroPackageMap, DistributionSignforVO d) {
-		if (!zeroPackageMap.containsKey(d.getReservationId())) return 0;
+		if (!zeroPackageMap.containsKey(d.getReservationId())){
+			return 0;
+		}
 		List<DistributionReservationZeroPackageEntity> entities = zeroPackageMap.get(d.getReservationId());
 		List<Long> zeroPackageIds = entities.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList());
 

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

@@ -635,7 +635,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 //			//没有新增
 //			 distributionStockListEntity = new DistributionStockListEntity();
 //			BeanUtils.copyProperties(list.get(0),distributionStockListEntity);
-//			distributionStockListEntity.setIncomingBatch("CB_"+new Date().getTime());
+//			distributionStockListEntity.setIncomingBatch("CB_"+System.currentTimeMillis());
 //			distributionStockListEntity.setPid(list.get(0).getId());
 //			distributionStockListEntity.setSku(distributionStockListDTO.getSku());
 //			distributionStockListEntity.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java

@@ -55,7 +55,7 @@ public class FactoryCommonController {
 			map.put("messageId", CommonUtil.getUUID());
 			map.put("logId", orderStatusLog.getId());
 			map.put("messageData", orderInfoDTO);
-			map.put("createTime", new Date().getTime());
+			map.put("createTime", System.currentTimeMillis());
 			map.put("flagType", "OrderStatusLog");
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.OPEN_ORDER_EXCHANGE, RabbitConstant.OPEN_ORDER_ROUTING, map, new CorrelationData(String.valueOf(orderStatusLog.getId())));
@@ -92,7 +92,7 @@ public class FactoryCommonController {
 			map.put("logId", orderStatusLog.getId());
 			map.put("type", "Push");
 			map.put("messageData", orderStatusDTO);
-			map.put("createTime", new Date().getTime());
+			map.put("createTime", System.currentTimeMillis());
 			map.put("flagType", "OrderStatusLog");
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.ORDER_STATUS_EXCHANGE, RabbitConstant.ORDER_STATUS_ROUTING, map);
@@ -136,7 +136,7 @@ public class FactoryCommonController {
 			map.put("messageId", CommonUtil.getUUID());
 			map.put("logId", orderStatusLog.getId());
 			map.put("messageData", receiveInfoDTO);
-			map.put("createTime", new Date().getTime());
+			map.put("createTime", System.currentTimeMillis());
 			map.put("flagType", "OrderStatusLog");
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.RECEIVE_INFO_EXCHANGE, RabbitConstant.RECEIVE_INFO_ROUTING, map);
@@ -178,7 +178,7 @@ public class FactoryCommonController {
 			map.put("messageId", CommonUtil.getUUID());
 			map.put("logId", orderStatusLog.getId());
 			map.put("messageData", receiveInfoDTO);
-			map.put("createTime", new Date().getTime());
+			map.put("createTime", System.currentTimeMillis());
 			map.put("flagType", "OrderStatusLog");
 
 			//将消息携带绑定键值
@@ -214,7 +214,7 @@ public class FactoryCommonController {
 			map.put("messageId", CommonUtil.getUUID());
 			map.put("logId", orderStatusLog.getId());
 			map.put("messageData", messageDTO);
-			map.put("createTime", new Date().getTime());
+			map.put("createTime", System.currentTimeMillis());
 			map.put("flagType", "OrderStatusLog");
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.SYNC_OLD_DATA_EXCHANGE, RabbitConstant.SYNC_OLD_DATA_ROUTING, map);

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryTokenServiceImpl.java

@@ -52,7 +52,7 @@ public class FactoryTokenServiceImpl extends BaseServiceImpl<FactoryTokenMapper,
 
 
 		Long expireTimeLong = factoryToken.getExpireTime().getTime();
-		Long now = new Date().getTime();
+		Long now = System.currentTimeMillis();
 		//判断是否过期
 		if(now > expireTimeLong){
 			logger.error("#########verifyToken: token验证不通过 已过期 token={}，corpId={}",token,corpId);

blade-service/logpm-factory/src/main/java/com/logpm/factory/feign/OldSystemWaybillClient.java

@@ -55,7 +55,7 @@ public class OldSystemWaybillClient implements IOldSystemWaybillClient{
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("logId", orderStatusLog.getId());
 		map.put("messageData", orderStatusDTO);
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		map.put("type", "DealWith");
 		rabbitTemplate.convertAndSend(RabbitConstant.DEAL_WITH_EXCHANGE, RabbitConstant.DEAL_WITH_ROUTING, map);
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/jp/jobhandler/TestJob.java

@@ -27,7 +27,7 @@ public class TestJob {
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("logId", CommonUtil.getUUID());
 		map.put("messageData", "body{[aaaaaaaaaaaaaaaaaaaa]}");
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		map.put("flagType", "OrderStatusLog");
 		log.info("###############TestData11111111111{}", CommonUtil.dateToStringGeneral(new Date()));
 		//将消息携带绑定键值

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -245,7 +245,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			String appsecret = mtFactoryProperties.getAppsecret();
 			String userid = mtFactoryProperties.getUserid();
 			String userpwd = mtFactoryProperties.getUserpwd();
-			long time = new Date().getTime();
+			long time = System.currentTimeMillis();
 
 			String sign = MD5Utils.md5Hex((appkey + appsecret + time).getBytes(StandardCharsets.UTF_8));
 			String pwd = MD5Utils.md5Hex(userpwd.getBytes(StandardCharsets.UTF_8));

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -207,7 +207,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("type", "Push");
 		map.put("messageData", jo.toJSONString());
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		try {
 			log.info(">>>############ 处理到新系统");
 			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map);
@@ -342,7 +342,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("type", "Push");
 		map.put("messageData", jo.toJSONString());
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		try {
 			log.info(">>>############ 处理到老系统");
 			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_OLD_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_OLD_RECEIVING_ROUTING, map);
@@ -833,7 +833,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("type", "Push");
 		map.put("messageData", opOrderStatusLogEntity);
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		try {
 			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_SIGN_EXCHANGE, RabbitConstant.OUPAI_SIGN_ROUTING, map);
 		} catch (Exception e) {
@@ -873,7 +873,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("type", "Push");
 		map.put("messageData", opOrderStatusLogEntity);
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		try {
 			rabbitTemplate.convertAndSend(RabbitConstant.OUPAI_RECEIVING_EXCHANGE, RabbitConstant.OUPAI_RECEIVING_ROUTING, map);
 		} catch (Exception e) {

blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java

@@ -397,7 +397,7 @@ public class TestService {
 		String appsecret = "HT20230822140820";
 		String userid = "5003";
 		String userpwd = "mt123456*";
-		long time = new Date().getTime();
+		long time = System.currentTimeMillis();
 
 		String sign = MD5Utils.md5Hex((appkey + appsecret + time).getBytes(StandardCharsets.UTF_8));
 		String pwd = MD5Utils.md5Hex(userpwd.getBytes(StandardCharsets.UTF_8));

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -202,7 +202,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 				map.put("locationId", locationId);
 				map.put("warehouseId", newWarehouseId);
 				map.put("type", type);
-				map.put("createTime", new Date().getTime());
+				map.put("createTime", System.currentTimeMillis());
 				map.put("flagType", "OrderStatusLog");
 				//将消息携带绑定键值
 				rabbitTemplate.convertAndSend(RabbitConstant.SYNC_OLD_UPDOWN_DATA_EXCHANGE, RabbitConstant.SYNC_OLD_UPDOWN_DATA_ROUTING, map, new CorrelationData(String.valueOf(orderLocationId)));

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java

@@ -103,7 +103,7 @@ public class WaybillCheckListener {
 
 		StatisticsPackageFeeInfoVO trunklinePackageFeeVO = statisticsOrderInfoService.findPackageListByOrderIds(orderInfoIdsList);
 
-		String balanceOrderCode = "JSD"+new Date().getTime();
+		String balanceOrderCode = "JSD"+System.currentTimeMillis();
 
 		BigDecimal freightPrice = trunklinePackageFeeVO.getFreightPrice();
 		BigDecimal pickupPrice = trunklinePackageFeeVO.getPickupPrice();

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

@@ -247,7 +247,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		BigDecimal totalFeeAddAfter = freightPrice.add(pickupPrice).add(deliveryServiceFee).add(warehouseServiceFee).add(changesFee).add(aftersalesFee);
 
 
-		String balanceOrderNo = "JSD"+new Date().getTime();
+		String balanceOrderNo = "JSD"+System.currentTimeMillis();
 
 		StatisticsBalanceOrderInfoEntity statisticsBalanceOrderInfoEntity = new StatisticsBalanceOrderInfoEntity();
 		statisticsBalanceOrderInfoEntity.setBalanceOrderNo(balanceOrderNo);
@@ -476,7 +476,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		Long destinationWarehouseId = statisticsOrderInfoEntity.getDestinationWarehouseId();
 		String destinationWarehouseName = statisticsOrderInfoEntity.getDestinationWarehouseName();
 
-		String reconciliationOrdeCode = "DZD"+new Date().getTime();
+		String reconciliationOrdeCode = "DZD"+System.currentTimeMillis();
 
 		StatisticsReconciliationOrderInfoEntity reconciliationOrder = new StatisticsReconciliationOrderInfoEntity();
 		reconciliationOrder.setReconciliationOrderNo(reconciliationOrdeCode);

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

@@ -90,13 +90,13 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void saveLog(TrunklineCarsLoadEntity carsLoadEntity, TrunklineCarsLoadLineEntity carsLoadLineEntity, int cardLoadType,String nickName,Long userId) {
+	public void saveLog(TrunklineCarsLoadEntity carsLoadEntity, TrunklineCarsLoadLineEntity carsLoadLineEntity, int cardLoadType, String nickName, Long userId) {
 		String nodeName = null;
 		Integer planLoadingNumber = null;
 		Integer realLoadingNumber = null;
 		Date startDate = null;
 		Long nodeId = null;
-		if(!Objects.isNull(carsLoadLineEntity)){
+		if (!Objects.isNull(carsLoadLineEntity)) {
 			nodeName = carsLoadLineEntity.getNodeName();
 			planLoadingNumber = carsLoadLineEntity.getPlanLoadingNumber();
 			realLoadingNumber = carsLoadLineEntity.getRealLoadingNumber();
@@ -124,74 +124,74 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		carsLoadLogEntity.setTenantId(TenantNum.HUITONGCODE);
 		carsLoadLogEntity.setAbstText(CarsLoadLogTypeConstant.getName(cardLoadType));
 		String content = "";
-		switch (cardLoadType){
+		switch (cardLoadType) {
 			case 0:
-				content = "【"+nodeName+"】取消配载计划，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】取消配载计划，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile;
+					"，司机手机号：" + driverMobile;
 				break;
 			case 1:
-				content = "【"+nodeName+"】创建配载计划，路线："+carsLineName+"，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】创建配载计划，路线：" + carsLineName + "，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile;
+					"，司机手机号：" + driverMobile;
 				break;
 			case 2:
-				content = "【"+nodeName+"】修改配载计划，路线："+carsLineName+"，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】修改配载计划，路线：" + carsLineName + "，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile;
+					"，司机手机号：" + driverMobile;
 				break;
 			case 3:
-				content = "【"+nodeName+"】始发仓装车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】始发仓装车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，计划发货："+planLoadingNumber+"，实际装车："+realLoadingNumber+"，装车时间："+ now;
+					"，司机手机号：" + driverMobile + "，计划发货：" + planLoadingNumber + "，实际装车：" + realLoadingNumber + "，装车时间：" + now;
 				break;
 			case 4:
-				content = "【"+nodeName+"】始发仓发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】始发仓发车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，计划发货："+planLoadingNumber+"，实际装车："+realLoadingNumber+"，发车时间："+ CommonUtil.dateToString(startDate);
+					"，司机手机号：" + driverMobile + "，计划发货：" + planLoadingNumber + "，实际装车：" + realLoadingNumber + "，发车时间：" + CommonUtil.dateToString(startDate);
 				break;
 			case 5:
-				content = "【"+nodeName+"】始发仓取消发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】始发仓取消发车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，取消时间："+ now;
+					"，司机手机号：" + driverMobile + "，取消时间：" + now;
 				break;
 			case 6:
-				content = "【"+nodeName+"】网点到车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点到车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点到车时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点到车时间：" + now;
 				break;
 			case 7:
-				content = "【"+nodeName+"】网点取消到车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点取消到车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点取消到车时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点取消到车时间：" + now;
 				break;
 			case 8:
-				content = "【"+nodeName+"】网点卸车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点卸车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点卸车时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点卸车时间：" + now;
 				break;
 			case 9:
-				content = "【"+nodeName+"】网点修改配载，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点修改配载，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点修改配载时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点修改配载时间：" + now;
 				break;
 			case 10:
-				content = "【"+nodeName+"】网点装车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点装车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点装车时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点装车时间：" + now;
 				break;
 			case 11:
-				content = "【"+nodeName+"】网点发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点发车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点发车时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点发车时间：" + now;
 				break;
 			case 12:
-				content = "【"+nodeName+"】网点取消发车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】网点取消发车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，网点取消发车时间："+ now;
+					"，司机手机号：" + driverMobile + "，网点取消发车时间：" + now;
 				break;
 			case 13:
-				content = "【"+nodeName+"】终点到达，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】终点到达，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，终点到达时间："+ now;
+					"，司机手机号：" + driverMobile + "，终点到达时间：" + now;
 				break;
 			case 14:
-				content = "【"+nodeName+"】终点取消到达，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】终点取消到达，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，终点取消到达时间："+ now;
+					"，司机手机号：" + driverMobile + "，终点取消到达时间：" + now;
 				break;
 			case 15:
-				content = "【"+nodeName+"】终点卸车，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】终点卸车，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile+"，终点卸车时间："+ now;
+					"，司机手机号：" + driverMobile + "，终点卸车时间：" + now;
 				break;
 			default:
-				content = "【"+nodeName+"】其他日志，车次号："+carsNo+"，车牌号："+carNumber+"，司机姓名："+driverName+
+				content = "【" + nodeName + "】其他日志，车次号：" + carsNo + "，车牌号：" + carNumber + "，司机姓名：" + driverName +
-					"，司机手机号："+driverMobile;
+					"，司机手机号：" + driverMobile;
 		}
 		carsLoadLogEntity.setContent(content);
 		carsLoadLogEntity.setType(cardLoadType);
@@ -202,9 +202,9 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 	@Override
 	public void saveCostShareRecord(Long loadId, TrunklineCarsLoadEntity carsLoadEntity, Long userId, String tenantId, String deptIds) {
 		Long deptId = null;
-		if(deptIds.contains(",")){
+		if (deptIds.contains(",")) {
 			String[] split = deptIds.split(",");
-			deptId = Long.parseLong(split[split.length-1]);
+			deptId = Long.parseLong(split[split.length - 1]);
 		}
 
 
@@ -225,8 +225,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
 
 			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			if(Objects.isNull(waybillEntity)){
+			if (Objects.isNull(waybillEntity)) {
-				log.warn("##############saveCostShareRecord: 运单信息不存在 waybillNo={}",waybillNo);
+				log.warn("##############saveCostShareRecord: 运单信息不存在 waybillNo={}", waybillNo);
 				continue;
 			}
 			Long waybillId = waybillEntity.getId();
@@ -237,11 +237,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 
 			TrunklineCostShareRecordEntity trunklineCostShareRecordEntity = null;
-			if(type.equals(1)){
+			if (type.equals(1)) {
-				trunklineCostShareRecordEntity = trunklineCostShareRecordService.findPackageDataByLoadIdAndCode(scanCode,loadId,tenantId);
+				trunklineCostShareRecordEntity = trunklineCostShareRecordService.findPackageDataByLoadIdAndCode(scanCode, loadId, tenantId);
 			}
 
-			if(Objects.isNull(trunklineCostShareRecordEntity)){
+			if (Objects.isNull(trunklineCostShareRecordEntity)) {
 				trunklineCostShareRecordEntity = new TrunklineCostShareRecordEntity();
 				trunklineCostShareRecordEntity.setTenantId(tenantId);
 				trunklineCostShareRecordEntity.setCreateUser(userId);
@@ -251,7 +251,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				trunklineCostShareRecordEntity.setCarsNo(carsLoadEntity.getCarsNo());
 				trunklineCostShareRecordEntity.setWaybillId(waybillId);
 				trunklineCostShareRecordEntity.setWaybillNo(waybillNo);
-				if(!Objects.isNull(stockArticleEntity)){
+				if (!Objects.isNull(stockArticleEntity)) {
 					trunklineCostShareRecordEntity.setOrderId(stockArticleEntity.getId());
 				}
 				trunklineCostShareRecordEntity.setOrderCode(orderCode);
@@ -262,7 +262,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				trunklineCostShareRecordEntity.setLoadingWarehouseName(warehouseName);
 				trunklineCostShareRecordEntity.setPlanUnloadWarehouseId(finalNodeId);
 				BasicdataWarehouseEntity finalWarehouse = warehouseClient.getEntityWarehouseId(finalNodeId);
-				if(!Objects.isNull(finalWarehouse)){
+				if (!Objects.isNull(finalWarehouse)) {
 					trunklineCostShareRecordEntity.setPlanUnloadWarehouseName(finalWarehouse.getName());
 				}
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(unloadNodeId);
@@ -273,7 +273,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				trunklineCostShareRecordEntity.setWaybillEndWarehouseName(destinationWarehouseName);
 				trunklineCostShareRecordService.save(trunklineCostShareRecordEntity);
 
-			}else{
+			} else {
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseId(scanEntity.getUnloadNodeId());
 				trunklineCostShareRecordEntity.setRealUnloadWarehouseName(scanEntity.getUnloadNodeName());
 				trunklineCostShareRecordService.updateById(trunklineCostShareRecordEntity);
@@ -285,25 +285,25 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void costShareByLoadId(Long loadId,TrunklineCarsLoadEntity carsLoadEntity) {
+	public void costShareByLoadId(Long loadId, TrunklineCarsLoadEntity carsLoadEntity) {
 
 		String proportion1 = DictBizCache.getValue(DictBizConstant.TRUNKLINE_COST_PROPORTION, "1");
 		String proportion2 = DictBizCache.getValue(DictBizConstant.TRUNKLINE_COST_PROPORTION, "2");
-		if(new BigDecimal(proportion1).add(new BigDecimal(proportion2)).compareTo(BigDecimal.ONE) != 0){
+		if (new BigDecimal(proportion1).add(new BigDecimal(proportion2)).compareTo(BigDecimal.ONE) != 0) {
 			log.warn("###############costShareZhang: 配置比例有误");
-			throw new CustomerException(405,"配置比例有误");
+			throw new CustomerException(405, "配置比例有误");
 		}
 
 		BigDecimal countTransportCost = carsLoadEntity.getCountTransportCost();
 		Integer totalUnloadNum = trunklineCostShareRecordService.findTotalUnloadNumByLoad(loadId);
 
-		if(totalUnloadNum.equals(0)){
+		if (totalUnloadNum.equals(0)) {
 			log.warn("###############costShareZhang: 分摊件数为0");
-			throw new CustomerException(405,"分摊件数为0");
+			throw new CustomerException(405, "分摊件数为0");
 		}
 
 		//计算单件成本
-		BigDecimal costPiece = countTransportCost.divide(new BigDecimal(totalUnloadNum),2, RoundingMode.HALF_UP);
+		BigDecimal costPiece = countTransportCost.divide(new BigDecimal(totalUnloadNum), 2, RoundingMode.HALF_UP);
 
 		//先查询出该车次的所有记录
 		List<TrunklineCostShareRecordEntity> list = trunklineCostShareRecordService.findListByLoadId(loadId);
@@ -321,28 +321,28 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			//收入
 			String waybillNo = trunklineCostShareRecordEntity.getWaybillNo();
 			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			if(!Objects.isNull(waybillEntity)){
+			if (!Objects.isNull(waybillEntity)) {
 				BigDecimal totalFreight = waybillEntity.getTotalFreight();//运单运费
-				if(waybillStartWarehouseId.equals(loadingWarehouseId)){
+				if (waybillStartWarehouseId.equals(loadingWarehouseId)) {
 					//装车仓库 就是 运单起始仓
-					if(realUnloadWarehouseId.equals(waybillEndWarehouseId)){
+					if (realUnloadWarehouseId.equals(waybillEndWarehouseId)) {
 						//卸车仓库 就是 运单目的仓
 						totalFreight = totalFreight.multiply(BigDecimal.ONE);//运费收入就是100%
-					}else{
+					} else {
 						//卸车仓库 不是 运单目的仓
 						totalFreight = totalFreight.multiply(new BigDecimal(proportion1));//运费收入就是80%
 					}
-				}else{
+				} else {
 					totalFreight = totalFreight.multiply(new BigDecimal(proportion2));//运费收入就是20%
 				}
 
 				Integer totalCount = waybillEntity.getTotalCount();//总件数
-				BigDecimal xincome = totalFreight.divide(new BigDecimal(totalCount),2, RoundingMode.HALF_DOWN);
+				BigDecimal xincome = totalFreight.divide(new BigDecimal(totalCount), 2, RoundingMode.HALF_DOWN);
 				BigDecimal income = xincome.multiply(new BigDecimal(num));
 				trunklineCostShareRecordEntity.setIncome(income);
 				totalIncome = totalIncome.add(income);
 
-				trunklineCostShareRecordEntity.setProportion(proportion1+":"+proportion2);
+				trunklineCostShareRecordEntity.setProportion(proportion1 + ":" + proportion2);
 
 			}
 		}
@@ -350,7 +350,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		for (TrunklineCostShareRecordEntity trunklineCostShareRecordEntity : list) {
 			BigDecimal income = trunklineCostShareRecordEntity.getIncome();
-			trunklineCostShareRecordEntity.setCostZhang(countTransportCost.multiply(income.divide(totalIncome,8,RoundingMode.HALF_UP)));
+			trunklineCostShareRecordEntity.setCostZhang(countTransportCost.multiply(income.divide(totalIncome, 8, RoundingMode.HALF_UP)));
 		}
 
 		trunklineCostShareRecordService.updateBatchById(list);
@@ -371,13 +371,13 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void abnormalListStartCarByLoadIdAndWarehouseId(Long loadId, Long warehouseId,Long userId,Long deptId,String nickName,String tenantId,String warehouseName) {
+	public void abnormalListStartCarByLoadIdAndWarehouseId(Long loadId, Long warehouseId, Long userId, Long deptId, String nickName, String tenantId, String warehouseName) {
 
 		//先查询
-		List<TrunklineCarsLoadScanEntity> ls = trunklineCarsLoadScanService.abnormalListStartCarByLoadIdAndWarehouseId(loadId,warehouseId);
+		List<TrunklineCarsLoadScanEntity> ls = trunklineCarsLoadScanService.abnormalListStartCarByLoadIdAndWarehouseId(loadId, warehouseId);
 		for (TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity : ls) {
 			Integer isData = trunklineCarsLoadScanEntity.getIsData();
-			if(isData == 1){
+			if (isData == 1) {
 				String loadCode = trunklineCarsLoadScanEntity.getLoadCode();
 				String waybillNo = trunklineCarsLoadScanEntity.getWaybillNo();
 				String orderCode = trunklineCarsLoadScanEntity.getOrderCode();
@@ -416,7 +416,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 	@Override
 	public void abnormalListUnloadByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, Long loadScanId, String tenantId, Long userId, String nickName, Long deptId) {
 		TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.getById(loadScanId);
-		if(!Objects.isNull(carsLoadScanEntity)){
+		if (!Objects.isNull(carsLoadScanEntity)) {
 			String loadCode = carsLoadScanEntity.getLoadCode();
 			String waybillNo = carsLoadScanEntity.getWaybillNo();
 			String orderCode = carsLoadScanEntity.getOrderCode();
@@ -454,21 +454,21 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId,TrunklineCarsLoadLineEntity carsLoadLineEntity) {
+	public void abnormalListUnloadCheckByLoadIdAndWarehouseId(Long loadId, Long warehouseId, String warehouseName, String tenantId, Long userId, String nickName, Long deptId, TrunklineCarsLoadLineEntity carsLoadLineEntity) {
 
-		log.info("################abnormalListUnloadCheckByLoadIdAndWarehouseId: 卸车报告生成开始 loadId={}",loadId);
+		log.info("################abnormalListUnloadCheckByLoadIdAndWarehouseId: 卸车报告生成开始 loadId={}", loadId);
 
-		UnloadReportVO unloadReportVO = trunklineCarsLoadScanService.findUnloadReport(loadId,warehouseId);
+		UnloadReportVO unloadReportVO = trunklineCarsLoadScanService.findUnloadReport(loadId, warehouseId);
-		if(!Objects.isNull(carsLoadLineEntity)){
+		if (!Objects.isNull(carsLoadLineEntity)) {
 			carsLoadLineEntity.setUnloadReportStatus(1);
-			carsLoadLineEntity.setReportOne("本次装车件数 "+unloadReportVO.getLoadingNum()+" 件，实际卸车件数 "+unloadReportVO.getUnloadNum()+" 件，计划未卸车数量 "+(unloadReportVO.getNoUnloadNum()-unloadReportVO.getNoPlanNum())+" 件");
+			carsLoadLineEntity.setReportOne("本次装车件数 " + unloadReportVO.getLoadingNum() + " 件，实际卸车件数 " + unloadReportVO.getUnloadNum() + " 件，计划未卸车数量 " + (unloadReportVO.getNoUnloadNum() - unloadReportVO.getNoPlanNum()) + " 件");
-			carsLoadLineEntity.setReportTwo("无基础数据货物 "+unloadReportVO.getNoDataNum()+" 件、非计划内货物 "+unloadReportVO.getNoPlanNum()+" 件、手动确认入库 "+unloadReportVO.getManualNum()+" 件");
+			carsLoadLineEntity.setReportTwo("无基础数据货物 " + unloadReportVO.getNoDataNum() + " 件、非计划内货物 " + unloadReportVO.getNoPlanNum() + " 件、手动确认入库 " + unloadReportVO.getManualNum() + " 件");
 			trunklineCarsLoadLineService.updateById(carsLoadLineEntity);
 		}
 
 
 		List<AftersalesAbnormalRecordEntity> addList = new ArrayList<>();
-		List<TrunklineCarsLoadScanEntity> noUnloadList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoUnloadList(loadId,warehouseId);
+		List<TrunklineCarsLoadScanEntity> noUnloadList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoUnloadList(loadId, warehouseId);
 		for (TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity : noUnloadList) {
 			String loadCode = trunklineCarsLoadScanEntity.getLoadCode();
 			String waybillNo = trunklineCarsLoadScanEntity.getWaybillNo();
@@ -504,7 +504,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 //			abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
 		}
 
-		List<TrunklineCarsLoadScanEntity> noDataList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoDataList(loadId,warehouseId);
+		List<TrunklineCarsLoadScanEntity> noDataList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoDataList(loadId, warehouseId);
 		for (TrunklineCarsLoadScanEntity carsLoadScanEntity : noDataList) {
 			String loadCode = carsLoadScanEntity.getLoadCode();
 			String waybillNo = carsLoadScanEntity.getWaybillNo();
@@ -540,8 +540,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 //			abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
 		}
 
-		List<TrunklineCarsLoadScanEntity> abnormalZeroScanList = trunklineCarsLoadScanService.findAbnormalZeroScanList(loadId,warehouseId);
+		List<TrunklineCarsLoadScanEntity> abnormalZeroScanList = trunklineCarsLoadScanService.findAbnormalZeroScanList(loadId, warehouseId);
-		if(CollUtil.isNotEmpty(abnormalZeroScanList)){
+		if (CollUtil.isNotEmpty(abnormalZeroScanList)) {
 			abnormalZeroScanList.forEach(carsLoadScanEntity -> {
 				String loadCode = carsLoadScanEntity.getLoadCode();
 				String waybillNo = carsLoadScanEntity.getWaybillNo();
@@ -575,28 +575,29 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				abnormalRecordEntity.setUpUserName(nickName);
 				abnormalRecordEntity.setAbnormalStatus(0);
 				abnormalRecordEntity.setRemark("零担卸车数量异常");
-				if("3".equals(scanStatus)){
+				if ("3".equals(scanStatus)) {
 					abnormalRecordEntity.setAbnormalStatus(1);
 					abnormalRecordEntity.setRemark("零担签收未完成数量回退原仓");
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
-					if(!Objects.isNull(stockArticleEntity)){
+					if (!Objects.isNull(stockArticleEntity)) {
-						distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(),num-unloadNum);
+						distributionStockArticleClient.addHandQuantity(stockArticleEntity.getId(), num - unloadNum);
 						zeroDetailVOList.forEach(zeroDetailVO -> {
 							Long packageId = zeroDetailVO.getPackageId();
 							Integer loadingNum = zeroDetailVO.getLoadingNum();
 							Integer unloadNum1 = zeroDetailVO.getUnloadNum();
-							distributionParcelListClient.addZeroQuantity(packageId,loadingNum-unloadNum1);
+							distributionParcelListClient.addZeroQuantity(packageId, loadingNum - unloadNum1);
 						});
 					}
-					String content = warehouseName+"干线未签收卸车回库，总数/卸车数："+num+"/"+num+"，卸车时间"+ CommonUtil.dateToStringGeneral(new Date());;
+					String content = warehouseName + "干线未签收卸车回库，总数/卸车数：" + num + "/" + num + "，卸车时间" + CommonUtil.dateToStringGeneral(new Date());
-					openOrderAsyncService.saveLog(waybillId,waybillNo,"80","零担未签收回库",content,AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName);
+					;
+					openOrderAsyncService.saveLog(waybillId, waybillNo, "80", "零担未签收回库", content, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
 				}
 				abnormalRecordEntity.setSendOrderStatus(0);
 				abnormalRecordEntity.setUpTime(new Date());
 				abnormalRecordEntity.setAssociationId(scanId);
 				abnormalRecordEntity.setAssociationType(1);
 				abnormalRecordEntity.setIsZero(1);
-				abnormalRecordEntity.setNum(num-unloadNum);
+				abnormalRecordEntity.setNum(num - unloadNum);
 				addList.add(abnormalRecordEntity);
 			});
 		}
@@ -619,13 +620,13 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				abnormalRecordZeroDetailEntity.setPackageId(zeroDetailVO.getPackageId());
 				abnormalRecordZeroDetailEntity.setGoodsId(zeroDetailVO.getGoodsId());
 				abnormalRecordZeroDetailEntity.setGoodsName(zeroDetailVO.getGoodsName());
-				abnormalRecordZeroDetailEntity.setAbnormalNum(zeroDetailVO.getLoadingNum()-zeroDetailVO.getUnloadNum());
+				abnormalRecordZeroDetailEntity.setAbnormalNum(zeroDetailVO.getLoadingNum() - zeroDetailVO.getUnloadNum());
 				abnormalRecordZeroDetailEntity.setReturnNum(0);
 				abnormalRecordZeroDetailEntity.setIncomingNum(0);
 				abnormalRecordZeroDetailEntityList.add(abnormalRecordZeroDetailEntity);
 			});
 		});
-		if(CollUtil.isNotEmpty(abnormalRecordZeroDetailEntityList)){
+		if (CollUtil.isNotEmpty(abnormalRecordZeroDetailEntityList)) {
 			abnormalRecordZeroDetailClient.addAbnormalRecordZeroDetail(abnormalRecordZeroDetailEntityList);
 		}
 	}
@@ -634,23 +635,23 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 	@Override
 	public void dealwithAfterAbnormalPackage(String orderPackageCode, Long warehouseId, String warehouseName, String carsNo, Long userId, Long aLong, String nickName) {
 
-		List<AftersalesAbnormalRecordEntity> abnormalRecordEntities = abnormalRecordClient.findOrderPackageAndAbnormalStatus(orderPackageCode,"0");
+		List<AftersalesAbnormalRecordEntity> abnormalRecordEntities = abnormalRecordClient.findOrderPackageAndAbnormalStatus(orderPackageCode, "0");
 		//循环abnormalRecordEntities把abnormalStatus改为1
 		//如果send_order_status = 1 则修改工单记录
 		for (AftersalesAbnormalRecordEntity abnormalRecordEntity : abnormalRecordEntities) {
 			Integer sendOrderStatus = abnormalRecordEntity.getSendOrderStatus();
-			if(Objects.isNull(sendOrderStatus)){
+			if (Objects.isNull(sendOrderStatus)) {
 				continue;
 			}
 
-			if(sendOrderStatus == 1){
+			if (sendOrderStatus == 1) {
 				//修改对应工单记录
-				aftersalesWorkOrderClient.updateWorkOrderStatus(warehouseId,orderPackageCode,1);
+				aftersalesWorkOrderClient.updateWorkOrderStatus(warehouseId, orderPackageCode, 1);
 			}
 			abnormalRecordEntity.setAbnormalStatus(1);
 			abnormalRecordEntity.setDealUserId(userId);
 			abnormalRecordEntity.setDealUserName(nickName);
-			abnormalRecordEntity.setRemark("包件已在 "+warehouseName+" 车次号："+carsNo+" 中被卸车");
+			abnormalRecordEntity.setRemark("包件已在 " + warehouseName + " 车次号：" + carsNo + " 中被卸车");
 		}
 		abnormalRecordClient.updateList(abnormalRecordEntities);
 
@@ -688,8 +689,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		Long loadId = carsLoadEntity.getId();
 		QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("load_id", loadId)
-			.eq("warehouse_id",warehouseId)
+			.eq("warehouse_id", warehouseId)
-			.eq("scan_status","1");
+			.eq("scan_status", "1");
 		List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
 
 
@@ -712,8 +713,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		collect.keySet().forEach(type -> {
 			List<TrunklineCarsLoadScanEntity> list = collect.get(type);
-			if(CollUtil.isNotEmpty(list)){
+			if (CollUtil.isNotEmpty(list)) {
-				if(type.equals("1")){
+
+
+				if (new Integer(1).equals(type)) {
 					list.forEach(entity -> {
 						PackageData packageData = new PackageData();
 						packageData.setPackageCode(entity.getScanCode());
@@ -724,7 +727,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 						packageDataList.add(packageData);
 					});
 
-				}else if(type.equals("2")){
+				} else if (new Integer(2).equals(type)) {
 					//把list中所有id放入一个List集合
 					List<Long> carsLoadScanIds = list.stream().map(TrunklineCarsLoadScanEntity::getId).collect(Collectors.toList());
 					//把list转化成以id为key的Map
@@ -751,7 +754,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		});
 
-		json.put("details",packageDataList);
+		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
 		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
@@ -765,8 +768,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 		Long loadId = carsLoadEntity.getId();
 		QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("load_id", loadId)
-			.eq("warehouse_id",warehouseId)
+			.eq("warehouse_id", warehouseId)
-			.eq("scan_status","1");
+			.eq("scan_status", "1");
 		List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
 
 
@@ -789,8 +792,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		collect.keySet().forEach(type -> {
 			List<TrunklineCarsLoadScanEntity> list = collect.get(type);
-			if(CollUtil.isNotEmpty(list)){
+			if (CollUtil.isNotEmpty(list)) {
-				if(type.equals("1")){
+				if (type.equals(1)) {
 					list.forEach(entity -> {
 						PackageData packageData = new PackageData();
 						packageData.setPackageCode(entity.getScanCode());
@@ -801,7 +804,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 						packageDataList.add(packageData);
 					});
 
-				}else if(type.equals("2")){
+				} else if (type.equals(2)) {
 					//把list中所有id放入一个List集合
 					List<Long> carsLoadScanIds = list.stream().map(TrunklineCarsLoadScanEntity::getId).collect(Collectors.toList());
 					//把list转化成以id为key的Map
@@ -828,7 +831,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		});
 
-		json.put("details",packageDataList);
+		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
 		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
@@ -859,8 +862,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 		collect.keySet().forEach(type -> {
 			List<TrunklineCarsLoadScanEntity> list = collect.get(type);
-			if(CollUtil.isNotEmpty(list)){
+			if (CollUtil.isNotEmpty(list)) {
-				if(type.equals("1")){
+				if (type.equals(1)) {
 					list.forEach(entity -> {
 						PackageData packageData = new PackageData();
 						packageData.setPackageCode(entity.getScanCode());
@@ -871,7 +874,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 						packageDataList.add(packageData);
 					});
 
-				}else if(type.equals("2")){
+				} else if (type.equals(2)) {
 					//把list中所有id放入一个List集合
 					List<Long> carsLoadScanIds = list.stream().map(TrunklineCarsLoadScanEntity::getId).collect(Collectors.toList());
 					//把list转化成以id为key的Map
@@ -897,7 +900,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			}
 
 		});
-		json.put("details",packageDataList);
+		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
 		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
@@ -931,7 +934,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			packageDataList.add(packageData);
 		});
 
-		json.put("details",packageDataList);
+		json.put("details", packageDataList);
 
 		nodeFanoutMsg.setMain(json);
 
@@ -942,7 +945,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 
 	@LogpmAsync("asyncExecutor")
 	@Override
-	public void sendReportZeroPackageUnloadData(Long userId, String nickName, Long warehouseId, String warehouseName, List<TrunklineScanZeroDetailVO> sendList, TrunklineCarsLoadScanEntity carsLoadScanEntity,TrunklineCarsLoadEntity carsLoadEntity) {
+	public void sendReportZeroPackageUnloadData(Long userId, String nickName, Long warehouseId, String warehouseName, List<TrunklineScanZeroDetailVO> sendList, TrunklineCarsLoadScanEntity carsLoadScanEntity, TrunklineCarsLoadEntity carsLoadEntity) {
 
 		NodeFanoutMsg nodeFanoutMsg = new NodeFanoutMsg();
 		nodeFanoutMsg.setNode(WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE);
@@ -970,7 +973,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			packageDataList.add(packageData);
 		});
 
-		json.put("details",packageDataList);
+		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
 		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
@@ -1006,7 +1009,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			packageDataList.add(packageData);
 		});
 
-		json.put("details",packageDataList);
+		json.put("details", packageDataList);
 		nodeFanoutMsg.setMain(json);
 
 		FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();

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

@@ -483,7 +483,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				entryEntity.setReceiptDate(o.getReceiptDate());
 				//入库批次号
 //				if (ObjectUtils.isNull(o.getReceiptBatch())) {
-//					long time = new Date().getTime();
+//					long time = System.currentTimeMillis();
 //					BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 //					entryEntity.setReceiptBatch("RK" + myCurrentWarehouse.getWarehouseCode() + time);
 //				}