From 1175a6ad5c6537a17393bfa5835bce1753cfcfa6 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 13 Nov 2024 09:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/mes/service/impl/IWCInterfaceServiceImpl.java   | 5 +++--
 .../op-mes/src/main/resources/mapper/mes/MesMapper.xml     | 7 ++++---
 .../java/com/op/quality/domain/QcCheckTaskWarehousing.java | 4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
index 258bdeee..7121c18b 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
@@ -538,9 +538,10 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                     if(reportRate != null){
                         BigDecimal newQuantity = bottomQua.divide(reportRate,2, RoundingMode.HALF_UP);
                         sHzWorks.setQuantityFeedback(newQuantity);
-                    }else{
-                        sHzWorks.setQuantityFeedback(sHzWorks.getQuantityFeedback());
                     }
+//                    else{
+//                        sHzWorks.setQuantityFeedback(sHzWorks.getQuantityFeedback());
+//                    }
                 }
                 sHzWorks.setMachineCode(mesReportWork.getMachineCode());
                 sapRson = this.reportHzToSap3(sHzWorks);
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 1401cb72..1b23c6a4 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
@@ -119,13 +119,14 @@
         from mes_material_transfer_result mt
         left join base_equipment equ on mt.equipmentCode = equ.equipment_code
         where CONVERT(varchar(10),mt.update_time, 120) = #{ymd} and equ.equipment_name is not null
-        and equ.equipment_type_code = #{equTypeCode}
+        and equ.equipment_type_code = #{equTypeCode} and mt.equipmentCode not in('H61','H62','H63')
         <if test="shiftId != null  and shiftId != ''">
             and mt.shift_id = #{shiftId}
         </if>
         group by mt.equipmentCode,
         equ.equipment_name,
         equ.equipment_type_code
+        order by equ.equipment_name
     </select>
     <select id="getBoardFactory" resultType="com.op.system.api.domain.SysDept">
         select SUBSTRING(pool_name, 4, 6) parentName,
@@ -154,14 +155,14 @@
         from mes_material_transfer_result mt
         left join base_equipment equ on mt.equipmentCode = equ.equipment_code
         where CONVERT(varchar(10),mt.create_time, 120) = #{ymd} and equ.equipment_name is not null
-        and equ.equipment_type_code = #{equTypeCode} and mt.status = 2 and mt.equipmentCode not in('H61','H62','H63')
+        and equ.equipment_type_code = #{equTypeCode} and mt.status = 2
         <if test="shiftId != null  and shiftId != ''">
             and mt.shift_id = #{shiftId}
         </if>
         group by mt.equipmentCode,
         equ.equipment_name,
         equ.equipment_type_code
-        order by mt.equipmentCode
+        order by equ.equipment_name
     </select>
     <!--创建新表-->
     <insert id="createNewTable">
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java
index 28031e25..bce2ac97 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java
@@ -133,25 +133,21 @@ public class QcCheckTaskWarehousing extends BaseEntity {
     /**
      * 预留字段1
      */
-    @Excel(name = "预留字段1")
     private String attr1;
 
     /**
      * 预留字段2
      */
-    @Excel(name = "预留字段2")
     private String attr2;
 
     /**
      * 预留字段3
      */
-    @Excel(name = "预留字段3")
     private String attr3;
 
     /**
      * 预留字段4
      */
-    @Excel(name = "预留字段4")
     private String attr4;
 
     /**