Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

- 在ApsPlanDetailMapper中新增deleteByPlanSheetIds方法
- 在ApsPlanDetailMapper.xml中添加对应的DELETE语句实现软删除
- 在ApsPlanDetailServiceImpl中实现deleteByPlanSheetIds方法
- 在ApsPlanSheetServiceImpl中注入IApsPlanDetailService依赖
- 在排产单删除时调用planDetailService.deleteByPlanSheetIds方法
- 在IApsPlanDetailService接口中定义deleteByPlanSheetIds方法

klp-aps/src/main/java/com/klp/aps/mapper/ApsPlanDetailMapper.java

@@ -4,6 +4,8 @@ import com.klp.aps.domain.entity.ApsPlanDetail;
 import com.klp.aps.domain.vo.ApsPlanDetailVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
 
+import java.util.Collection;
+
 /**
  * 排产单明细Mapper接口
  *
@@ -12,4 +14,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface ApsPlanDetailMapper extends BaseMapperPlus<ApsPlanDetailMapper, ApsPlanDetail, ApsPlanDetailVo> {
 
+    int deleteByPlanSheetIds(Collection<Long> planSheetIds);
 }

klp-aps/src/main/java/com/klp/aps/service/IApsPlanDetailService.java

@@ -45,4 +45,9 @@ public interface IApsPlanDetailService {
      * 校验并批量删除排产单明细信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据排产单ID删除明细
+     */
+    int deleteByPlanSheetIds(Collection<Long> planSheetIds);
 }

klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanDetailServiceImpl.java

@@ -142,4 +142,9 @@ public class ApsPlanDetailServiceImpl implements IApsPlanDetailService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public int deleteByPlanSheetIds(Collection<Long> planSheetIds) {
+        return baseMapper.deleteByPlanSheetIds(planSheetIds);
+    }
 }

klp-aps/src/main/java/com/klp/aps/service/impl/ApsPlanSheetServiceImpl.java

@@ -19,6 +19,7 @@ import com.klp.aps.domain.vo.ApsPlanSheetVo;
 import com.klp.aps.domain.entity.ApsPlanSheet;
 import com.klp.aps.mapper.ApsPlanSheetMapper;
 import com.klp.aps.service.IApsPlanSheetService;
+import com.klp.aps.service.IApsPlanDetailService;
 
 import java.util.List;
 import java.util.Map;
@@ -35,6 +36,7 @@ import java.util.Collection;
 public class ApsPlanSheetServiceImpl implements IApsPlanSheetService {
 
     private final ApsPlanSheetMapper baseMapper;
+    private final IApsPlanDetailService planDetailService;
 
     /**
      * 查询排产单主
@@ -114,6 +116,7 @@ public class ApsPlanSheetServiceImpl implements IApsPlanSheetService {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        planDetailService.deleteByPlanSheetIds(ids);
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 

klp-aps/src/main/resources/mapper/aps/ApsPlanDetailMapper.xml

@@ -51,5 +51,11 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <delete id="deleteByPlanSheetIds">
+        UPDATE aps_plan_detail SET del_flag = 2 WHERE plan_sheet_id IN
+        <foreach collection="collection" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 
 </mapper>