甲供材报审导致超欠供明细展示错误修复

src/main/java/com/jeeplus/modules/supply/particulars/mapper/xml/SupplyParticularsMapper.xml

@@ -60,12 +60,22 @@
         from supply_stock_out a
         left join material_library ml on ml.material_code = a.material_number
         <where>
-            <if test="projectDefinitionList.size>0">
-                and a.project_definition in
-                <foreach collection="projectDefinitionList" item="projectDefinition" index="index" open="(" separator="," close=")">
-                    #{projectDefinition}
-                </foreach>
-            </if>
+            <choose>
+                <when test="null != submittalsId and '' != submittalsId">
+                    and a.project_definition in (select project_definition from supply_stock_out where submittals_id = #{submittalsId} )
+                    and (a.submittals_id is null or a.submittals_id = '')
+                </when>
+                <otherwise>
+                    <if test="projectDefinitionList.size>0">
+                        and a.project_definition in
+                        <foreach collection="projectDefinitionList" item="projectDefinition" index="index" open="(" separator="," close=")">
+                            #{projectDefinition}
+                        </foreach>
+                    </if>
+                    and (a.submittals_id is null or a.submittals_id = '')
+                </otherwise>
+            </choose>
+
         </where>
         order by a.project_definition asc,a.actual_quantity_issued desc,a.posting_account_date asc
     </select>

src/main/java/com/jeeplus/modules/supply/particulars/service/SupplyParticularsService.java

@@ -63,7 +63,14 @@ public class SupplyParticularsService extends CrudService<SupplyParticularsMappe
 
 
         //根据项目定义号查询出库表信息
-        List<SupplyStockOut> supplyStockOutList = mapper.getSupplyStockOutList(projectDefinitionList,supplyParticulars.getSubmittalsId());
+        List<SupplyStockOut> supplyStockOutList;
+        //判定送审id是否为空
+        //不为空则先通过送审id查询出库单中对应的项目定义号的信息
+        if(StringUtils.isNotBlank(supplyParticulars.getSubmittalsId())){
+            supplyStockOutList = mapper.getSupplyStockOutList(projectDefinitionList,supplyParticulars.getSubmittalsId());
+        }else{
+            supplyStockOutList = mapper.getSupplyStockOutList(projectDefinitionList,supplyParticulars.getSubmittalsId());
+        }
         //对出库单数据进行分组
         Map<String, List<SupplyStockOut>> supplyStockOutListMap = this.groupSupplyStockOut(supplyStockOutList);
         //查询审定单中的数据信息

src/main/java/com/jeeplus/modules/supply/stockOut/mapper/xml/SupplyStockOutMapper.xml

@@ -60,6 +60,7 @@
         FROM supply_stock_out a
         <where>
             a.del_flag = #{DEL_FLAG_NORMAL}
+            and (a.submittals_id is null or a.submittals_id = '')
             ${dataScope}
             <if test="projectDefinition != null and projectDefinition != ''">
                 AND a.project_definition LIKE CONCAT('%',#{projectDefinition},'%')