diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 30874d26e..036d7000a 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -411,11 +411,13 @@ public class ProOrderServiceImpl implements IProOrderService { R> rSapProOrder = remoteSapService.shopOrderSync(sapqo);//sap只能同步指定日期的数据 - List newOrders = rSapProOrder.getData(); - if(CollectionUtils.isEmpty(newOrders)){ + if(rSapProOrder == null){ return AjaxResult.error("无"+sapqo.getCreateTime()+"之后的最新订单"); } + List newOrders = rSapProOrder.getData(); + + syncSAPFunc(newOrders); return success(); diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml index 1ea172484..3de444040 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and prod_desc like concat('%', #{prodDesc}, '%') and quantity = #{quantity} and unit = #{unit} - and worker_order = #{workerOrder} + and worker_order like concat('%', #{workerOrder}, '%') and plan_pro_date = #{planProDate} and plan_complete = #{planComplete} and atrr1 = #{atrr1}