禅道问题修复

src/main/java/com/bonus/aqgqj/business/backstage/entity/OutPlanVo.java

@@ -114,5 +114,5 @@ public class OutPlanVo extends ParentVo {
     /**
      * 状态 0-暂存，1-提交
      */
-    private int editStatus;
+    private Integer editStatus;
 }

src/main/java/com/bonus/aqgqj/business/backstage/service/inventory/InventoryCountServiceImpl.java

@@ -45,7 +45,7 @@ public class InventoryCountServiceImpl implements InventoryCountService{
                         record -> record,
                         (existing, replacement) -> {
                             // 累加出库数量
-                            existing.setTotalCk(existing.getTotalCk() + replacement.getTotalCg() + replacement.getTotalLk());
+                            existing.setTotalCk( replacement.getTotalCg() + replacement.getTotalLk());
                             return existing;
                         }
                 ));

src/main/java/com/bonus/aqgqj/business/backstage/service/plan/PlanApplyServiceImpl.java

@@ -254,6 +254,7 @@ public class PlanApplyServiceImpl implements PlanApplyService {
                         nonExistList.add(planDevBean);
                     }else{
                         planDevBean.setId(bean.getId());
+                        planDevBean.setType(bean.getType());
                     }
                 }
                 // 如果存在数据库中不存在的数据，返回提示

src/main/resources/mappers/business/backstage/InventoryCountMapper.xml

@@ -12,16 +12,15 @@
         SUM(o.lk_num) AS totalLk,
         SUM(o.need_num) AS needNum, -- 需求数量
         SUM(o.cg_num + o.lk_num) as totalCk, -- 总出库数量
-        sct.price as price
+        (SELECT price FROM st_contract_type sct
+        JOIN st_plan_out_sup spos ON spos.details_id = o.id
+                      WHERE sct.model_id = o.model_id LIMIT 1) as price
         FROM
         st_plan_out_details o
         JOIN
         st_plan_out spo ON o.out_id = spo.id -- 关联出库表
         JOIN
         bm_project p ON spo.pro_id = p.ID -- 关联工程表
-
-        left join st_contract_type sct on o.model_id = sct.model_id
-
         where
         1=1
             <if test="keyWord != null and keyWord != ''">
@@ -34,7 +33,12 @@
             </if>
         GROUP BY
         p.ID,
-        o.model_id
+        o.model_id,
+        o.type,
+        o.`name`,
+        o.model,
+        o.unit,
+        p.`NAME`
     </select>
 
     <select id="getProjectBackListGroupModel" resultType="com.bonus.aqgqj.business.backstage.entity.ProjectMaterialLedger">

src/main/resources/mappers/business/backstage/PlanApplyMapper.xml

@@ -270,7 +270,7 @@
             AND INSTR(mt2.name,#{modelName}) > 0
         </if>
         <if test="model!=null and model!=''">
-            AND INSTR(mt.name,#{modelName}) > 0
+            AND INSTR(mt.name,#{model}) > 0
         </if>
     </select>
     <!--判断需求计划是否被修改-->
@@ -315,4 +315,4 @@
         WHERE
             bp.is_active = '1'
     </select>
-</mapper>
+</mapper>

src/main/resources/mappers/business/backstage/PurchaseMapper.xml

@@ -269,7 +269,7 @@
         select pod.type,pod.name,pod.model,pod.model_id modelId,spo.apply_id planId
         from st_plan_out spo
         left join st_plan_out_details pod on  spo.id=pod.out_id
-        where   spo.apply_id=#{planId} and pod.cg_num>0
+        where   spo.apply_id=#{planId}
         <if test="id!=null and id!=''">
             and  pod.id  in
                 <foreach item="item" index="index" collection="ids"  open="(" separator="," close=")">
@@ -277,7 +277,7 @@
                 </foreach>
         </if>
         <if test="keyWord!=null and keyWord!=''">
-                and  (pod.type like concat('%',#{keyWord},'%') or
+                and  (pod.name like concat('%',#{keyWord},'%') or
                       pod.model like concat('%',#{keyWord},'%')
                     )
         </if>