diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index fee967f..eb757a2 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -655,31 +655,31 @@ public class HlfyyyClient extends CommonHttpClient { return null; } - @Override - public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) { - return null; - } +// @Override +// public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) { +// return null; +// } @Resource SysParamConfigService sysParamConfigService; - public BaseResponse submitOrders(IoCollectOrder ioCollectOrder) { - if (StrUtil.isBlank(ioCollectOrder.getBillNo())) { + public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) { + if (StrUtil.isBlank(udiwmsOrderRequest.getBillNo())) { return ResultVOUtils.error(500, "单据号不能为空"); } ZaxzyyOrderRequest zaxzyyOrderRequest = new ZaxzyyOrderRequest(); - BeanUtil.copyProperties(ioCollectOrder, zaxzyyOrderRequest); + BeanUtil.copyProperties(udiwmsOrderRequest, zaxzyyOrderRequest); //查询单据和详情信息,组装第三方系统接口所需参数 - IoOrderEntity orderEntity = orderDao.selectOne(new QueryWrapper().eq("billNo", ioCollectOrder.getBillNo())); + IoOrderEntity orderEntity = orderDao.selectOne(new QueryWrapper().eq("billNo", udiwmsOrderRequest.getBillNo())); zaxzyyOrderRequest.setBillDate(DateUtil.formatDateTime(orderEntity.getCreateTime()).substring(0, 10)); //查询对应的第三方单据类型 -// ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectOne(new QueryWrapper().eq("code", ioCollectOrder.getBusType())); - zaxzyyOrderRequest.setBillType(ioCollectOrder.getBusType()); + ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getBillType())); + zaxzyyOrderRequest.setBillType(thrSystemBusApiEntity.getThirdBuyCode()); zaxzyyOrderRequest.setBillFlag("1"); //查询单据类型 - BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeDao.selectByAction(ioCollectOrder.getBusType()); + BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeDao.selectByAction(thrSystemBusApiEntity.getThirdBuyCode()); //供应商 BasicCorpEntity basicCorpEntity = null; @@ -1702,8 +1702,6 @@ public class HlfyyyClient extends CommonHttpClient { optionUploadCollectOrder3505(ioCollectOrder); } else if (matchBusType(busType, buyType_3506)) { optionUploadCollectOrder3506(ioCollectOrder); - } else { - return submitOrders(ioCollectOrder); } } }