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

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

@@ -10,24 +10,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springblade.common.annotations.LocalServerUser;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.core.tool.utils.ThreadLocalUtil;
-import org.springblade.core.tool.utils.WebUtil;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -104,7 +97,10 @@ public class FactoryCommonController {
 			//将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.ORDER_STATUS_EXCHANGE, RabbitConstant.ORDER_STATUS_ROUTING, map);
 			map.put("type", "DealWith");
-			rabbitTemplate.convertAndSend(RabbitConstant.DEAL_WITH_EXCHANGE, RabbitConstant.DEAL_WITH_ROUTING, map);
+			rabbitTemplate.convertAndSend(RabbitConstant.DEAL_WITH_EXCHANGE, RabbitConstant.DEAL_WITH_ROUTING, map,message->{
+				message.getMessageProperties().setHeader("x-delay",2000);
+				return message;
+			});
 
 
 //			R r = factoryDataService.handleStatusData(orderStatusDTO);

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

@@ -167,6 +167,10 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 
 							} catch (Exception e) {
 								log.error(">>>> 数据推送异常", e);
+								Boolean exists = bladeRedis.exists(redisKey);
+								if(Boolean.TRUE.equals(exists)){
+									bladeRedis.del(redisKey);
+								}
 								orderPackageStatusPushFailLogService.saveOrderPackageStatusFaleLog(unitNo, currentWarehouseId, status, operationTime, trayId);
 								log.error(">>>> 保存到错误数据推送记录 {}", unitNo);
 							}
@@ -174,6 +178,10 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 					}
 				}
 			} else {
+				Boolean exists = bladeRedis.exists(redisKey);
+				if(Boolean.TRUE.equals(exists)){
+					bladeRedis.del(redisKey);
+				}
 				orderPackageStatusPushFailLogService.saveOrderPackageStatusFaleLog(unitNo, currentWarehouseId, status, operationTime, trayId);
 			}
 		}

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

@@ -242,7 +242,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
 			return R.fail(403,"仓库信息为空");
 		}
 
-		R r = warehouseUpdownTypeService.upShelfOrder(upShelfOrderList, allocationId,myCurrentWarehouse.getId(),"扫码订单上架");
+		R r = warehouseUpdownTypeService.upShelfOrder(upShelfOrderList, allocationId,myCurrentWarehouse.getId(),"PC订单上架");
 //		if (r.getCode() == 200) {
 //			warehouseGoodsAllocationService.updateAllocationCache(allocationId.toString());
 //		}