From 3870cf443bf0dfd9394bc545c8e90ac0d6dacaeb Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 17:55:05 +0800
Subject: [PATCH] 上料实体类调整、物料消耗明细基础代码、报工接口适配调整(适配上料表结构调整、并记录物料消耗明细)

---
 src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml
index cb85843..ce54435 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/ShiftMapper.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.base.mapper.ShiftMapper">
 
+    <select id="selectShiftListByFactoryId" resultType="org.jeecg.modules.base.entity.Shift">
+        select
+            t1.*,
+            t2.id as group_id
+        from base_shift t1
+        inner join base_shift_group t2 on t1.id = t2.shift_id
+        where t1.del_flag = 0 and t1.shift_status = '1' and t2.del_flag = 0 and t2.factory_id = #{factoryId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3