Merge branch 'dev' into pre-production

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

@@ -1712,8 +1712,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				String warehouseName = warehouseEntity.getName();
 
 				updownGoodsLogEntities.forEach(warehouseUpdownGoodsLogEntity -> {
-					String allocationTitle = warehouseUpdownGoodsLogEntity.getAllocationTitle();
+					String positionCode = warehouseUpdownGoodsLogEntity.getPositionCode();
-					String content = "包件在 "+warehouseName+" 下架，库位 "+allocationTitle;
+					String content = "包件在 "+warehouseName+" 下架，库位 "+positionCode;
 					List<String> packageCodeList = new ArrayList<>();
 					packageCodeList.add(warehouseUpdownGoodsLogEntity.getAssociationValue());
 					warehousePackageTrackLogService.addBatchLog(packageCodeList,content,warehouseId,warehouseName, AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
@@ -1919,9 +1919,30 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 
 				num = num + quantity;
 				warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
+
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("dataType",1);
+				jsonObject.put("conditions",parcelListEntity.getConditions());
+				jsonObject.put("operation",4);
+				//把listEntityList中所有元素的orderPackageCode放入一个List
+				List<String> packageCodes = new ArrayList<>();
+				packageCodes.add(parcelListEntity.getOrderPackageCode());
+
+				jsonObject.put("orderPackageCodes",packageCodes);
+				jsonObject.put("warehouseId",warehouseId);
+
+				FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.warehouse.ALLOCATION.EXCHANGE).msg(jsonObject.toJSONString()).build();
+
+				sendFanoutService.sendFanoutMsg(fanoutMsg);
+
+				String positionCode = updownTypeEntity.getPositionCode();
+				String content = "包件在 "+parcelListEntity.getWarehouse()+" 下架，库位 "+positionCode;
+				warehousePackageTrackLogService.addBatchLog(packageCodes,content,warehouseId,parcelListEntity.getWarehouse(), AuthUtil.getNickName(), WorkNodeEnums.DELIST.getCode());
+
 			} else {
 				log.error("包件下架失败，找不到上架方式,updownTypeId:{}", updownTypeId);
 			}
+
 		}
 		return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
 	}