From 944d9d930828c5c582aff555a18f1c499ab9d501 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 23 Aug 2023 16:05:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=8C=E6=AD=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/system/api/model/SapProOrder.java    | 12 ++++++++++++
 .../op/plan/service/impl/ProOrderServiceImpl.java    |  5 ++++-
 .../main/resources/mapper/plan/ProOrderMapper.xml    |  2 +-
 .../com/op/sap/service/impl/SapOrderServiceImpl.java |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/model/SapProOrder.java b/op-api/op-api-system/src/main/java/com/op/system/api/model/SapProOrder.java
index 77f12e8e4..6f58871e4 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/model/SapProOrder.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/model/SapProOrder.java
@@ -54,6 +54,8 @@ public class SapProOrder extends TreeEntity {
     @Excel(name = "任务清单")
     private String workerOrder;
 
+    private Date createTime;
+
     public Long getQuantitySplit() {
         return quantitySplit;
     }
@@ -104,6 +106,16 @@ public class SapProOrder extends TreeEntity {
     @Excel(name = "产品类型")
     private String prodType;
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
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 7f8331a77..2946d3d32 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
@@ -248,10 +248,13 @@ public class ProOrderServiceImpl implements IProOrderService {
         //获取当前所选工厂
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String key = "#header.poolName";
-        sapqo.setFactoryCode(request.getHeader(key.substring(8)));
+        sapqo.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_",""));
 
         R<List<SapProOrder>> rSapProOrder = remoteSapService.shopOrderSync(sapqo);
         List<SapProOrder> newOrders = rSapProOrder.getData();
+        if(CollectionUtils.isEmpty(newOrders)){
+            return AjaxResult.error("无"+sapqo.getCreateTime()+"之后的最新订单");
+        }
         ProOrder proOrder = null;
         for (SapProOrder sapProOrder : newOrders) {
             //工单下达后整个订单就被锁定//订单存在就更新，不存在就插入
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 f88978cfa..b0d603be2 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
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE bst.Shift_Id = #{shiftId}
     </select>
 	<select id="getMaxCreatetime" resultType="com.op.system.api.model.SapProOrder">
-		select max(create_time) from pro_order where order_type = 'prod'
+		select CONVERT(varchar(100),max(create_time), 20) createTime from pro_order where order_type != 'white'
 	</select>
 
     <select id="selectProOrderByOrderCode" parameterType="String" resultMap="ProOrderResult">
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
index 0e5a50627..9e2ec540b 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
@@ -86,7 +86,7 @@ public class SapOrderServiceImpl implements SapOrderService {
 
             return R.ok(proOrderList);
         } catch (Exception e) {
-            return null;
+            return R.fail(e.getMessage());
         }
     }