From 7f11ad3e9b1bb71837cc2c210071d5ea45e6333a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 1 Aug 2024 17:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=A5=E5=8F=A3sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/mes/service/impl/MesBoradServiceImpl.java     | 4 ++++
 op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java
index 087edfd6..44003553 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesBoradServiceImpl.java
@@ -113,6 +113,10 @@ public class MesBoradServiceImpl implements IMesBoradService {
         //当前工单信息
         BoardDTO workOrder = mesMapper.getWorkOrder(boardDTO);
 
+        if(workOrder == null || StringUtils.isEmpty(workOrder.getWorkorderCode())){
+            return dtoMap;
+        }
+
         boardDTO.setWorkorderCode(workOrder.getWorkorderCode());
         boardDTO.setProductCode(workOrder.getProductCode());
         MesLine meslineInfo = mesMapper.getMesLineInfo(boardDTO);
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 8c32ecec..9caac721 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -362,7 +362,7 @@
         group by check_result
     </select>
     <select id="getPorOrderList" resultType="com.op.mes.domain.ProOrderWorkorder">
-        select t0.*,t.quantityFeedback from
+        select t0.*,t.quantityProduced from
             (
                 select pow.workorder_code_sap workorderCodeSap,
                        pow.workorder_code workorderCode,
@@ -375,7 +375,7 @@
                   and pow.workorder_name = #{equCode} and pow.parent_order ='0' and powb.del_flag = '0'
             ) t0
                 left join (
-                select workorder_code,batch,sum(quantity_feedback) quantityFeedback from mes_report_work
+                select workorder_code,batch,sum(quantity_feedback) quantityProduced from mes_report_work
                 where CONVERT(varchar(10),feedback_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
                   and del_flag = '0'
                 group by workorder_code,batch