更换欧派数据推送的仓库ID

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -363,7 +363,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		}
 
 		JSONObject detailObject = new JSONObject();
-		detailObject.put("WarehouseOid", receivingOrderEntity.getEndWarehouseOid());
+		detailObject.put("WarehouseOid", receivingOrderEntity.getCurrentWarehouseOid());
 		detailObject.put("WarehouseBelong", "oppein");
 		detailObject.put("Creator", orderStatusDTO.getUsername());
 		detailObject.put("PackageCode", unitNo);

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OrderStatusHandler.java

@@ -97,13 +97,13 @@ public class OrderStatusHandler {
 				break;
 
 			case FactoryConstant.OUPAI:
-//				r = ouPaiFactoryService.handleStatusData(orderStatusDTO);
-//				if (r.getCode() == 400 || r.getCode() == 200) {
-//					log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum);
-////					channel.basicAck(deliveryTag,true);
-//				} else {
-//					throw new CustomerException(r.getCode(), r.getMsg());
-//				}
+				r = ouPaiFactoryService.handleStatusData(orderStatusDTO);
+				if (r.getCode() == 400 || r.getCode() == 200) {
+					log.info("TAG {} ##################orderStatusHandler: 该条数据不用处理 orderNo={}", FactoryConstant.OUPAI, orderSelfNum);
+//					channel.basicAck(deliveryTag,true);
+				} else {
+					throw new CustomerException(r.getCode(), r.getMsg());
+				}
 
 
 			default: