1.修复推送订单数据重复问题

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -376,9 +376,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				logger.warn("############handleDataToPlatform: 仓库信息不存在 destinationWarehouse={}",destinationWarehouse);
 				throw new CustomerException(405, "仓库信息不存在");
 			}
-
+			Long warehouseId = basicdataWarehouseEntity.getId();
 			//判断新系统是否有这条订单数据
-			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findByAdvanceId(advanceId);
+			DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderSelfNum,warehouseId);
 
 			Long id;
 			String waybillNoNum = advanceEntity.getWaybillNo();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java

@@ -67,7 +67,7 @@ public class WarehouseUpdownTypeApiController {
 			return R.data(upShelfDataVOs);
 		}catch (CustomerException e){
 			log.warn(e.message);
-			return Resp.scanFail(e.message,e.message);
+			return Resp.scanFail(e.code,e.message,e.message);
 		}catch (Exception e){
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");
@@ -101,7 +101,7 @@ public class WarehouseUpdownTypeApiController {
 			return R.data(upShelfAllocationVO);
 		}catch (CustomerException e){
 			log.warn(e.message);
-			return Resp.scanFail(e.message,e.message);
+			return Resp.scanFail(e.code,e.message,e.message);
 		}catch (Exception e){
 			log.error(method+"系统异常，联系管理员",e);
 			return R.fail(500,"系统异常，联系管理员");