From bc9408a528c5f8219636f3803616972e299642ba Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 12 Dec 2023 16:07:00 +0800
Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DailyPlanController.java       |  7 ++++
 .../production/dao/SoScheduledListMapper.java | 11 +++++
 .../production/entity/OrderViewData.java      | 32 +++++++++++++++
 .../production/service/DailyPlanService.java  | 11 +++++
 .../service/impl/DailyPlanServiceImpl.java    |  5 +++
 .../production/SoScheduledListMapper.xml      | 40 ++++++++++++++++++-
 6 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/heai/modules/production/entity/OrderViewData.java

diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index 3df80b9..3b2960e 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -940,4 +940,11 @@ public class DailyPlanController {
         return R.ok().put("row",result);
     }
 
+
+    @PostMapping("/getOrderView")
+    public R getOrderView(@RequestBody OrderViewData inData){
+        List<OrderViewData> result= dailyPlanService.getOrderView(inData);
+        return R.ok().put("rows",result);
+    }
+
 }
diff --git a/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java b/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java
index 253ac45..9bcf98a 100644
--- a/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java
+++ b/src/main/java/com/heai/modules/production/dao/SoScheduledListMapper.java
@@ -168,4 +168,15 @@ public interface SoScheduledListMapper {
      */
     List<InspectionDefectCodeData> getBadCodeList();
 
+    /**
+     * @Description TODO
+     * @Title getOrderView
+     * @param inData
+     * @author rq
+     * @date 2023/12/12 15:51
+     * @return List<OrderViewData>
+     * @throw
+     */
+    List<OrderViewData> getOrderView(OrderViewData inData);
+
 }
diff --git a/src/main/java/com/heai/modules/production/entity/OrderViewData.java b/src/main/java/com/heai/modules/production/entity/OrderViewData.java
new file mode 100644
index 0000000..63c6768
--- /dev/null
+++ b/src/main/java/com/heai/modules/production/entity/OrderViewData.java
@@ -0,0 +1,32 @@
+package com.heai.modules.production.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Alias("OrderViewData")
+public class OrderViewData {
+    private String site;
+    private String orderNo;
+    private String partSpec;
+    private String partNo;
+    private String liuhuaReport;
+    private String liuhuaFinish;
+    private String xiubianReport;
+    private String hongkaoReport;
+    private String jianyanReport;
+    private String baozhuangReport;
+    private String finishedQty;
+    private String lotSize;
+    private String closedFlag;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
+}
diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
index 643c9a3..3427693 100644
--- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
@@ -711,4 +711,15 @@ public interface DailyPlanService  {
      * @throw
      */
     List<InspectionDefectCodeData> getBadCodeList();
+
+    /**
+     * @Description TODO
+     * @Title getOrderView
+      * @param inData
+     * @author rq
+     * @date 2023/12/12 15:52
+     * @return List<OrderViewData>
+     * @throw
+     */
+    List<OrderViewData> getOrderView(OrderViewData inData);
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index 0abcdff..79779f4 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -1687,5 +1687,10 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     public List<InspectionDefectCodeData> getBadCodeList(){
         return soScheduledListMapper.getBadCodeList();
     }
+    @Override
+    public List<OrderViewData> getOrderView(OrderViewData inData){
+        return soScheduledListMapper.getOrderView(inData);
+    }
+
 
     }
diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml
index 0f2eb19..94d880e 100644
--- a/src/main/resources/mapper/production/SoScheduledListMapper.xml
+++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml
@@ -44,10 +44,10 @@
     <where>
             AND order_no = #{orderNo}
 
-    </where>
      <if test="site != null and site != ''">
               and  site=#{site}
             </if>
+   </where>
 </update>
     <select id="getInspectBoard" resultType="com.heai.modules.production.entity.SOOPInspectData">
         select  a.site,a.TransNo,a.TransDate,B.OrderNo,b.PartNo,b.TransQty,b.seqNo,dbo.Get_Part_SpecDesc(a.site,b.PartNo) partDescSpec,a.ToTypeFlag,isnull(c.S_ShiftNo,'白班') shiftNo
@@ -176,4 +176,42 @@
         select InspectionType_DB,Site,DefectCode,InspectionType,DefectDesc,Active,WorkCenterNo,InspectQty
         from InspectionDefectCode where InspectionType_DB='PQ'
     </select>
+
+    <select id="getOrderView" resultType="OrderViewData">
+        SELECT a.OrderNo,dbo.Get_Part_Spec(a.site,a.PartNo) partSpec,
+        Round(isnull(dbo.Get_orderView_liuhuaReport(a.site,a.OrderNo),0),3) as liuhuaReport ,
+        Round(isnull(dbo.Get_orderView_liuhuaFinish(a.site,a.OrderNo),0),3) as liuhuaFinish ,
+        Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'修边'),0),3) as xiubianReport,
+        Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'烘烤'),0),3) as hongkaoReport,
+        Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'检验'),0),3) as jianyanReport,
+        Round(isnull(dbo.Get_orderView_routeReport(a.site,a.OrderNo,'包装'),0),3) as baozhuangReport,
+        Round(FinishedQty,3) FinishedQty ,
+        LotSize
+        FROM ShopOrder a
+    <where>
+            AND a.PartNo like 'FP%'
+            AND a.status != '已取消'  and a.status != '已计划'
+            <if test="partNo != null and partNo != ''">
+              and  a.partNo like #{partNo}
+            </if>
+             <if test="site != null and site != ''">
+              and  site=#{site}
+            </if>
+             <if test="orderNo != null and orderNo != ''">
+              and  a.orderNo=#{orderNo}
+            </if>
+             <if test="closedFlag != null and closedFlag != ''">
+              and  a.status != '已关闭'
+            </if>
+             <if test="partSpec != null and partSpec != ''">
+              and  dbo.Get_Part_Spec(a.site,a.PartNo) like #{partSpec}
+            </if>
+              <if test="startDate != null ">
+                AND a.EnterDate >=   #{startDate}
+            </if>
+            <if test="endDate != null ">
+                AND  #{endDate} >=  DATEADD(dd, -1, a.EnterDate)
+            </if>
+   </where>
+    </select>
 </mapper>
\ No newline at end of file