From d75525f51ae3fbd1006b3f07b1cd47cb1c03bf4c Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sun, 17 Mar 2024 16:14:12 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=89=A9=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E3=80=81=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aucma/api/mapper/PdaBindingMapper.java    |  1 -
 .../aucma/base/domain/BaseMaterialInfo.java   | 24 ++++++++++++
 .../mapper/base/BaseMaterialinfoMapper.xml    | 14 ++++++-
 .../mapper/report/BoardReportMapper.xml       | 37 +++++++++++++------
 .../report/BoxTemperatureHistoryMapper.xml    |  2 +-
 .../mapper/report/GeneralReportMapper.xml     |  2 +-
 6 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
index 0cc4c60..ec75169 100644
--- a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
+++ b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
@@ -37,7 +37,6 @@ public interface PdaBindingMapper {
      * @param code
      * @return
      */
-    @DataSource(value = DataSourceType.SLAVE)
     List<HashMap<String, String>> selectPrintBarcode(String code);
 
     /**
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
index 0ff0889..984b890 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
@@ -103,6 +103,30 @@ public class BaseMaterialInfo extends BaseEntity
     @Excel(name = "SAP计划员")
     private String DISPO;
 
+    /** 商品编码 */
+    @Excel(name = "商品编码")
+    private String productCode;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    private String productName;
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
     public String getDISPO() {
         return DISPO;
     }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
index 1718988..a88c18c 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
@@ -23,6 +23,8 @@
         <result property="updatedTime"    column="updated_time"    />
         <result property="incrementDate"    column="increment_date"    />
         <result property="DISPO"    column="DISPO"    />
+        <result property="productCode"    column="product_code"    />
+        <result property="productName"    column="product_name"    />
     </resultMap>
 
     <sql id="selectBaseMaterialInfoVo">
@@ -45,7 +47,9 @@
                ml.created_by,
                ml.created_time,
                ml.updated_by,
-               ml.updated_time
+               ml.updated_time,
+               ml.product_code,
+               ml.product_name
         from base_materialinfo ml
                  left join base_factory bf on bf.factory_code = ml.plant_code
                  left join base_productline bpl on bpl.PRODUCT_LINE_CODE = ml.productline_code
@@ -69,6 +73,8 @@
             <if test="createdTime != null "> and ml.created_time = #{createdTime}</if>
             <if test="updatedBy != null  and updatedBy != ''"> and ml.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null "> and ml.updated_time = #{updatedTime}</if>
+            <if test="productCode != null  and productCode != ''"> and ml.product_code = #{productCode}</if>
+            <if test="productName != null  and productName != ''"> and ml.product_name = #{productName}</if>
         </where>
         order by ml.material_subclass, ml.increment_date desc
     </select>
@@ -102,6 +108,8 @@
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
             <if test="DISPO != null">DISPO,</if>
+            <if test="productCode != null">product_code,</if>
+            <if test="productName != null">product_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="objId != null">#{objId},</if>
@@ -122,6 +130,8 @@
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
             <if test="DISPO != null">#{DISPO},</if>
+            <if test="productCode != null">#{productCode},</if>
+            <if test="productName != null">#{productName},</if>
         </trim>
     </insert>
 
@@ -145,6 +155,8 @@
             <if test="updatedBy != null">updated_by = #{updatedBy},</if>
             <if test="updatedTime != null">updated_time = #{updatedTime},</if>
             <if test="DISPO != null">DISPO = #{DISPO},</if>
+            <if test="productCode != null">product_code = #{productCode},</if>
+            <if test="productName != null">product_name = #{productName},</if>
         </trim>
         where obj_id = #{objId}
     </update>
diff --git a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
index 78e70df..7a9c8c9 100644
--- a/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml
@@ -39,19 +39,34 @@
              ) SD
     </select>
     <select id="homeColumnarInterface" resultType="java.util.HashMap" parameterType="java.util.HashMap">
-        SELECT TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD')                            BEGIN_DATE,
-        bm.PRODUCT_LINE_CODE,
-        SUM(boi.COMPLETE_AMOUNT)                                         COMPLETE_AMOUNT,
-        ROUND(SUM(boi.COMPLETE_AMOUNT) / SUM(boi.ORDER_AMOUNT) * 100, 0) RATE
+        SELECT PL.PRODUCT_LINE_CODE,
+        day_of_week                                        BEGIN_DATE,
+        NVL(OFFLINE_SUM, 0)                                COMPLETE_AMOUNT,
+        ROUND(NVL(OFFLINE_SUM / ORDER_AMOUNT * 100, 0), 2) RATE
+        FROM (
+        SELECT day_of_week, PRODUCT_LINE_CODE
+        FROM (
+        SELECT TO_CHAR(TRUNC(SYSDATE, 'IW') + LEVEL - 1, 'YYYY-MM-DD') AS day_of_week
+        FROM DUAL
+        CONNECT BY LEVEL &lt;= 7) WK
+        CROSS JOIN BASE_PRODUCTLINE
+        WHERE PRODUCT_LINE_TYPE = 1) PL
+        LEFT JOIN (SELECT PRODUCT_LINE_CODE,
+        TO_CHAR(PRODUCT_SCANTIME, 'YYYY-MM-DD') PRODUCT_SCANTIME,
+        COUNT(*)                                OFFLINE_SUM
+        FROM C##AUCMA_SCADA.PRODUCT_OFFLINE
+        GROUP BY PRODUCT_LINE_CODE, TO_CHAR(PRODUCT_SCANTIME, 'YYYY-MM-DD')) OL
+        ON PL.PRODUCT_LINE_CODE = OL.PRODUCT_LINE_CODE AND
+        PL.day_of_week = OL.PRODUCT_SCANTIME
+        LEFT JOIN (SELECT PL.PRODUCT_LINE_CODE,
+        TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') BEGIN_DATE,
+        SUM(ORDER_AMOUNT)                     ORDER_AMOUNT
         FROM BASE_ORDERINFO boi
         JOIN BASE_MATERIALINFO bm ON bm.MATERIAL_CODE = boi.material_code AND bm.DISPO IN ('100')
-        JOIN BASE_PRODUCTLINE bm ON bm.WORK_CENTER_CODE = boi.WORK_CENTER_CODE
-        WHERE TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') IN
-        (SELECT TO_CHAR(TRUNC(SYSDATE, 'IW') + LEVEL - 1, 'YYYY-MM-DD') AS day_of_week
-        FROM DUAL
-        CONNECT BY LEVEL &lt;= 7)
-        GROUP BY TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD'), bm.PRODUCT_LINE_CODE
-        ORDER BY BEGIN_DATE
+        JOIN BASE_PRODUCTLINE PL ON PL.WORK_CENTER_CODE = boi.WORK_CENTER_CODE
+        GROUP BY PL.PRODUCT_LINE_CODE, TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD')) OD
+        ON OD.PRODUCT_LINE_CODE = OL.PRODUCT_LINE_CODE AND PL.day_of_week = OD.BEGIN_DATE
+        ORDER BY PRODUCT_LINE_CODE,BEGIN_DATE
     </select>
     <select id="homeLineInterface" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') BEGIN_DATE,
diff --git a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
index e8cabe2..a9e82ab 100644
--- a/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/BoxTemperatureHistoryMapper.xml
@@ -101,7 +101,7 @@
             <if test="syncDatetime != null ">and sync_datetime = #{syncDatetime}</if>
             <if test="frequency != null ">and frequency = #{frequency}</if>
         </where>
-        order by begindatetime
+        order by enddatetime DESC
     </select>
 
     <select id="selectBoxTemperatureHistoryByObjId" parameterType="Long" resultMap="BoxTemperatureHistoryResult">
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index 7fab9f1..9e35d87 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -173,7 +173,7 @@
         GROUP BY FY.FACTORY_NAME, BPP.PRODUCT_LINE_NAME, TO_CHAR(RQI.INSPECTOR_TIME, 'YYYY-MM-DD'),
         RQI.STATION_CODE, BP.PRODUCT_LINE_NAME, GET_MATERIAL_TYPE(RQI.MATERIAL_NAME),
         RQI.QUALITY_DEFECT_CODE, RQI.QUALITY_DEFECT_NAME
-        ORDER BY INSPECTOR_TIME DESC
+        ORDER BY DEFECT_NUMBER DESC
     </select>
     <select id="qualityIssuesReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT BF.FACTORY_NAME,