diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java index cedc1fb81..98c69773a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java @@ -50,11 +50,11 @@ public class OupaiFactoryDataController { factoryLogService.save(orderStatusLog); String carNum = null; try { - carNum = mtFactoryDataService.saveData(ouPaiDataPushVO); +// carNum = mtFactoryDataService.saveData(ouPaiDataPushVO); orderStatusLog.setDataStatus(1); } catch (ServiceException e) { - log.warn("############data: 保存数据失败 carNum={}",ouPaiDataPushVO.getCarNum()); +// log.warn("############data: 保存数据失败 carNum={}",ouPaiDataPushVO.getCarNum()); log.error("############data: 保存数据失败",e); //修改保存数据的状态 orderStatusLog.setDataStatus(2); @@ -62,10 +62,10 @@ public class OupaiFactoryDataController { factoryLogService.saveOrUpdate(orderStatusLog); //开启异步线程处理数据 - if(ObjectUtils.isNotNull(carNum)){ - syncDataService.handlerOuPaiDataToHt(ouPaiDataPushVO.getCarNum()); - } - return R.data(ouPaiDataPushVO.getCarNum()); +// if(ObjectUtils.isNotNull(carNum)){ +// syncDataService.handlerOuPaiDataToHt(ouPaiDataPushVO.getCarNum()); +// } + return R.data(ouPaiDataPushVO.getOrderCode()); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java index 2332706eb..3d1d57fc4 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java @@ -6,8 +6,35 @@ import lombok.Data; public class OuPaiDataPushVO { /** - * 发车单号 + * 仓库名称 */ - private String carNum; + private String WarehouseName; + /** + * 对象实体的名称 + */ + private String TypeName; + /** + * 0:收货单开始收货 + * 1:收货单完成收货 + * 2:包件收货 + * 3:收货单创建 + * 4:配送单发运 + * 5:签收单签收 + * 6:签收单部分签收 + */ + private int Event; + /** + * 相关单号 + */ + private String OrderCode; + /** + * 对象key值,Type实体对象对应的OID值(唯一 + */ + private String Key; + + /** + * 签名,暂时为空 + */ + private String Sign; }