diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index e7860d5bf..bd036bc51 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -320,7 +320,7 @@ public class IoCollectOrderController extends BaseController { public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) { if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); - collectOrderService.generateOrder(collectOrderRequest.getBillNo()); + collectOrderService.orderUpload(collectOrderRequest.getBillNo()); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index f339d9069..6615f24e4 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -59,9 +59,11 @@ import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; +import net.sf.jasperreports.engine.util.JRStyledText; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -526,9 +528,6 @@ public class IoCollectOrderService extends ServiceImpl baseResponse = erpBasicClient.postOrder(orderRequest); - log.trace("单据返回=========" + baseResponse); + log.debug("单据返回=========" + baseResponse); + if(baseResponse.getCode() == 20000){ + // + }else { + throw new JsonException("连接第三方系统接口服务出错"); + } } @@ -646,5 +650,24 @@ public class IoCollectOrderService extends ServiceImpl