Merge remote-tracking branch 'origin/dev' into dev

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-cyz";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称

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

@@ -175,8 +175,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 
 
-
-
 			return baseMapper.updateById(aftersalesWorkOrder) > 0 ? true : false;
 		}
 	}

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

@@ -167,23 +167,6 @@ public class ClerkCheckPushDataQueueHandler {
 			}
 		}
 
-		//得到客户对应的签收数据
-		// TODO 这里的数据需要查询 等TJJ 空了来帮我写
-
-
-
-
-
-
-
-
-
-//		// 得到签收订单数量
-//
-////		调用方法　推送老系统　闭环
-//		SignPushDataDTO signPushDataDTO = new SignPushDataDTO();
-
-
 
 
 

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

@@ -305,6 +305,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//缺少一个异步维护包件签收的方法
 //				distributionAsyncService.changeOrderSignforStatus(collect.get(0));
 				Integer j = distributionSignforMapper.updateSignforNum(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
+				warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 
 			} else {
 				//这里装车的数据需要进行补录
@@ -396,7 +397,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		String str = checkSignNum(distrilbutionloadingscanDTO);
 		//查询出客户下的所有包件信息
-//		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
+		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccess("签收成功", str);
 	}
 
@@ -1020,6 +1021,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("########该客户下的库存品是否已备货:{}", isHaveCode);
 			return Resp.scanFail("操作失败", "操作失败");
 		}
+		distributionAsyncService.checkDeliverySignStatus(distrilbutionloadingscanDTO.getBarcode(), distrilbutionloadingscanDTO.getDeliveryId());
 		return Resp.scanSuccess("签收成功", "签收成功");
 
 
@@ -1838,8 +1840,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
 					//更新签收表的签收数量和装车数量
 					Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
-					distributionAsyncService.checkSignStatus(loadscanEntity.getPackageId(),loadscanEntity.getReservationId(),loadscanEntity.getDeliveryId());
-
+					distributionAsyncService.checkStockArticleSignStatus(parcelListEntity);
+					log.info("一件签收包件下架解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode());
 					warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
 				} else {
 					//存在装车数据
@@ -1862,6 +1864,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						//更新签收数量
 						Integer j = distributionSignforMapper.updateSignforNum(loadscanEntities.getDeliveryId(), loadscanEntities.getReservationId(), loadscanEntities.getPackageNub());
 						distributionAsyncService.checkSignStatus(loadscanEntities.getPackageId(),loadscanEntities.getReservationId(),loadscanEntities.getDeliveryId());
+						log.info("一件签收包件解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode());
+						warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
+
 					}
 				}
 				distributionParcelListService.updateById(parcelListEntity);
@@ -2829,7 +2834,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						parcelNumberEntity.setHandQuantity(handQuantity.subtract(signNum).intValue());
 						parcelNumberEntity.setDeliveryQuantity(deliveryQuantity.subtract(signNum).intValue());
 						parcelNumberEntity.setOutboundQuantity(outboundQuantity.add(signNum).intValue());
-
 					}
 				}
 			}
@@ -2869,7 +2873,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//  得到signfor的ID 获取配送计划的的信息 和配送客户的信息
 		map.put("signfor_id",distributionSignfor.getId());
 
-		rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map);
+		log.info(">>>>>>>>>>>>>>>>>>> 推送老系统 的签收数据  {} ",distributionSignfor);
+		//rabbitTemplate.convertAndSend(RabbitConstant.CLERK_CHECK_PUSH_DATA_EXCHANGE, RabbitConstant.CLERK_CHECK_PUSH_DATA_ROUTING, map);
 
 	}