更新：1、报表新增表面处理、颜色

2、新增关联其他车间的订单

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic"
+}

common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -1,16 +1,14 @@
 package com.ruoyi.common.core.domain.entity;
 
-import java.util.ArrayList;
+import com.ruoyi.common.core.domain.BaseEntity;
-import java.util.List;
+import lombok.Data;
+
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-
+import java.util.ArrayList;
-import lombok.Data;
+import java.util.List;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept
@@ -67,6 +65,10 @@ public class SysDept extends BaseEntity
     // ERP部门编码
     private String erpNumber;
 
+    // 订单部门ID
+    private List<Long> orderDeptIds;
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -49,7 +48,7 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 部门信息集合
      */
     @Override
-    @DataScope(deptAlias = "d")
+    // @DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(SysDeptQuery query)
     {
         return deptMapper.selectDeptList(query);

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/price/domain/PriceVO.java

@@ -18,4 +18,5 @@ public class PriceVO extends Price {
     @ApiModelProperty("部门名称")
     private String deptName;
 
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/prodOrder/domain/ProdOrderQuery.java

@@ -30,4 +30,7 @@ public class ProdOrderQuery extends ProdOrderVO {
     @ApiModelProperty("排除的ID列表")
     private List<Long> excludeIds;
 
+    @ApiModelProperty("用户部门ID")
+    private Long userDeptId;
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/prodOrder/mapper/ProdOrderMapper.xml

@@ -104,9 +104,22 @@
                 #{item}
             </foreach>
         </if>
-        ${query.params.dataScope}
+        AND ( 1=1 ${query.params.dataScope}
+            <if test="query.userDeptId != null">
+                OR (
+                    <!-- 订单自定义条件 -->
+                    EXISTS (
+                        SELECT 1 
+                        FROM sys_dept d 
+                        WHERE d.dept_id = #{query.userDeptId} 
+                        AND FIND_IN_SET(bpo.dept_id, d.order_dept_ids)
+                    )
+                )
+            </if>
+        )
     </sql>
 
+
     <select id="selectProdOrderList" parameterType="ProdOrderQuery" resultMap="ProdOrderResult">
         <include refid="selectProdOrderVo"/>
         <where>

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/domain/ReportProd.java

@@ -109,4 +109,8 @@ public class ReportProd extends BaseEntity
     @Excel(name = "表面处理")
     @ApiModelProperty("表面处理")
     private String surface;
+
+    @Excel(name = "颜色")
+    @ApiModelProperty("颜色")
+    private String color;
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/mapper/ReportProdMapper.xml

@@ -32,11 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             brp.price_code,
             brp.total_amount,
             brp.surface,
+            brp.color,
             bp.dept_id as price_dept_id,
             br.status as report_status,
             sd.dept_name as price_dept_name
         from bst_report_prod brp
             left join bst_report br on br.report_id = brp.report_id
+
             left join bst_price bp on bp.price_id = brp.price_id
             left join sys_dept sd on sd.dept_id = bp.dept_id
     </sql>
@@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.reportStatus != null and query.reportStatus != ''">and br.status = #{query.reportStatus}</if>
         <if test="query.priceCode != null and query.priceCode != ''">and brp.price_code like concat('%', #{query.priceCode}, '%')</if>
         <if test="query.surface != null  and query.surface != ''"> and brp.surface = like concat('%', #{query.surface}, '%')</if>
+        <if test="query.color != null  and query.color != ''"> and brp.color = like concat('%', #{query.color}, '%')</if>
         <if test="query.reportIds != null and query.reportIds.size() > 0">
             and brp.report_id in
             <foreach collection="query.reportIds" item="item" open="(" close=")" separator=",">
@@ -107,9 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalAmount != null">total_amount,</if>
             <if test="priceCode != null">price_code,</if>
             <if test="surface != null">surface,</if>
+            <if test="color != null">color,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="reportId != null">#{reportId},</if>
+
             <if test="priceId != null">#{priceId},</if>
             <if test="num != null">#{num},</if>
             <if test="defectNum != null">#{defectNum},</if>
@@ -129,9 +134,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalAmount != null">#{totalAmount},</if>
             <if test="priceCode != null">#{priceCode},</if>
             <if test="surface != null">#{surface},</if>
+            <if test="color != null">#{color},</if>
          </trim>
     </insert>
 
+
     <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id">
         insert into bst_report_prod(
             report_id,
@@ -153,9 +160,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             remark,
             total_amount,
             price_code,
-            surface
+            surface,
+            color
         )
         values
+
         <foreach collection="list" item="i" separator=",">
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="i.reportId != null">#{i.reportId},</if>
@@ -198,8 +207,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="i.priceCode == null">default,</if>
                 <if test="i.surface != null ">#{i.surface},</if>
                 <if test="i.surface == null ">default,</if>
+                <if test="i.color != null">#{i.color},</if>
+                <if test="i.color == null">default,</if>
             </trim>
         </foreach>
+
     </insert>
 
     <update id="updateReportProd" parameterType="ReportProd">
@@ -231,8 +243,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.totalAmount != null">total_amount = #{data.totalAmount},</if>
         <if test="data.priceCode != null">price_code = #{data.priceCode},</if>
         <if test="data.surface != null">surface = #{data.surface},</if>
+        <if test="data.color != null">color = #{data.color},</if>
     </sql>
 
+
     <update id="batchUpdate">
         update bst_report_prod
         <trim prefix="SET" suffixOverrides=",">
@@ -436,9 +450,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </otherwise>
                 </choose>
             </foreach>
+            <foreach open="color = CASE id" collection="list" item="item" close="END,">
+                <choose>
+                    <when test="item.color != null">
+                        WHEN #{item.id} THEN #{item.color}
+                    </when>
+                    <otherwise>
+                        WHEN #{item.id} THEN `color`
+                    </otherwise>
+                </choose>
+            </foreach>
         </trim>
         where id in
         <foreach item="item" collection="list" open="(" separator="," close=")">
+
             #{item.id}
         </foreach>
     </update>

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/yh/reportProd/service/impl/ReportProdConverterImpl.java

@@ -54,6 +54,7 @@ public class ReportProdConverterImpl implements ReportProdConverter {
         bo.setDefectNum(vo.getDefectNum());
         bo.setPriceCode(vo.getPriceCode());
         bo.setSurface(vo.getSurface());
+        bo.setColor(vo.getColor());
         bo.setTotalAmount(vo.getPricePrice().multiply(vo.getNum().add(vo.getDefectNum())));
 
         // 用户产量明细
@@ -106,6 +107,7 @@ public class ReportProdConverterImpl implements ReportProdConverter {
         bo.setDefectNum(vo.getDefectNum());
         bo.setPriceCode(vo.getPriceCode());
         bo.setSurface(vo.getSurface());
+        bo.setColor(vo.getColor());
         bo.setTotalAmount(vo.getPricePrice().multiply(vo.getNum().add(vo.getDefectNum())));
 
         // 用户产量明细

common-ruoyi/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -4,10 +4,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
-	<resultMap type="SysDept" id="SysDeptResult" autoMapping="true"/>
+	<resultMap type="SysDept" id="SysDeptResult" autoMapping="true">
+		<result property="orderDeptIds" column="order_dept_ids" typeHandler="com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler"/>
+	</resultMap>
 
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.erp_id, d.erp_number
+        select 
+					d.dept_id,
+					d.parent_id,
+					d.ancestors, 
+					d.dept_name, 
+					d.order_num, 
+					d.leader, 
+					d.phone, 
+					d.email, 
+					d.status, 
+					d.del_flag, 
+					d.create_by, 
+					d.create_time, 
+					d.erp_id, 
+					d.erp_number,
+					d.order_dept_ids
         from sys_dept d
     </sql>
 
@@ -46,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by d.parent_id, d.order_num
     </select>
 
-    <select id="selectDeptListByRoleId" resultType="Long">
+	<select id="selectDeptListByRoleId" resultType="Long">
 		select d.dept_id
 		from sys_dept d
             left join sys_role_dept rd on d.dept_id = rd.dept_id
@@ -57,8 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by d.parent_id, d.order_num
 	</select>
 
-    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
+	<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.erp_id, d.erp_number,
+			d.order_dept_ids,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
@@ -101,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="erpId != null and erpId != ''">erp_id,</if>
  			<if test="erpNumber != null and erpNumber != ''">erp_number,</if>
+ 			<if test="orderDeptIds != null and orderDeptIds.size() > 0">order_dept_ids,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -115,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="erpId != null and erpId != ''">#{erpId},</if>
  			<if test="erpNumber != null and erpNumber != ''">#{erpNumber},</if>
+ 			<if test="orderDeptIds != null and orderDeptIds.size() > 0">#{orderDeptIds, typeHandler=com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler},</if>
  			sysdate()
  		)
 	</insert>
@@ -133,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="erpId != null and erpId != ''">erp_id = #{erpId},</if>
  			<if test="erpNumber != null and erpNumber != ''">erp_number = #{erpNumber},</if>
+ 			<if test="orderDeptIds != null and orderDeptIds.size() > 0">order_dept_ids = #{orderDeptIds, typeHandler=com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}

ruoyi-web/src/main/java/com/ruoyi/web/yh/ProdOrderController.java

@@ -43,6 +43,7 @@ public class ProdOrderController extends BaseController
     {
         startPage();
         startOrderBy();
+        query.setUserDeptId(getDeptId());
         List<ProdOrderVO> list = prodOrderService.selectProdOrderList(query);
         return getDataTable(list);
     }
@@ -55,6 +56,7 @@ public class ProdOrderController extends BaseController
     {
         ProdOrderQuery query = new ProdOrderQuery();
         query.setIds(ids);
+        query.setUserDeptId(getDeptId());
         List<ProdOrderVO> list = prodOrderService.selectProdOrderList(query);
         return success(list);
     }