From 8b746e482fea845bd6d044d609acc2763783d0bd Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 27 八月 2025 12:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml
index ba0e018..9a52484 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.mes.mapper.MesKittingCompletenessCheckMapper">
-
+    <select id="queryCompletenessCheckByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesKittingCompletenessCheck">
+        select mkcc.*,mpwo.work_order_code as workOrderCode from mes_kitting_completeness_check mkcc
+                 left join mes_production_work_order mpwo on mkcc.work_order_id = mpwo.id
+                 where mkcc.work_order_id = #{workOrderId}
+    </select>
+    <select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesKittingCompletenessCheck">
+        SELECT
+            t1.*,
+            t2.work_order_code workOrderCode
+        FROM mes_kitting_completeness_check t1
+        LEFT JOIN mes_production_work_order t2 ON t1.work_order_id = t2.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3