From 7e00d76df2b2bc6366815e909df7dadd6b7e809b Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Fri, 23 May 2025 14:55:28 +0800
Subject: [PATCH 1/7] =?UTF-8?q?wms=E7=94=A8=E4=BA=8E=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93-=E6=9F=A5=E8=AF=A2--?=
 =?UTF-8?q?=E6=9C=AA=E5=85=A5=E5=BA=93=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/wms/OdsProcureOrderMapper.xml      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
index d7e47fd12..9fe268efa 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
@@ -660,6 +660,7 @@
             ods_procure_order_card card
         WHERE
             card.Procure_Code= #{procureCode}
+        and User_Defined10='0'
     </select>
     <select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
         SELECT

From af7e888c21d0a5e0e911b3594c0f7d5d6adccc22 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 26 May 2025 17:02:09 +0800
Subject: [PATCH 2/7] =?UTF-8?q?wms=E7=94=A8=E4=BA=8E=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E6=97=B6=E6=9A=82=E6=94=B6=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index c74f126f3..d3c48ddda 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -1549,6 +1549,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             for (OdsProcureOrder  order :
                     orderList1) {
                 OdsProcureOrder order2 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getID());
+                result1=result2.getMsg();
                 order2.setSapTempInfor(result2.getMsg());
                 order2.setSapTempStatus("0");//0是失败。1是成功
                 odsProcureOrderMapper.updateOdsProcureOrder(order2);
@@ -1794,6 +1795,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public  List<OdsProcureOrder>  selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder) {
         //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
+
         List<OdsProcureOrder> orderList=  odsProcureOrderMapper.selectOdsProcureOrderCardTLTWO(odsProcureOrder);
         return orderList;
     }

From a204aaf8788660ce2983a52be4bb1a97ba7ec805 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 27 May 2025 08:45:13 +0800
Subject: [PATCH 3/7] =?UTF-8?q?wmshandleUpdateSAP105=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
index d3c48ddda..f311d4f63 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
@@ -3288,6 +3288,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
      * @return
      */
     @Override
+    @DS("#header.poolName")
     public String handleUpdateSAP105(List<OdsProcureOrder> odsProcureOrders) {
         String   result="操作成功";
         for (OdsProcureOrder    order:   odsProcureOrders){

From 6c64b4cd8ecb0605cb1887801afde10ee1864087 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 27 May 2025 22:24:16 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=8B=E6=8C=8115=E5=A4=A9=E5=86=85?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quality/QcCheckTypeMapper.xml         | 16 ++++++++++++++++
 .../mapper/quality/QcProCheckMapper.xml          |  7 +++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml
index 17d639b7e..39e3cd957 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml
@@ -54,7 +54,23 @@
                     CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
                 or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)
             )
+		  and qct.check_type != 'checkTypeCP'
 		group by qct.check_type,qc.check_name
+        union all
+        select qct.check_type checkType,
+               qc.check_name checkName,
+               count(0) taskNum,
+               '检验任务' attr1
+        from qc_check_task qct
+                 left join qc_check_type qc on qct.check_type = qc.order_code
+                 left join qc_check_task_user qctu on qctu.belong_to = qct.record_id
+        where qct.check_status = '0' and qctu.check_man_code = #{checkManCode}
+          and (
+                    CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+                or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120)
+            )
+          and qct.check_type = 'checkTypeCP'
+        group by qct.check_type,qc.check_name
         union all
 		select '','',
 		       count(0) taskNum,
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
index bfabb4ed2..65e5fece7 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
@@ -286,8 +286,11 @@
                  qct.material_code like concat('%', #{materialCode},'%') or qct.material_name like concat('%', #{materialCode},'%')
                 )
             </if>
-            <if test='delFlag == "0"'>
-            and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+            <if test='delFlag == "0" and checkType!="checkTypeCP"'>
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+            </if>
+            <if test='delFlag == "0" and checkType=="checkTypeCP"'>
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120))
             </if>
         </where>
         order by qct.create_time desc

From 57c464660eccbea6ce91493e77e7b47005e33e9a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 28 May 2025 22:03:35 +0800
Subject: [PATCH 5/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op-open/src/main/resources/mapper/open/OpenMapper.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
index 951ae2ea4..95f11ac74 100644
--- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
+++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml
@@ -212,7 +212,7 @@
         <!--,qcp.check_standard checkStandard-->
         from qc_check_type_project qctp
         left join qc_check_project qcp on qcp.id = qctp.project_id
-        where qctp.del_flag = '0' and qctp.status = '1'
+        where qctp.del_flag = '0' and qcp.del_flag = '0'
         and qctp.group_id = #{groupId}
         and qctp.type_id = #{typeId}
         order by qctp.sort

From 65a34e162d3b461786081e8f5ab77a7d4ed89146 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 30 May 2025 14:54:16 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=80=B3=E6=9C=BA=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/quality/service/impl/QcStaticTableServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/quality/QcStaticTableMapper.xml  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
index c8caaac1d..2d157333a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
@@ -313,7 +313,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
 
         String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo());
-        if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){
+        if(StringUtils.isBlank(groupId)){
             groupId = "3dc0655fea3449c59c76a01cc5b91565";
         }
         qcStaticTable.setGroupId(groupId);
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 1dacab47d..4c0ff7ef0 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
@@ -1400,9 +1400,10 @@
              ) t group by t.ymdms
     </select>
     <select id="getGroupIdByOrderNo" resultType="java.lang.String">
-        select bp.mvgr5
+        select qmg.id
         from pro_order_workorder pow
                  left join base_product bp on bp.product_code = pow.product_code
+                 left join qc_material_group qmg on qmg.group_code = bp.mvgr5
         where pow.workorder_code = #{orderNo}
     </select>
 

From d1bc12641bfa13f618827bc064858d57891f1bb9 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 30 May 2025 15:53:49 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=80=B3=E6=9C=BA=E5=B7=A1=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/quality/QcCheckReportIncomeMapper.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
index 4f7fd718e..c6e089665 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
@@ -181,6 +181,7 @@
 		left join qc_check_project qcp on qcp.id = qctp.project_id
 		left join qc_project_type qpt on qpt.project_type_code = qcp.project_type
         where td.belong_to = #{recordId}
+          and td.del_flag = '0' and qctp.del_flag = '0' and qcp.del_flag = '0' and qpt.del_flag = '0'
         order by qctp.sort
 	</select>
     <select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">