bug修复

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java

@@ -84,24 +84,7 @@ public class StorageStatusController extends BaseController {
         Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
         Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
         List<MaType> list = storageStatusMapper.getUserRecords(bean);
-        if (CollectionUtils.isNotEmpty(list)) {
+        // 针对于预报废驳回数据，进行数据追加,待定
-            Iterator<MaType> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                MaType type = iterator.next();
-                if (type.getBackId() == null) {
-                    continue;
-                }
-                // 根据退料id及类型查询设备状态
-                List<MaType> typeList = storageStatusMapper.getTypeList(type);
-                if (CollectionUtils.isNotEmpty(typeList)) {
-                    for (MaType maType1 : typeList) {
-                        if ("1".equals(maType1.getIsFinished()) && type.getNum().equals(maType1.getNum())) {
-                            iterator.remove();
-                        }
-                    }
-                }
-            }
-        }
         return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
     }
 

sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml

@@ -1120,7 +1120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
         WHERE
             EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId}
-                                                             AND sai2.STATUS = '0' and sai2.num > 0)
+                                                             AND sai2.STATUS = '0' and sai2.num > 0 and sai2.end_time IS NULL)
         GROUP BY
             mt.type_id
     </select>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -493,7 +493,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getRepartList" resultType="com.bonus.sgzb.material.domain.RepairPart">
         select
         part_num as partNum,
-        part_price as partCost,
+        part_price as partPrice,
+        IFNULL(part_price, 0) * IFNULL(part_num, 0) AS partCost,
         part_type as partType,
         part_name as partName,
         remark as remark,

sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml

@@ -57,8 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         IFNULL( subquery2.backNum, 0 ) AS backNum,
         CASE
 
-        WHEN IFNULL( subquery1.outNum, 0 ) - IFNULL( subquery2.backNum, 0 ) + IFNULL( subquery3.backNum, 0 ) > 0 THEN
+        WHEN IFNULL( subquery1.outNum, 0 ) - IFNULL( subquery2.backNum, 0 )  > 0 THEN
-        IFNULL( subquery1.outNum, 0 ) - IFNULL( subquery2.backNum, 0 ) + IFNULL( subquery3.backNum, 0 ) ELSE 0
+        IFNULL( subquery1.outNum, 0 ) - IFNULL( subquery2.backNum, 0 )  ELSE 0
         END AS usNum
         FROM
         (
@@ -88,28 +88,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
         LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
         LEFT JOIN back_apply_info ba ON bcd.parent_id = ba.id
-        WHERE bcd.is_finished IS NOT NULL and bcd.is_finished = '1'
+        -- WHERE bcd.is_finished IS NOT NULL and bcd.is_finished = '1'
         GROUP BY
         mt.type_id
         ) AS subquery2 ON subquery1.type_id = subquery2.type_id
-        LEFT JOIN (
+        /*LEFT JOIN (
         SELECT
         mt.type_id,
         mt2.type_name AS typeName,
         mt.type_name AS typeModelName,
         SUM(
-        IFNULL( bcd.back_num, 0 )) backNum
+        IFNULL( bcd.pre_num, 0 )) backNum
         FROM
-        back_check_details bcd
+        back_apply_details bcd
         LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
-        LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
         LEFT JOIN back_apply_info ba ON bcd.parent_id = ba.id
-        WHERE (bcd.is_finished IS NULL OR bcd.is_finished = '0')
+        WHERE ba.back_source = '1'
-        and ba.back_source = '1'
         GROUP BY
         mt.type_id
-        ) AS subquery3 ON subquery3.type_id = subquery2.type_id
+        ) AS subquery3 ON subquery3.type_id = subquery2.type_id*/
         ) AS subquery1 ON mt.type_id = subquery1.type_id
         LEFT JOIN (
         SELECT
@@ -207,27 +205,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getUserRecords" resultType="com.bonus.sgzb.base.api.domain.MaType">
         SELECT
-            bpl.lot_name proName,
+            mm.ma_id as maId,
-            mt.type_name modelName,
+            subquery1.proName as proName,
-            mt2.type_name typeName,
-            sai.num as num,
             mm.ma_code as maCode,
-            sai.back_id as backId,
+            mt.type_name as modelName,
-            sai.type_id as typeId,
+            mt2.type_name as typeName,
-            sai.ma_id as maId
+            IFNULL(subquery1.outNum, 0) - IFNULL(subquery2.backNum, 0) as num
         FROM
-            slt_agreement_info sai
+            (
-                LEFT JOIN bm_agreement_info bai ON sai.agreement_id = bai.agreement_id
+                SELECT
-                LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id
+                    lod.ma_id AS maId,
-                LEFT JOIN ma_type mt on mt.type_id = sai.type_id
+                    mt.type_id,
-                LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+                    SUM(IFNULL(lod.out_num, 0)) AS outNum,
-                LEFT JOIN ma_machine mm on mm.ma_id = sai.ma_id
+                    bpl.lot_name proName
-                LEFT JOIN back_check_details bcd ON sai.back_id = bcd.parent_id
+                FROM
-                AND sai.type_id = bcd.type_id
+                    lease_out_details lod
-                AND (sai.ma_id IS NULL OR sai.ma_id = bcd.ma_id)
+                        LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
+                        LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id
+                        LEFT JOIN tm_task_agreement tta on lai.task_id = tta.task_id
+                        LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+                        LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id
+                WHERE
+                    mt.type_id = #{typeId}
+                GROUP BY
+                    lod.ma_id, mt.type_id
+            ) AS subquery1
+                LEFT JOIN
+            (
+                SELECT
+                    bcd.ma_id AS maId,
+                    mt.type_id,
+                    SUM(IFNULL(bcd.back_num, 0)) AS backNum
+                FROM
+                    back_check_details bcd
+                        LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
+                WHERE
+                    mt.type_id = #{typeId}
+                GROUP BY
+                    bcd.ma_id, mt.type_id
+            ) AS subquery2 ON subquery1.maId = subquery2.maId
+                LEFT JOIN ma_type mt ON mt.type_id = subquery1.type_id
+                LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
+                LEFT JOIN ma_machine mm ON mm.ma_id = subquery1.maId
         WHERE
-            sai.type_id = #{typeId}
+            mt.manage_type = 0
-          AND (bcd.is_finished IS NULL OR bcd.is_finished = '0')
+          AND mt.del_flag = 0
+          AND IFNULL(subquery1.outNum, 0) - IFNULL(subquery2.backNum, 0) > 0
     </select>
     <select id="getzk" resultType="java.lang.Integer">
         SELECT