From bbec4e6d27601bf70b5f14745b5278d9b2af81e9 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 13 Jan 2024 15:18:17 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=9F=E4=BA=A7=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=8A=A5=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production/domain/ProductPlanInfo.java    | 23 +++++++++++
 .../production/ProductPlanInfoMapper.xml      |  7 +++-
 .../ProductionReportController.java           |  5 ++-
 .../mapper/report/GeneralReportMapper.xml     | 40 ++++++++++++++++++-
 4 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/aucma-production/src/main/java/com/aucma/production/domain/ProductPlanInfo.java b/aucma-production/src/main/java/com/aucma/production/domain/ProductPlanInfo.java
index 6c9be92..649ddee 100644
--- a/aucma-production/src/main/java/com/aucma/production/domain/ProductPlanInfo.java
+++ b/aucma-production/src/main/java/com/aucma/production/domain/ProductPlanInfo.java
@@ -140,6 +140,29 @@ public class ProductPlanInfo extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planBeginTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划完成日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planEndTime;
+
+    public Date getPlanBeginTime() {
+        return planBeginTime;
+    }
+
+    public void setPlanBeginTime(Date planBeginTime) {
+        this.planBeginTime = planBeginTime;
+    }
+
+    public Date getPlanEndTime() {
+        return planEndTime;
+    }
+
+    public void setPlanEndTime(Date planEndTime) {
+        this.planEndTime = planEndTime;
+    }
 
     public String getStationCode() {
         return stationCode;
diff --git a/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml b/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml
index 8909466..38546c6 100644
--- a/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml
+++ b/aucma-production/src/main/resources/mapper/production/ProductPlanInfoMapper.xml
@@ -25,6 +25,8 @@
         <result property="createdTime" column="created_time"/>
         <result property="updatedBy" column="updated_by"/>
         <result property="updatedTime" column="updated_time"/>
+        <result property="planBeginTime" column="planBeginTime"/>
+        <result property="planEndTime" column="planEndTime"/>
     </resultMap>
 
     <sql id="selectProductPlanInfoVo">
@@ -47,10 +49,13 @@
                pp.created_by,
                pp.created_time,
                pp.updated_by,
-               pp.updated_time
+               pp.updated_time,
+               bo.BEGIN_DATE        planBeginTime,
+               bo.END_DATE          planEndTime
         from product_planinfo pp
                  left join BASE_PRODUCTLINE st on st.PRODUCT_LINE_CODE = pp.productline_code
                  left join BASE_PRODUCTLINE pl on pl.PRODUCT_LINE_CODE = st.PARENT_ID
+                 left join BASE_ORDERINFO bo on bo.ORDER_CODE = pp.ORDER_CODE
     </sql>
 
     <select id="selectProductPlanInfoList" parameterType="ProductPlanInfo" resultMap="ProductPlanInfoResult">
diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
index e52acef..2fe4ff9 100644
--- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
+++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
@@ -37,9 +37,10 @@ public class ProductionReportController extends BaseController {
      * 查询生产执行报表
      */
     @GetMapping("/productionExecutionReportList")
-    public AjaxResult productionExecutionReportList(@RequestParam(required = false) Map hashMap) {
+    public TableDataInfo productionExecutionReportList(@RequestParam(required = false) Map hashMap) {
+        startPage();
         List<HashMap<String, Object>> list = productionReportService.productionExecutionReportList(hashMap);
-        return success(list);
+        return getDataTable(list);
     }
 
     /**
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index d9f9ad5..b62653b 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -37,8 +37,44 @@
     </select>
 
     <select id="productionExecutionReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
-        SELECT *
-        FROM VIEW_MATERIAL_COMPLETION
+        SELECT B2.PRODUCT_LINE_CODE,
+        B2.PRODUCT_LINE_NAME,
+        VMC.ORDER_CODE,
+        BP.PRODUCT_LINE_CODE STATION_CODE,
+        BP.PRODUCT_LINE_NAME STATION_NAME,
+        VMC.MATERIAL_CODE,
+        BM.MATERIAL_NAME,
+        BO.MATERIAL_CODE     PRODUCT_CODE,
+        BO.MATERIAL_NAME     PRODUCT_NAME,
+        COUNT(*)             COMP_AMOUNT
+        FROM VIEW_MATERIAL_COMPLETION VMC
+        LEFT JOIN BASE_PRODUCTLINE BP ON BP.PRODUCT_LINE_CODE = VMC.STATION_NAME
+        LEFT JOIN BASE_PRODUCTLINE B2 ON B2.PRODUCT_LINE_CODE = BP.PARENT_ID
+        LEFT JOIN BASE_ORDERINFO BO ON BO.ORDER_CODE = VMC.ORDER_CODE
+        LEFT JOIN BASE_MATERIALINFO BM ON BM.MATERIAL_CODE = VMC.MATERIAL_CODE
+        <where>
+            <if test="productLineCode != null and productLineCode != ''">
+                AND VMC.PRODUCT_LINE_CODE = #{productLineCode}
+            </if>
+            <if test="stationCode != null  and stationCode != ''">
+                and VMC.STATION_NAME = #{stationCode}
+            </if>
+            <if test="ORDER_CODE != null  and ORDER_CODE != ''">
+                and VMC.ORDER_CODE = #{ORDER_CODE}
+            </if>
+            <if test="PRODUCT_CODE != null  and PRODUCT_CODE != ''">
+                and BO.MATERIAL_CODE like concat(#{PRODUCT_CODE}, '%')
+            </if>
+            <if test="PRODUCT_NAME != null  and PRODUCT_NAME != ''">
+                and BO.MATERIAL_NAME like concat(concat('%', #{PRODUCT_NAME}), '%')
+            </if>
+            <if test="beginBeginTime != null  and beginBeginTime != '' and endBeginTime != null  and endBeginTime != ''">
+                AND TO_CHAR(VMC.COMPLETE_DATE, 'YYYY-MM-DD HH24:MI:SS') BETWEEN #{beginBeginTime} AND #{endBeginTime}
+            </if>
+        </where>
+        GROUP BY B2.PRODUCT_LINE_CODE, B2.PRODUCT_LINE_NAME, VMC.ORDER_CODE, BO.MATERIAL_CODE, BP.PRODUCT_LINE_CODE,
+        BP.PRODUCT_LINE_NAME, VMC.MATERIAL_CODE, BM.MATERIAL_NAME, BO.MATERIAL_NAME
+        ORDER BY B2.PRODUCT_LINE_CODE, VMC.ORDER_CODE, BP.PRODUCT_LINE_CODE
     </select>
 
     <select id="WIPInquiryReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">