Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0

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

blade-service/logpm-business/src/main/java/com/logpm/business/receiver/BusinessInOrderDataQueueHandler.java

@@ -49,23 +49,23 @@ public class BusinessInOrderDataQueueHandler {
 		String tenantId = o.getString("tenantId");
 
 		//验证参数是否为null或者空串
-		if (orderPackageCode == null || orderPackageCode.equals("")) {
+		if (orderPackageCode == null || orderPackageCode.isEmpty()) {
 			log.error("orderPackageCode is null");
 			return;
 		}
-		if (reservationCode == null || reservationCode.equals("")) {
+		if (reservationCode == null || reservationCode.isEmpty()) {
 			log.error("reservationCode is null");
 			return;
 		}
-		if (distrCarNumber == null || distrCarNumber.equals("")) {
+		if (distrCarNumber == null || distrCarNumber.isEmpty()) {
 			log.error("distrCarNumber is null");
 			return;
 		}
-		if (vehicleName == null || vehicleName.equals("")) {
+		if (vehicleName == null || vehicleName.isEmpty()) {
 			log.error("vehicleName is null");
 			return;
 		}
-		if (driverName == null || driverName.equals("")) {
+		if (driverName == null || driverName.isEmpty()) {
 			log.error("driverName is null");
 			return;
 		}

blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java

@@ -229,11 +229,15 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 				// 异常入库
 				if (1 == businessSanDTO.getInWarehouseException()) {
 					Resp a = handleExceptionalWarehourse(businessSanDTO, list, orderPackageCode, distrCarNumber);
-					if (a != null) return a;
+					if (a != null){
+						return a;
+					}
 				} else {
 					//正常入口
 					Resp scanFail = handleNormalWarehourse(businessSanDTO, orderPackageCode, list, distrCarNumber);
-					if (scanFail != null) return scanFail;
+					if (scanFail != null){
+						return scanFail;
+					}
 
 				}
 			} else if ("3".equals(businessSanDTO.getConditions())) {

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

@@ -173,7 +173,7 @@ public class DistributionSignforAppController {
 
 		try {
 			R r = distributionSignforService.signfor(distrilbutionloadingscanDTO);
-			long time = new Date().getTime();
+			long time = System.currentTimeMillis();
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if (Objects.isNull(myCurrentWarehouse)) {
 				log.warn("#############signfor:" + time + " 下架仓库信息为空  myCurrentWarehouse={}", myCurrentWarehouse);

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

@@ -467,7 +467,7 @@ public class DistributionDeliveryListController extends BladeController {
 
 		try{
 			R r	= distributionSignforService.signforPC(distrilbutionloadingscanDTO);
-			long time = new Date().getTime();
+			long time = System.currentTimeMillis();
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 			if(Objects.isNull(myCurrentWarehouse)){
 				log.warn("#############signforPC:"+time+" 仓库信息为空  myCurrentWarehouse={}",myCurrentWarehouse);

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

@@ -305,7 +305,7 @@ public class DistributionReservationController extends BladeController {
 	}
 
 	/**
-	 * 批量预约转配送任务
+	 * 商配创建
 	 */
 	@PostMapping("/deliveryBusinessTask")
 	@ApiOperationSupport(order = 7)

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

@@ -872,7 +872,7 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 	@Transactional
 	public R cancelSignAddValuePackage(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
 		List<DistributionAddvaluePackageDTO> packageEntityList = new ArrayList<>();
-		if (distributionAppAddvalueDTO.getAddvalueType().equals("2") || distributionAppAddvalueDTO.getAddvalueType().equals("6")) {
+		if ("2".equals(distributionAppAddvalueDTO.getAddvalueType()) || "6".equals(distributionAppAddvalueDTO.getAddvalueType())) {
 			//专车和超区进行全部包件查询
 			Map<String, Object> addValueDTO = new HashMap<>();
 			addValueDTO.put("reservationId", distributionAppAddvalueDTO.getReservationId().toString());

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

@@ -3183,7 +3183,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					Map<String, List<DistributionStockArticleEntity>> orderMap = orderList1.stream().collect(Collectors.groupingBy(DistributionStockArticleEntity::getBrand));
 					orderMap.forEach((k, v) -> {
 						try {
-							if (k.equals("梦天")) {
+							if ("梦天".equals(k)) {
 								MtReceiveDTO mtReceiveDTO = new MtReceiveDTO();
 
 								//目前处理梦天
@@ -3239,7 +3239,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 							}
 
 
-							if (k.equals("欧派")) {
+							if ("欧派".equals(k)) {
 								//查询此订单所有签收信息
 								List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
 
@@ -3262,7 +3262,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 							}
 
-							if (k.equals("皮阿诺")) {
+							if ("皮阿诺".equals(k)) {
 
 								List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
 
@@ -3289,7 +3289,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 								}
 							}
 
-							if (k.equals("我乐")) {
+							if ("我乐".equals(k)) {
 								List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
 
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
@@ -3319,7 +3319,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 							}
 
 
-							if (k.equals("志邦")) {
+							if ("志邦".equals(k)) {
 								List<DistributionStockArticleEntity> orderList3 = orderMap.get(k);
 
 								List<DistributionBillLadingScanEntity> ladingScanEntities = distributionBillLadingScanMapper.selectList(Wrappers.<DistributionBillLadingScanEntity>query().lambda()

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

@@ -3675,7 +3675,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionTaskVO.setId(distributionDeliveryListEntity.getId());
 		distributionTaskVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 		String kindName = distributionDeliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF) ? "自主配送" : "三方配送";
-		String typeName = distributionDeliveryListEntity.getType().equals("2") ? "市配" : "商配";
+		String typeName = Objects.equals(distributionDeliveryListEntity.getType(), "2") ? "市配" : "商配";
 		distributionTaskVO.setKind(kindName);
 		distributionTaskVO.setType(typeName);
 		distributionTaskVO.setDistributionCompany(distributionDeliveryListEntity.getDistributionCompany());
@@ -4701,7 +4701,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			return Resp.scanFail("该车次已发车！", "该车次已发车!");
 		}
 		Boolean isDriverFlag = judgeIsDriver(user);
-		if (distributionDeliveryListEntity.getKind().equals("1")){
+		if (Objects.equals(distributionDeliveryListEntity.getKind(), "1")){
 			if (!isDriverFlag) {
 				return Resp.scanFail("当前操作人必须是司机！", "当前操作人必须是司机!");
 			}

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

@@ -2302,6 +2302,9 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			//运单客户收货单位
 			HashSet<String> consignee = new HashSet<>();
 			Map<String,List> map = new HashMap<>();
+			List<DistributionReservationPackageEntity> packageEntityList = new ArrayList<>();
+			List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = new ArrayList<>();
+
 			v.forEach(s -> {
 				List<Long> packageLockIds = new ArrayList<>();
 				DistributionStockArticleDTO stockArticleDTO = Func.copy(s, DistributionStockArticleDTO.class);
@@ -2349,7 +2352,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				DistributionReservationStockarticleEntity reservationStockarticleEntity = new DistributionReservationStockarticleEntity();
 				AtomicInteger reservationOrderNum = new AtomicInteger();
 				if (s.getIsZero().equals(IsOrNoConstant.no.getValue())) {
-					List<DistributionReservationPackageEntity> packageEntityList = new ArrayList<>();
+
 					//存在勾选包件的操作
 					if (Func.isNotEmpty(s.getPackageListInfo())) {
 						List<DistributionParcelListDTO> packageListInfo = s.getPackageListInfo();
@@ -2411,15 +2414,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 
 						});
 					}
-					if (!packageEntityList.isEmpty()) {
-//						distributionReservationPackageService.saveBatch(packageEntityList);
-						map.put("1",packageEntityList);
-					}
+
 					//维护订单信息
 					distributionStockArticleService.maintenanceOrderInfo(s.getOrderCode(), myCurrentWarehouse.getId());
 				} else {
 //-----------------------------------------------------------2023-10-11--- 零担商配处理-----------------------------------------------------------------------
-					List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = new ArrayList<>();
 					List<DistributionParcelNumberVO> parcelNumberVOS = s.getParcelNumberVOS();
 					if (Func.isNotEmpty(parcelNumberVOS)) {
 						//进行了零担订单
@@ -2491,9 +2490,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 							log.error("###########################零担订单查询品类错误，订单ID:{}", s.getId());
 						}
 					}
-					if (!reservationZeroPackageEntityList.isEmpty()) {
-						map.put("2",reservationZeroPackageEntityList);
-					}
+
 				}
 				stockArticleDTO.setHandQuantity(s.getHandQuantity());
 				reservationStockarticleEntity.setReservationNum(reservationOrderNum.get());
@@ -2525,6 +2522,13 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					}
 				}
 			});
+			if (!packageEntityList.isEmpty()) {
+//						distributionReservationPackageService.saveBatch(packageEntityList);
+				map.put("1",packageEntityList);
+			}
+			if (!reservationZeroPackageEntityList.isEmpty()) {
+				map.put("2",reservationZeroPackageEntityList);
+			}
 			//维护备货任务
 			DistributionStockupInfoEntity stockupInfoEntity = new DistributionStockupInfoEntity();
 			stockupInfoEntity.setStockUpType(StockupTypeConstant.shangpei.getValue());

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

@@ -282,7 +282,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		if (ObjectUtils.isNotNull(distributionStockArticle.getWarehouseEntryTime())) {
 
 			long time1 = distributionStockArticle.getWarehouseEntryTime().getTime(); //入库
-			long time2 = new Date().getTime(); // 现在
+			long time2 = System.currentTimeMillis(); // 现在
 			int days = (int) ((time2 - time1) / (1000 * 60 * 60 * 24));
 			if (days == 0) {
 				days = 1;

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

@@ -460,7 +460,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				//生成新的库存品信息
 				DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 				BeanUtils.copyProperties(one, distributionStockListEntity);
-				distributionStockListEntity.setIncomingBatch("CB_" + new Date().getTime());
+				distributionStockListEntity.setIncomingBatch("CB_" + System.currentTimeMillis());
 				distributionStockListEntity.setPid(one.getId());
 				distributionStockListEntity.setCargoNumber(basicMaterialEntity.getProductCode());
 				distributionStockListEntity.setSku(distributionStockListDTO.getSku());

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

@@ -3854,7 +3854,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			//查询自提单是否完成扫描
 			Integer integer = this.selectBillLadingPlanNum(Long.parseLong(s));
 			if (Func.isNotEmpty(ladingScanEntities)) {
-				int sum = ladingScanEntities.stream().filter(f -> f.getMaterialType().equals("2")).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
+				int sum = ladingScanEntities.stream().filter(f -> "2".equals(f.getMaterialType())).mapToInt(DistributionBillLadingScanEntity::getQuantity).sum();
 //					if (sum == 0){
 //						//未进行任何签收扫描的操作这里需要进行拦截
 //						throw new ServiceException("无签收数据");

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDisStockListWrapper.java

@@ -1,9 +1,7 @@
 package com.logpm.distribution.wrapper;
 
 import com.logpm.distribution.entity.DisStockListDetailEntity;
-import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.vo.DisStockListDetailVO;
-import com.logpm.distribution.vo.DistributionStockListVO;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -27,7 +25,7 @@ public class DistributionDisStockListWrapper extends BaseEntityWrapper<DisStockL
 		DisStockListDetailVO disStockListDetailVO = Objects.requireNonNull(BeanUtil.copy(entity, DisStockListDetailVO.class));
 		disStockListDetailVO.setLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getStockLockingStatus()));
 		disStockListDetailVO.setLoadingStatusName(DictBizCache.getValue(DictBizConstant.ORDER_PACKAGE_LOADING_STATUS, entity.getStockLockingStatus()));
-		disStockListDetailVO.setSigningStatusName( entity.getStockSignfoStatus().equals("20")?"已签收":"待签收");
+		disStockListDetailVO.setSigningStatusName( "20".equals(entity.getStockSignfoStatus())?"已签收":"待签收");
 		disStockListDetailVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.RESERVATION_STOCKUP_STATUS,entity.getStockStatus()));
 
 		return disStockListDetailVO;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleNewWrapper.java

@@ -45,7 +45,7 @@ public class DistributionStockArticleNewWrapper extends BaseEntityWrapper<Distri
 		if (ObjectUtils.isNotNull(entity.getWarehouseEntryTime())) {
 
 			long time1 = entity.getWarehouseEntryTime().getTime(); //入库
-			long time2 = new Date().getTime(); // 现在
+			long time2 = System.currentTimeMillis(); // 现在
 			int days = (int) ((time2 - time1) / (1000 * 60 * 60 * 24));
 			if (days == 0) {
 				days = 1;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleWrapper.java

@@ -53,7 +53,7 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper<Distribut
 		if (ObjectUtils.isNotNull(entity.getWarehouseEntryTime())) {
 
 			long time1 = entity.getWarehouseEntryTime().getTime(); //入库
-			long time2 = new Date().getTime(); // 现在
+			long time2 = System.currentTimeMillis(); // 现在
 			int days = (int) ((time2 - time1) / (1000 * 60 * 60 * 24));
 			if (days == 0) {
 				days = 1;

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java

@@ -445,7 +445,7 @@ public class TripartiteTransferController {
 				return R.fail(400,"送货方式为空");
 			}
 
-			if(deliveryType.equals("2")){
+			if("2".equals(deliveryType)){
 				if(Objects.isNull(driverId)){
 					log.warn(method+"司机id为空 driverId={}",driverId);
 					return R.fail(400,"司机id为空");

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

@@ -663,7 +663,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 			map.put("messageId", CommonUtil.getUUID());
 			map.put("logId", msgId);
 			map.put("messageData", JSONUtil.toJsonStr(datum));
-			map.put("createTime", new Date().getTime());
+			map.put("createTime", System.currentTimeMillis());
 			map.put("flagType", "OrderStatusLog");
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(exchange, routing, map, new CorrelationData(msgId));

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

@@ -197,7 +197,7 @@ public class InComingServiceImpl implements IInComingService {
 
 
 
-
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R incomingPackage(InComingDTO inComingDTO) {
 		AtomicReference<String> audio = new AtomicReference<>();

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

@@ -1552,7 +1552,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 		InputStream inputStream = file.getInputStream();
 
-		long start = new Date().getTime();
+		long start = System.currentTimeMillis();
 
 		List<ImportCustomizedOuPaiDTO> importCustomizedOuPaiDTOS = EasyExcel.read(inputStream).head(ImportCustomizedOuPaiDTO.class).sheet(0).headRowNumber(1).doReadSync();
 
@@ -1814,7 +1814,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		}
 
-		long end = new Date().getTime();
+		long end = System.currentTimeMillis();
 
 		log.info("################本次耗时 " + (end - start) + "ms");
 

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

@@ -1306,10 +1306,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 									newStockArticleEntity.setOrderReceiveStatus("20");
 								}
 
-								if(reservationStatus.equals("30")){
+								if("30".equals(reservationStatus)){
 									newStockArticleEntity.setReservationStatus("20");
 								}
-								if(orderStatus.equals("80")){
+								if("80".equals(orderStatus)){
 									newStockArticleEntity.setOrderStatus("70");
 								}
 
@@ -1400,7 +1400,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Map<String, Object> map = new HashMap<>();
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("messageData", jsonObject);
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		map.put("flagType", "TrunklineUnloadConfirm");
 		rabbitTemplate.convertAndSend(RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_EXCHANGE, RabbitConstant.TRUNKLINE_UNLOAD_CONFIRM_ROUTING, map);
 
@@ -2397,12 +2397,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						Integer unloadNum = trunklineCarsLoadScanEntity.getUnloadNum();
 						String scanStatus = trunklineCarsLoadScanEntity.getScanStatus();
 						Long carsLoadScanId = trunklineCarsLoadScanEntity.getId();
-						if(unloadNum == num){
+						if(Objects.equals(unloadNum, num)){
 							orderPackageCodes.add(scanCode);
 						}else{
 							//未卸车包件
-							if(scanStatus.equals("1")){
-								if(deliveryType.equals("2")){
+							if("1".equals(scanStatus)){
+								if("2".equals(deliveryType)){
 									noUnloadOrderPackageCodes.add(scanCode);
 									noUnloadOrderPackageScanIds.add(carsLoadScanId);
 								}
@@ -2434,7 +2434,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 							List<TrunklineScanZeroDetailVO> zeroDetailVOS = zeroDetailVOMap.get(packageId);
 							Integer lNum = zeroDetailVOS.stream().mapToInt(t -> Objects.nonNull(t.getLoadingNum()) ? t.getLoadingNum() : 0).sum();
 							Integer uNum = zeroDetailVOS.stream().mapToInt(t -> Objects.nonNull(t.getUnloadNum()) ? t.getUnloadNum() : 0).sum();
-							if(uNum != lNum){
+							if(!uNum.equals(lNum)){
 								int diff = lNum - uNum;
 								distributionParcelListClient.addZeroQuantity(packageId, diff);
 								distributionParcelNumberClient.addHandleQuantity(packageId,diff);
@@ -6728,7 +6728,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			return R.fail(405, "配载计划最终节点信息不存在");
 		}
 		String unloadStatus = endLoadLineEntity.getUnloadStatus();
-		if (!unloadStatus.equals("2")) {
+		if (!"2".equals(unloadStatus)) {
 			log.warn("#################costShareByLoadId: 配载计划最终节点还未卸车确认 loadId={}", loadId);
 			return R.fail(405, "配载计划最终节点还未卸车确认");
 		}
@@ -6892,7 +6892,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					String orderCode = carsLoadScanEntity.getOrderCode();
 					Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
 					DistributionStockArticleEntity stockArticle = distributionStockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
-					if(unloadNum != num){
+					if(!Objects.equals(unloadNum, num)){
 						int diff = num - unloadNum;
 						distributionStockArticleClient.addHandQuantity(stockArticle.getId(), diff);
 					}
@@ -6995,7 +6995,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("logId", msgId);
 		map.put("messageData", jsonMsg);
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		map.put("flagType", "OrderStatusLog");
 		//将消息携带绑定键值
 		rabbitTemplate.convertAndSend(exchange, routing, map, new CorrelationData(msgId));
@@ -7063,7 +7063,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		map.put("messageId", CommonUtil.getUUID());
 		map.put("logId", msgId);
 		map.put("messageData", jsonMsg);
-		map.put("createTime", new Date().getTime());
+		map.put("createTime", System.currentTimeMillis());
 		map.put("flagType", "OrderStatusLog");
 		//将消息携带绑定键值
 		rabbitTemplate.convertAndSend(exchange, routing, map, new CorrelationData(msgId));
@@ -7090,7 +7090,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		List<LoadingDetailExportVO> loadingDetailExportVOS = trunklineCarsLoadScanService.loadingDetailExport(loadCarsDTO);
 
 		//把records中type等于2的id放入一个集合
-		List<Long> scanLoadIds = loadingDetailExportVOS.stream().filter(item -> item.getType().equals("零担")).map(LoadingDetailExportVO::getId).collect(Collectors.toList());
+		List<Long> scanLoadIds = loadingDetailExportVOS.stream().filter(item -> "零担".equals(item.getType())).map(LoadingDetailExportVO::getId).collect(Collectors.toList());
 		if(CollUtil.isNotEmpty(scanLoadIds)){
 			List<TrunklineScanZeroDetailVO> scanZeroDetailVOS = scanZeroDetailService.findListByCarsLoadScanIds(scanLoadIds);
 			//把scanZeroDetailVOS通过scanId进行分组
@@ -7391,7 +7391,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String loadStatus = trunklineCarsLoadVO.getLoadStatus();
 		trunklineCarsLoadVO.setLoadStatus(DictBizCache.getValue(DictBizConstant.CARS_LOAD_STATUS, loadStatus));
 		int i = realLoadingNumber - unloadNumber;
-		if(i < 0) i = 0;
+		if(i < 0) {
+			i = 0;
+		}
 		trunklineCarsLoadVO.setStockCarsNum(i);
 		trunklineCarsLoadVO.setLoadScanOrderList(loadScanOrderList);
 		trunklineCarsLoadVO.setZeroList(zeroList);

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

@@ -108,7 +108,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 			updateEntity.setId(waybillEntity.getId());
 			Integer signNum = waybillEntity.getSignNum();
 			if(signNum == 0){
-				if(totalCount == num){
+				if(Objects.equals(totalCount, num)){
 					if(packageStatus == 0){
 						updateEntity.setWaybillStatus("0");
 					}else if(packageStatus == 10){
@@ -134,7 +134,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 					}
 				}
 			}else{
-				if(signNum == totalCount){
+				if(signNum.equals(totalCount)){
 					updateEntity.setWaybillStatus("100");
 				}else{
 					updateEntity.setWaybillStatus("90");
@@ -146,7 +146,7 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 			updateEntity.setId(waybillEntity.getId());
 			Integer signNum = waybillEntity.getSignNum();
 			if(signNum != 0){
-				if(signNum == totalCount){
+				if(signNum.equals(totalCount)){
 					updateEntity.setWaybillStatus("100");
 				}else{
 					updateEntity.setWaybillStatus("90");
@@ -158,14 +158,14 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
 					if(stockNum == 0){
 						updateEntity.setWaybillStatus("40");
 					}else{
-						if(stockNum == totalCount){
+						if(stockNum.equals(totalCount)){
 							updateEntity.setWaybillStatus("20");
 						}else{
 							updateEntity.setWaybillStatus("30");
 						}
 					}
 				}else{
-					if(incomingNum == totalCount){
+					if(incomingNum.equals(totalCount)){
 						updateEntity.setWaybillStatus("60");
 					}else{
 						updateEntity.setWaybillStatus("50");

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java

@@ -1,13 +1,10 @@
 package com.logpm.warehouse.config.interceptor;
 
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.common.component.MockLoginService;
-import org.springblade.common.constant.LauncherConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
 import org.springblade.core.redis.cache.BladeRedis;
@@ -15,7 +12,6 @@ import org.springblade.core.redis.lock.LockType;
 import org.springblade.core.redis.lock.RedisLockClient;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ThreadLocalUtil;
-import org.springframework.core.env.Environment;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -25,8 +21,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java

@@ -78,7 +78,7 @@ public class OldSystemPushController {
 				map.put("messageId", CommonUtil.getUUID());
 				map.put("logId", warehouseLog.getId());
 				map.put("messageData",waybillDTO);
-				map.put("createTime",new Date().getTime());
+				map.put("createTime",System.currentTimeMillis());
 
 				//把推送数据推入队列
 				rabbitTemplate.convertAndSend(RabbitConstant.WAYBILL_DATA_EXCHANGE, RabbitConstant.WAYBILL_DATA_ROUTING, map);

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

@@ -770,6 +770,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				return contractQuestDetail(taskSearchDTO);
 			case 4: //托盘
 				return trayListInfo(taskSearchDTO);
+			default:
+				return R.fail("参数错误！！！");
 
 		}
 		return null;
@@ -1104,16 +1106,14 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		List<QuestContrastVO> list = baseMapper.selectContrastDataInfo(questDetailDTO.getQuestNum(), questDetailDTO);
 		//查询托盘名称
 		List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList();
-		list.stream().forEach(i -> {
+		list.forEach(i -> {
 			String[] split = i.getQuestStatus().split(",");
 			//盘点状态;0 待盘点 1. 已盘  2未盘点 3已排除
 			Integer yiPan = 0;
 			for (String s : split) {
-				switch (s) {
-					case "1":
+                if (s.equals("1")) {
                     yiPan += 1;
                     i.setQuestStatusName("部分盘点");
-						break;
                 }
 			}
 			if (ObjectUtils.isNotNull(i.getUpdateUser())) {
@@ -1250,14 +1250,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 				//已盘数量
 				AtomicReference<Integer> yi = new AtomicReference<>(0);
 				v.stream().forEach(i -> {
-					switch (i.getQuestStatus()) {
-						case 1:
+                    if (i.getQuestStatus() == 1) {
                         yi.updateAndGet(v1 -> v1 + 1);
                         q.setQuestStatusName("部分盘点");
                         User user = UserCache.getUser(i.getUpdateUser());
                         q.setUpdateUser(user.getAccount());
                         q.setUpdateTime(i.getUpdateTime());
-							break;
                     }
 					//库位
 					if (ObjectUtils.isNull(buffer) && ObjectUtils.isNotNull(i.getPositionCode())) {
@@ -1459,7 +1457,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			try {
 				long l = format.parse(i.getEndTime()).getTime() / 1000;
-				long l1 = new Date().getTime() / 1000;
+				long l1 = System.currentTimeMillis() / 1000;
 				if (l < l1) {
 					//结束当前任务
 					TaskQuestEntity taskQuestEntity = new TaskQuestEntity();
@@ -2138,6 +2136,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 								questDetail.setCategoryName(queryData.getDescriptionGoods());
 							}
 							break;
+						default:
+							log.debug("托盘盘点：没有匹配到类型！");
+							return 0;
 					}
 
 
@@ -3520,7 +3521,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			log.warn("###########verifyTask: 盘点任务不属于当前仓 taskId={}", taskId);
 			throw new CustomerException(403, "盘点任务不属于当前仓");
 		}
-		Long now = new Date().getTime();
+		Long now = System.currentTimeMillis();
 		String endTime = questEntity.getEndTime();
 		Long end = CommonUtil.StringToDate(endTime).getTime();
 		if (now > end) {

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

@@ -197,6 +197,9 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 			case "2":
 				list = baseMapper.selectAllwrap(page, warehouseGoodsAllocation);
 				break;
+			default:
+				log.warn("货位类型错误");
+				break;
 		}
 		return page.setRecords(list);
 	}
@@ -211,6 +214,9 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 			case "2":
 				list = baseMapper.selectAllInventory(page, warehouseGoodsAllocation);
 				break;
+			default:
+				log.warn("货位类型错误");
+				break;
 		}
 		//查询货位库存品
 		return page.setRecords(list);
@@ -227,6 +233,9 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
 			case "2":
 				list = baseMapper.selectAllZeroOrder(page, warehouseStockArticleZationDTO);
 				break;
+			default:
+				log.warn("货位类型错误");
+				break;
 		}
 		return page.setRecords(list);
 	}

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

@@ -21,6 +21,7 @@ import java.util.List;
 @AllArgsConstructor
 public class WarehouseSettingImpl extends BaseServiceImpl<WarehouseSettingMapper, WarehouseSettingEntity> implements IWarehouseSettingService {
 
+	@Override
 	public boolean isMandatoryLoading(Long WarehouseId){
 		WarehouseSettingEntity setting = getSetting(WarehouseId);
 		int noLimit  = 0;

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

@@ -736,6 +736,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 
 
+	@Override
 	public void orderScanOrderPackageCodeList(WarehouseTrayTypeEntity trayTypeEntity, List<DistributionParcelListEntity> parcelListEntityList,Long warehouseId,String remark) {
 
 		String tt = trayTypeEntity.getTrayType();

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

@@ -267,7 +267,7 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 
 		}
 		if (warehouseUpdownStockupAreaEntityList.size() > 1) {
-			boolean flag = warehouseUpdownStockupAreaEntityList.stream().anyMatch(item -> !item.getAssociationType().equals("3"));
+			boolean flag = warehouseUpdownStockupAreaEntityList.stream().anyMatch(item -> !"3".equals(item.getAssociationType()));
 			if (flag) {
 				log.warn(method + "多条上架记录AssociationValue:{},warehouseId:{}", code, warehouseId);
 				throw new CustomerException("多条上架记录");

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

@@ -139,7 +139,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			BeanUtil.copyProperties(warehouseWarehousingEntryDTO, warehouseWarehousingEntry);
 			//入库批次号
 			if (ObjectUtils.isNull(warehouseWarehousingEntry.getReceiptBatch())) {
-				long time = new Date().getTime();
+				long time = System.currentTimeMillis();
 				BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 				String s = "RK" + myCurrentWarehouse.getWarehouseCode() + time;
 				warehouseWarehousingEntry.setReceiptBatch(s);
@@ -189,7 +189,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			BeanUtil.copyProperties(warehouseWarehousingEntryDTO, entryEntity);
 			//入库批次号
 			if (ObjectUtils.isNull(warehouseWarehousingEntry.getReceiptBatch())) {
-				long time = new Date().getTime();
+				long time = System.currentTimeMillis();
 				BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 				warehouseWarehousingEntry.setReceiptBatch("RK" + myCurrentWarehouse.getWarehouseCode() + time);
 			}
@@ -474,7 +474,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			} else {
 				WarehouseWarehousingEntryEntity entryEntity = new WarehouseWarehousingEntryEntity();
 				if (ObjectUtils.isNull(o.getReceiptBatch())) {
-					long time = new Date().getTime();
+					long time = System.currentTimeMillis();
 					BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 					entryEntity.setReceiptBatch("RK" + myCurrentWarehouse.getWarehouseCode() + time);
 				} else {
@@ -563,7 +563,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 					String positions = i.getPositions();
 					positions = positions.trim().replaceAll("\n", "").replaceAll("\r", "");
 					//查询库位
-					if (i.getLoadingType().equals("1")) {
+					if ("1".equals(i.getLoadingType())) {
 						//库位
 						WarehouseGoodsAllocationEntity warehouseGoodsAllocationEntity = warehouseGoodsAllocationClient.findByAllocationQrCode(positions);
 						if (Func.isNotEmpty(warehouseGoodsAllocationEntity)) {
@@ -642,6 +642,9 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 				case "3":
 					s.setConditions("已确定");
 					break;
+				default:
+					s.setConditions("未知");
+					return ;
 			}
 			BeanUtil.copyProperties(s, excel);
 			listExcel.add(excel);