0424

src/main/java/cn/ezhizao/project/business/controller/BizDayworkController.java

@@ -181,14 +181,12 @@ public class BizDayworkController extends BaseController {
                 }
 
                 //是否单批单改
-                if(lot.getIsAmend()==1){
+                if(lot.getIsAmend()==1 ||lot.getIsWasteRecycling()==1){
                     BizLotTechnologicalProcessDetail amendDetail =new BizLotTechnologicalProcessDetail();
                     amendDetail.setLotTechnologicalProcessId(lot.getTechnologicalProcessId());
                     List<BizLotTechnologicalProcessDetail> amendDetailList=bizTechnologicalAmendDetailService.getList(amendDetail);
                     map.put("processDetails",amendDetailList);
-                } else if (lot.getIsWasteRecycling()==1) { //是否废品回用
-                    
-                }else{
+                } else{
                     //查询工序列表
                     List<BizTechnologicalProcessDetail>  processDetails=bizTechnologicalProcessDetailService.getProcessDetailsByTechnicalProcessId(lot.getTechnologicalProcessId());
                     map.put("processDetails",processDetails);

src/main/java/cn/ezhizao/project/business/controller/BizLotController.java

@@ -222,6 +222,15 @@ public class BizLotController extends BaseController
             technologicalWasteRecyclingList.add(bizTechnologicalWasteRecycling);
         }
         bizLotTechnologicalProcessService.saveBatch(technologicalWasteRecyclingList);
+        //将废品工艺存回lot表
+        for (BizLot item : lotList) {
+            for(BizLotTechnologicalProcess info : technologicalWasteRecyclingList) {
+                if(item.getId().equals(info.getLotId())) {
+                    item.setTechnologicalProcessId(info.getId());
+                }
+            }
+        }
+        bizLotService.updateBatchById(lotList);
         //废品工艺表存完，存废品工序表
         List<BizLotTechnologicalProcessDetail> technologicalWasteRecyclingDetailList = new ArrayList<>();
         for (BizLotTechnologicalProcess item : technologicalWasteRecyclingList) {

src/main/java/cn/ezhizao/project/business/controller/BizLotTechnologicalProcessController.java

@@ -276,7 +276,7 @@ public class BizLotTechnologicalProcessController extends BaseController {
                             if (d.getRejectNum() != null) {
                                 t.setAbandonNum(t.getAbandonNum() == null ? d.getRejectNum() : t.getAbandonNum() + d.getRejectNum());
                             } else {
-                                t.setAbandonNum(t.getAbandonNum()!=0?t.getAbandonNum():0);
+                                t.setAbandonNum(t.getAbandonNum() == null?0:t.getAbandonNum()!=0?t.getAbandonNum():0);
                             }
                             t.setQualifiedNum(t.getQualifiedNum() == null ? d.getQualifiedNum() : t.getQualifiedNum() + d.getQualifiedNum());
                             t.setInvestNum(d.getProdNum());

src/main/resources/mybatis/business/BizProductionPlanDetailMapper.xml

@@ -62,8 +62,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t2.deleted = 0 and t1.id not in (SELECT production_plan_detail_id from
             biz_production_resource_group_sub_plan where deleted = 0 and resource_group_id = #{resourceGroupId})
+<!--            生产计划进行投产，有生产子计划，且领料部门id等于工段id ；4-18修改看当前生产计划的批次里废品回用的批次是否是当前id-->
             <if test="deptId != null  and deptId != 0">AND (t1.id in (SELECT production_plan_detail_id from biz_daywork
-                where deleted = 0 and dept_id = #{deptId}) or requisition_department_id = #{deptId})
+                where deleted = 0 and dept_id = #{deptId}) or requisition_department_id = #{deptId}
+                OR (t1.id IN (
+                SELECT production_plan_detail_id
+                FROM biz_lot
+                WHERE production_plan_detail_id = t1.id
+                AND is_waste_recycling = 1
+                AND requisition_department_id = #{deptId}
+                )))
             </if>
             <if test="keywords != null and keywords !=''">AND t1.product_description LIKE CONCAT('%', #{keywords},
                 '%')