From 91d95f03474abc8e0d9bc706947253eca3f36a14 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 20 Sep 2023 17:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/plan/service/impl/ProOrderServiceImpl.java  | 6 ++++--
 .../src/main/resources/mapper/plan/ProOrderMapper.xml       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 30874d26..036d7000 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<List<SapProOrder>> rSapProOrder = remoteSapService.shopOrderSync(sapqo);//sap只能同步指定日期的数据
 
-        List<SapProOrder> newOrders = rSapProOrder.getData();
-        if(CollectionUtils.isEmpty(newOrders)){
+        if(rSapProOrder == null){
             return AjaxResult.error("无"+sapqo.getCreateTime()+"之后的最新订单");
         }
 
+        List<SapProOrder> 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 1ea17248..3de44404 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"
 			<if test="prodDesc != null  and prodDesc != ''"> and prod_desc like concat('%', #{prodDesc}, '%')</if>
 			<if test="quantity != null "> and quantity = #{quantity}</if>
 			<if test="unit != null  and unit != ''"> and unit = #{unit}</if>
-			<if test="workerOrder != null  and workerOrder != ''"> and worker_order = #{workerOrder}</if>
+			<if test="workerOrder != null  and workerOrder != ''"> and worker_order like concat('%', #{workerOrder}, '%')</if>
 			<if test="planProDate != null "> and plan_pro_date = #{planProDate}</if>
 			<if test="planComplete != null "> and plan_complete = #{planComplete}</if>
 			<if test="atrr1 != null  and atrr1 != ''"> and atrr1 = #{atrr1}</if>