From a7b2989873bf6f49103a3f19f94c5a7ef2d4513a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 8 Oct 2024 17:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/quality/domain/QcStaticTable.java   | 18 ++++++++++++++++++
 .../mapper/quality/QcStaticTableMapper.xml     |  5 +++--
 .../resources/mapper/wms/BaseProductMapper.xml |  9 ++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
index aa3f91bb..f45fb9e6 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
@@ -114,6 +114,24 @@ public class QcStaticTable extends BaseEntity {
     private BigDecimal downDiff;
     private List<String> columns1;
     private List<String> columns2;
+    private String incomeTimeStart;
+    private String incomeTimeEnd;
+
+    public String getIncomeTimeStart() {
+        return incomeTimeStart;
+    }
+
+    public void setIncomeTimeStart(String incomeTimeStart) {
+        this.incomeTimeStart = incomeTimeStart;
+    }
+
+    public String getIncomeTimeEnd() {
+        return incomeTimeEnd;
+    }
+
+    public void setIncomeTimeEnd(String incomeTimeEnd) {
+        this.incomeTimeEnd = incomeTimeEnd;
+    }
 
     public Double getNoOkBatchRateVal() {
         return noOkBatchRateVal;
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index 7196a980..d95decb8 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -201,8 +201,9 @@
         <if test="orderNo != null ">and qct.check_no like concat('%',#{orderNo},'%')</if>
         <if test="materialCode != null ">and qct.material_code like concat('%',#{materialCode},'%')</if>
         <if test="incomeBatchNo != null ">and qct.income_batch_no like concat('%',#{incomeBatchNo},'%')</if>
-        <if test="incomeTimeStr != null ">and CONVERT(varchar(10),pow.product_date, 120) = #{incomeTimeStr}
-        </if>
+        <if test="incomeTimeStr != null ">and CONVERT(varchar(10),pow.product_date, 120) = #{incomeTimeStr}</if>
+        <if test="incomeTimeStart != null ">and CONVERT(varchar(30),qct.income_time, 120) >= #{incomeTimeStart}</if>
+        <if test="incomeTimeEnd != null ">and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120)</if>
         order by pow.product_date desc
     </select>
     <select id="getXJProjects" resultType="com.op.quality.domain.QcStaticTable">
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
index b2f48290..2d3bda45 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml
@@ -65,6 +65,7 @@
         <result property="supportPlate" column="support_plate"/>
         <result property="other" column="other"/>
         <result property="reportRate" column="report_rate"/>
+        <result property="mvgr5" column="mvgr5"/>
         <result property="mvgr5Nm" column="mvgr5_nm"/>
         <result property="palletNum" column="palletNum"/>
         <result property="warehouseCycle" column="warehouse_cycle"/>
@@ -74,7 +75,12 @@
     </resultMap>
 
     <sql id="selectBaseProductVo">
-		select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent, mtart, report_rate from base_product
+		select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code,
+		       parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume,
+		       unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4,
+		       user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag,
+		       sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag,
+		       append_percent, mtart, report_rate,mvgr5 from base_product
 	</sql>
 
     <select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">
@@ -118,6 +124,7 @@
             <if test="appendPercent != null  and appendPercent != ''">and append_percent = #{appendPercent}</if>
             <if test="mtart != null  and mtart != ''">and mtart = #{mtart}</if>
             <if test="reportRate != null  and reportRate != ''">and report_rate = #{reportRate}</if>
+            <if test="mvgr5 != null  and mvgr5 != ''">and mvgr5 like concat('%', #{mvgr5},'%') </if>
             and del_flag = '0'
         </where>
         order by product_code asc