From 276491eb57b0be12fcd1dd0c31e51b654ed790b4 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 22 Jan 2024 17:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../board/service/impl/BoardServiceImpl.java        |  8 ++++----
 src/main/resources/mapper/board/BoardMapper.xml     | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
index aa308b9..b5d9277 100644
--- a/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
+++ b/src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
@@ -213,8 +213,8 @@ public class BoardServiceImpl implements BoardService {
     @Override
     public Map<String, Object>  getNewScheduledTableData(int number){
         Map<String, Object> map = new HashMap<>();
-        // String date = DateUtil.getStringDate(new Date());
-        String date="2022-05-22";
+        String date = DateUtil.getStringDate(new Date());
+        // String date="2022-05-22";
         List<NewScheduledData> tableList =boardMapper.getNewScheduledTableList(date);
         if(tableList.size()==0){
             NewScheduledData tableData = new NewScheduledData();
@@ -269,8 +269,8 @@ public class BoardServiceImpl implements BoardService {
         Map<String, Object> map = new HashMap<>();
         // List<NewScheduledData> tableList=new ArrayList<>();
 
-        // String date = DateUtil.getStringDate(new Date());
-        String date="2022-05-22";
+        String date = DateUtil.getStringDate(new Date());
+        // String date="2022-05-22";
         PieBoardData pieData=boardMapper.getNewScheduledPieList(date);
         List<NewScheduledData> barList=boardMapper.getNewScheduledBarList(date);
         // tableList=boardMapper.getNewScheduledTableList(date,number);
diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml
index 15897b0..9c9ced9 100644
--- a/src/main/resources/mapper/board/BoardMapper.xml
+++ b/src/main/resources/mapper/board/BoardMapper.xml
@@ -83,9 +83,7 @@
 
 
      <select id="getNewScheduledTableList" resultType="com.jianteng.modules.board.entity.NewScheduledData">
-     select resourceId,QtyRequired,Site,QtyReported,QtyApprove,resourceDesc,QtyUnReported,(select count(1) from AbnormalFeedBack a left join SOScheduledRouting b
-        on a.site=b.site and a.SeqNo=b.SeqNo where dbo.Get_WorkCenter_ProLineNo(a.site,b.S_WorkCenterNo)=board.resourceId and a.status != '已完结'
-        ) as abnormalQty
+     select resourceId,QtyRequired,Site,QtyReported,QtyApprove,resourceDesc,QtyUnReported
      from
      (
     select PL.ProLineNo AS resourceId ,R.Site,isnull(Round(SUM(SR.QtyRequired),3),0) as QtyRequired,isnull(Round(SUM(SR.QtyReported),3),0) as QtyReported,isnull(Round(SUM(SR.QtyApprove),3),0) as QtyApprove,
@@ -94,7 +92,8 @@
     LEFT JOIN SOScheduledRouting SR on SR.Site=R.Site and SR.S_WorkCenterNo=R.WorkCenterNo
       left join ProductionLine PL on PL.site =R.site and PL.ProLineNo=R.ProLineNo
 
-     where  SR.S_ScheduledDate>  DATEADD(dd, -7,#{date})  and #{date}>=SR.S_ScheduledDate  and R.workcenterNo like 'P%' and SR.ClosedFlag='Y'
+     where  SR.S_ScheduledDate>  DATEADD(dd, -7,#{date})  and #{date}>=SR.S_ScheduledDate  and R.workcenterNo like 'P%'
+
     GROUP BY PL.ProLineNo,PL.ProLineDesc,R.Site
     ) board
  ORDER BY resourceId
@@ -113,7 +112,8 @@
     Round((Round(SUM(SR.QtyReported),3) -Round(SUM(SR.QtyApprove),3) ) *100 /case when Round(SUM(SR.QtyRequired),3) =0 then 1 else Round(SUM(SR.QtyRequired),3) end ,1) as per3,
     Round((Round(SUM( case when 0> SR.QtyRequired-SR.QtyReported then 0 else SR.QtyRequired-SR.QtyReported end),3) ) *100 /case when Round(SUM(SR.QtyRequired),3) =0 then 1 else Round(SUM(SR.QtyRequired),3) end ,1) as per4
     from SOScheduledRouting SR
-   where  SR.S_ScheduledDate>DATEADD(dd, -7,#{date})  and #{date}>=SR.S_ScheduledDate  and SR.ClosedFlag='Y'
+   where  SR.S_ScheduledDate>DATEADD(dd, -7,#{date})  and #{date}>=SR.S_ScheduledDate
+
 
 </select>
 <select id="getNewScheduledBarList" resultType="com.jianteng.modules.board.entity.NewScheduledData">
@@ -124,7 +124,8 @@
     LEFT JOIN SOScheduledRouting SR on SR.Site=R.Site and SR.S_WorkCenterNo=R.WorkCenterNo
     left join ProductionLine PL on PL.site =R.site and PL.ProLineNo=R.ProLineNo
 
-    where   SR.S_ScheduledDate>DATEADD(dd, -7,#{date})  and #{date}>=SR.S_ScheduledDate   and R.workcenterNo like 'P%'  and SR.ClosedFlag='Y'
+    where   SR.S_ScheduledDate>DATEADD(dd, -7,#{date})  and #{date}>=SR.S_ScheduledDate   and R.workcenterNo like 'P%'
+
     GROUP BY PL.ProLineNo,PL.ProLineDesc
     ORDER BY PL.ProLineNo