From c622a473d6f2585acb5894b42288dccc0d645c88 Mon Sep 17 00:00:00 2001
From: youjianchi <youjianchi11000>
Date: Thu, 11 Apr 2024 20:52:24 +0800
Subject: [PATCH] =?UTF-8?q?[feat]:=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../todoitem/mapper/BizTodoItemMapper.java    |  2 +-
 .../system/domain/SysSalesOrderChild.java     | 10 ++++++++
 .../system/SysSalesOrderChildMapper.xml       | 25 +++++++++++--------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java
index cc24e081..637be109 100644
--- a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java
+++ b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java
@@ -71,7 +71,7 @@ public interface BizTodoItemMapper {
     
     public List<BizTodoItem> getTodoItemListNoPaging(Map<String, Object> paraMap);
 
-    @Select("SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ = (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})")
+    @Select("SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ in (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})")
     List<String> selectTodoUserListByTaskId(@Param(value = "taskId") String taskId);
 
     @Select("SELECT * FROM BIZ_TODO_ITEM WHERE TASK_ID = #{taskId} AND TODO_USER_ID = #{todoUserId}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
index 79e41f40..465dfbc0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
@@ -128,6 +128,8 @@ public class SysSalesOrderChild extends BaseEntity {
     @Excel(name = "未出库数量")
     private Integer unBoundQuantity;
 
+    private String bomId;
+
     public Long getId() {
         return id;
     }
@@ -393,6 +395,14 @@ public class SysSalesOrderChild extends BaseEntity {
         this.unBoundQuantity = unBoundQuantity;
     }
 
+    public String getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(String bomId) {
+        this.bomId = bomId;
+    }
+
     @Override
     public String toString() {
         return Objects.toStringHelper(this)
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
index 3e84ab3f..1b1c3830 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
@@ -36,30 +36,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"               column="remark"                 />
         <result property="useStatus"            column="use_status"             />
         <result property="auditStatus"          column="audit_status"           />
+        <result property="bomId"                column="bom_id"                 />
     </resultMap>
 
     <sql id="selectSysSalesOrderChild">
-        select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl,,unit, `describe`,
-               countTax, usdTax, materialNum,materialSole, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum,
-               materialNoUsdSum, materialNoRmbSum, materialRmbSum,out_bound_quantity, un_bound_quantity, create_by, create_time, update_by,
-               update_time, remark, use_status,audit_status from sys_sales_order_child
+        select a.id, a.quoteId, a.materialId, a.materialCode, a.materialName, a.materialType, a.processMethod, a.brand, a.photoUrl,a.unit, a.`describe`,
+            a.countTax, a.usdTax, a.materialNum,a.materialSole, a.materialRmb, a.materialNoRmb, a.materialNoUsd, a.materialUsd, a.materialUsdSum,
+            a.materialNoUsdSum, a.materialNoRmbSum, a.materialRmbSum,a.out_bound_quantity, a.un_bound_quantity, a.create_by, a.create_time, a.update_by,
+            a.update_time, a.remark, a.use_status,a.audit_status
+            ,b.id as bom_id
+        from sys_sales_order_child a
+        left join erp_bom b
+        on a.materialCode = b.material_no
     </sql>
     <select id="selectSysSalesOrderChildList" parameterType="SysSalesOrderChild" resultMap="SysSalesOrderChildResult">
         <include refid="selectSysSalesOrderChild"/>
         <where>  
-            <if test="quoteId != null and quoteId !='' "> and quoteId = #{quoteId}</if>
-            <if test="materialId != null "> and materialId = #{materialId}</if>
-            <if test="materialCode != null  and materialCode != ''"> and materialCode like concat('%', #{#{materialCode}}, '%')</if>
-            <if test="materialName != null  and materialName != ''"> and materialName like concat('%', #{materialName}, '%')</if>
+            <if test="quoteId != null and quoteId !='' "> and a.quoteId = #{quoteId}</if>
+            <if test="materialId != null "> and a.materialId = #{materialId}</if>
+            <if test="materialCode != null  and materialCode != ''"> and a.materialCode like concat('%', #{#{materialCode}}, '%')</if>
+            <if test="materialName != null  and materialName != ''"> and a.materialName like concat('%', #{materialName}, '%')</if>
         </where>
     </select>
     <select id="selectSysSalesOrderChildById" parameterType="Long" resultMap="SysSalesOrderChildResult">
         <include refid="selectSysSalesOrderChild"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
     <select id="selectSysSalesOrderChildByQuoteId" parameterType="String" resultMap="SysSalesOrderChildResult">
         <include refid="selectSysSalesOrderChild"/>
-        where quoteId = #{quoteId}
+        where a.quoteId = #{quoteId}
     </select>
     <insert id="insertSysSalesOrderChild" parameterType="SysSalesOrderChild" useGeneratedKeys="true" keyProperty="id">
         insert into sys_sales_order_child