签收列表签收方式

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

@@ -755,12 +755,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 //		sendNodeWorkDataBroadcast();
 		//复核日志
-		handleSignforLog(distributionSignfor,AuthUtil.getUser(),myCurrentWarehouse,reservationEntity);
+		handleSignforLog(distributionSignfor, AuthUtil.getUser(), myCurrentWarehouse, reservationEntity);
 
 		return R.success("操作成功");
 	}
 
-	private void handleSignforLog(DistributionSignforEntity distributionSignfor,BladeUser user,BasicdataWarehouseEntity warehouse,DistributionReservationEntity reservationEntity) {
+	private void handleSignforLog(DistributionSignforEntity distributionSignfor, BladeUser user, BasicdataWarehouseEntity warehouse, DistributionReservationEntity reservationEntity) {
 		String content = user.getNickName() + "在" + warehouse.getName() + "复核签收,预约编号:" + reservationEntity.getReservationCode();
 		DistributionPlanLogEntity distributionPlanLogEntity = new DistributionPlanLogEntity();
 		distributionPlanLogEntity.setContent(content);
@@ -3050,7 +3050,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 
-		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
+		if (StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())) {
 			// 获取车辆类型
 			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
 			if (nc != null) {
@@ -3110,7 +3110,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		org.springblade.common.model.DistributionSignforVO distributionLoadVO = new org.springblade.common.model.DistributionSignforVO();
 
 
-		if(pushList.isEmpty()){
+		if (pushList.isEmpty()) {
 			return null;
 		}
 
@@ -3123,7 +3123,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 
 
-		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
+		if (StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())) {
 			// 获取车辆类型
 			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
 			if (nc != null) {
@@ -3752,7 +3752,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							jsonObject.put("remark", "异常签收下架");
 							jsonObjects.add(jsonObject);
 							warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
-	//				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
+							//				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
 							if (Func.isEmpty(loadscanEntity.getId())) {
 								//更新装车包件数和签收包件数
 								distributionLoadscanService.save(distributionLoadscanEntity);
@@ -3896,7 +3896,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				distributionAsyncService.maintenanceOrderStatus(parcelListEntity.getOrderCode(), parcelListEntity.getWarehouseId());
 				trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
 				//推送信息至工厂
-	//				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, reservationEntity, simpleDateFormat.format(new Date()), myCurrentWarehouse);
 
 
@@ -4836,8 +4836,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignforEntity.getDeliveryId());
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignforEntity.getReservationId());
 		DistributionPositioningEntity distributionPositioning = createdDistributionPositioningEntity(deliveryListEntity, reservationEntity, AuthUtil.getUser(), driver, positioning);
-		if (Objects.isNull(distributionPositioning)){
+		if (Objects.isNull(distributionPositioning)) {
-		 return Resp.scanFail("当前操作由司机完成", "当前操作由司机完成");
+			return Resp.scanFail("当前操作由司机完成", "当前操作由司机完成");
 		}
 		//进行打卡信息保存
 		distributionPositioningService.save(distributionPositioning);
@@ -4860,11 +4860,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionPositioningEntity.setOperationUsername(user.getNickName());
 		distributionPositioningEntity.setOperationId(user.getUserId());
 		if ("1".equals(deliveryListEntity.getKind())) {
-			if (driver){
+			if (driver) {
 				DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(deliveryListEntity, user, null, driver);
 				distributionPositioningEntity.setVehicleNumber(deliverySelfEntity.getVehicleNub());
 				distributionPositioningEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId()));
-			}else {
+			} else {
 				return null;
 			}
 
@@ -6081,7 +6081,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 		for (DistributionLoadscanEntity distributionParcelListEntity : distributionLoadscanEntityLists) {
 			PackageData packageData = new PackageData();
-			if ( distributionParcelListEntity.getIsZero()!=null  && 1 == distributionParcelListEntity.getIsZero()) {
+			if (distributionParcelListEntity.getIsZero() != null && 1 == distributionParcelListEntity.getIsZero()) {
 				// 零担
 				packageData.setPackageType(PackageTypeEnums.LTL);
 				packageData.setNumber(distributionLoadscanEntity.getReceivedQuantity());
@@ -6184,6 +6184,20 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 								default:
 									log.info("未知的扫描状态 scanStatus={}", scanStatus);
 							}
+							switch (distributionLoadscanEntity.getSignforType()) {
+								case 1:
+									p.setSigningType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
+									break;
+								case 2:
+									p.setSigningType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
+									break;
+								case 3:
+									p.setSigningType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
+									break;
+								default:
+									log.info("未知的签收方式 scanStatus={}", scanStatus);
+							}
+
 							p.setLoadingNub(distributionLoadscanEntity.getLoadedNub());
 							p.setSigningNub(distributionLoadscanEntity.getReceivedQuantity());
 							if (Func.isNotEmpty(distributionLoadscanEntity.getSigningTime())) {
@@ -6968,7 +6982,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
 		}
 
-		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
+		if (StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())) {
 			// 获取车辆类型
 			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
 			if (nc != null) {
@@ -6978,7 +6992,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 
 
-
 		nodeFanoutMsg.setMain(distributionLoadVO);
 
 		List<PackageData> data = new ArrayList<>();
@@ -7781,7 +7794,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date());
 		Integer isStrictLoading = 0;
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-		if (warehouseConfig!=null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
+		if (warehouseConfig != null && !Objects.isNull(warehouseConfig.getIsStrictLoading())) {
 			isStrictLoading = warehouseConfig.getIsStrictLoading();
 		}
 		Long deliveryId = distrilbutionloadingscanDTO.getDeliveryId();