Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/ezhizao/project/business/domain/BizLot.java

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

@@ -192,6 +192,14 @@ public class BizDayworkController extends BaseController {
         }
         return error(errorMessage + "设备正在使用不能删除");
     }
+    /**
+     * 获取报工记录的工段
+     */
+    @GetMapping("/getDeptInfo")
+    public AjaxResult getDeptList(BizDayworkItem bizDayworkItem) {
+        return success(bizDayworkItemService.getDeptInfo(bizDayworkItem));
+    }
+
     /**
      * 获取计划详情
      */

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

@@ -139,6 +139,11 @@ public class BizProductionPlanDetailController extends BaseController {
         notStartList.forEach(item ->
         {item.setTechnologyVersion(bizProductionPlanDetail.getTechnologyVersion());
                 item.setTechnologicalProcessId(bizProductionPlanDetail.getTechnologicalProcessId());});
+        //修改生产计划表的版本
+        BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getById(bizProductionPlanDetail.getId());
+        productionPlanDetail.setTechnologicalProcessId(bizProductionPlanDetail.getTechnologicalProcessId());
+        productionPlanDetail.setTechnologyVersion(bizProductionPlanDetail.getTechnologyVersion());
+        bizProductionPlanDetailService.updateById(productionPlanDetail);
         return toAjax(bizLotService.updateBatchById(notStartList));
     }
 

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

@@ -70,6 +70,9 @@ public class BizTechnologicalAmendController extends BaseController {
     @Resource
     private IBizDayworkCarrierService bizDayworkCarrierService;
 
+    @Resource
+    private IBizLotWasteService bizLotWasteService;
+
     @Resource
     private IBizProductionPlanDetailSubDetailService bizProductionPlanDetailSubDetailService;
 
@@ -108,6 +111,9 @@ public class BizTechnologicalAmendController extends BaseController {
         } catch (Exception e) {
             throw new RuntimeException("批次信息异常！");
         }
+        //查询批废
+        BizLotWaste lotWaste= bizLotWasteService.query().eq("lot_id",lot.getId()).eq("deleted",0).one();
+        lot.setLotWaste(lotWaste);
         //查询计划单信息
         lot.setProductionPlanDetail(bizProductionPlanDetailService.getById(lot.getProductionPlanDetailId()));
         //查询报工信息
@@ -135,7 +141,7 @@ public class BizTechnologicalAmendController extends BaseController {
         }
         lot.setCarrierName(carrierName.toString());
         //设置furnaceNoInfo
-        lot.setFurnaceNoInfo(bizFurnaceNoInfoService.getList(furnaceNoInfo).size() > 0 ? bizFurnaceNoInfoService.getList(furnaceNoInfo).get(0) : null);
+        lot.setFurnaceNoInfo(bizFurnaceNoInfoService.getList(furnaceNoInfo).size() > 0 ? bizFurnaceNoInfoService.getList(furnaceNoInfo).get(0) : new BizFurnaceNoInfo());
         lot.getProductionPlanDetail().setRequisitionDepartmentName(sysDeptService.selectDeptById(daywork.getDeptId()).getDeptName());
         lot = getLot(lot);
 
@@ -155,13 +161,16 @@ public class BizTechnologicalAmendController extends BaseController {
         } else if (lot.getIsWasteRecycling() == 1) { //是否废品回用
 
         } else {
+            //查询工序信息
             processDetail.setTechnologicalProcessId(lot.getTechnologicalProcessId());
             List<BizTechnologicalProcessDetail> processDetailList = bizTechnologicalProcessDetailService.query().eq("technological_process_id", lot.getTechnologicalProcessId()).list();
+            //查询报工信息
             BizDayworkItem item = new BizDayworkItem();
             item.setDayworkId(lot.getDaywork().getId());
             List<BizDayworkItem> dayworkItems = bizDayworkItemService.selectList(item);
 
             for (BizTechnologicalProcessDetail t : processDetailList) {
+                //给备料赋值，备料没有废品，默认完成
                 if (processDetailList.get(0).getProcessId().equals(t.getProcessId())) {
                     t.setInvestNum(lot.getProductionQuantity());
                     t.setAbandonNum(0);
@@ -169,31 +178,45 @@ public class BizTechnologicalAmendController extends BaseController {
                     t.setStatus("2");
                 }
                 for (BizDayworkItem d : dayworkItems) {
+                    //根据工序判断，查询每道工序的报工信息
                     if (t.getProcessId().equals(d.getProcessId())) {
-
+                        //查询状态为完成货工序已完成的状态，计算合格量，废品，投入量
                         if(d.getStatus().equals("2")||d.getStatus().equals("3")){
-                            System.out.println(d.getRejectNum()+",+++++++++++++++++++++++++++++++++++++++++++++++++");
                             if(d.getRejectNum()!=null){
                                 t.setAbandonNum(t.getAbandonNum()==null?d.getRejectNum():t.getAbandonNum() + d.getRejectNum());
-
                             }else {
                                 t.setAbandonNum(0);
                             }
                             t.setQualifiedNum(t.getQualifiedNum()==null?d.getQualifiedNum():t.getQualifiedNum() + d.getQualifiedNum());
                             t.setInvestNum(d.getProdNum());
                         }
+                        //未开始时合格量默，废品默认为0
                         if (d.getStatus().equals("0")) {
                             t.setAbandonNum(0);
                             t.setQualifiedNum(0);
                             t.setInvestNum(d.getProdNum());
+                            //设置状态为未开始
                             t.setStatus("0");
                         } else if (d.getStatus().equals("1") || d.getStatus().equals("2")) {
+                            //设置状态为进行中
                             t.setInvestNum(d.getProdNum());
                             t.setStatus("1");
                         } else {
+                            //设置状态为已完成
                             t.setStatus("2");
                         }
-
+                        //设置当前批次状态，当第一道序（不包括备料）状态为未开始时批次状态为未开始
+                        if(processDetailList.get(1).getProcessId().equals(t.getProcessId())&&d.getStatus().equals("0")){
+                            lot.getDaywork().setStatus(0);
+                        } else if(processDetailList.get(processDetailList.size() - 1).getProcessId().equals(d.getProcessId())){
+                            //最后一道工序如果状态为不是"未开始，进行中，已完成"当前批次已完成
+                            if(!d.getStatus().equals("1")&&!d.getStatus().equals("2")&&!d.getStatus().equals("0")){
+                                lot.getDaywork().setStatus(2);
+                            }
+                        }else{
+                            //当前批次已完成
+                            lot.getDaywork().setStatus(1);
+                        }
                     }
                 }
             }

src/main/java/cn/ezhizao/project/business/domain/BizLot.java

@@ -187,5 +187,9 @@ public class BizLot extends BaseEntity {
 
     @TableField(exist = false)
     private List<BizLot> sparateList;
+    @TableField(exist = false)
+    private BizLotWaste lotWaste;
+
+
 
 }

src/main/java/cn/ezhizao/project/business/mapper/BizDayworkItemMapper.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.mapper;
 
 import cn.ezhizao.project.business.domain.BizDayworkItem;
 import cn.ezhizao.project.business.domain.BizProductionResourceGroupDetail;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
@@ -21,6 +22,8 @@ public interface BizDayworkItemMapper extends BaseMapper<BizDayworkItem>
      * @return 报工记录集合
      */
     public List<BizDayworkItem> getList(BizDayworkItem bizDayworkItem);
+
+    public List<SysDept> getDeptInfo(BizDayworkItem bizDayworkItem);
     /**
      * 查询设备信息
      * @param bizProductionResourceGroupDetail

src/main/java/cn/ezhizao/project/business/service/IBizDayworkItemService.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.service;
 
 import cn.ezhizao.project.business.domain.BizDayworkItem;
 import cn.ezhizao.project.business.domain.BizProductionResourceGroupDetail;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -22,6 +23,8 @@ public interface IBizDayworkItemService extends IService<BizDayworkItem>
      */
     public List<BizDayworkItem> getList(BizDayworkItem bizDayworkItem);
 
+    public List<SysDept> getDeptInfo(BizDayworkItem bizDayworkItem);
+
     /**
      * 物理删除
      * @param bizDayworkItem

src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkItemServiceImpl.java

@@ -4,6 +4,7 @@ import cn.ezhizao.project.business.domain.BizDayworkItem;
 import cn.ezhizao.project.business.domain.BizProductionResourceGroupDetail;
 import cn.ezhizao.project.business.mapper.BizDayworkItemMapper;
 import cn.ezhizao.project.business.service.IBizDayworkItemService;
+import cn.ezhizao.project.system.domain.SysDept;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +33,11 @@ public class BizDayworkItemServiceImpl extends ServiceImpl<BizDayworkItemMapper,
         return bizDayworkItemMapper.getList(bizDayworkItem);
     }
 
+    @Override
+    public List<SysDept> getDeptInfo(BizDayworkItem bizDayworkItem) {
+        return bizDayworkItemMapper.getDeptInfo(bizDayworkItem);
+    }
+
     /**
      * 查询设备信息
      *

src/main/java/cn/ezhizao/project/business/service/impl/BizDayworkServiceImpl.java

@@ -94,6 +94,4 @@ public class BizDayworkServiceImpl extends ServiceImpl<BizDayworkMapper, BizDayw
         return bizDayworkMapper.physicalDelete(bizDaywork);
     }
 
-    ;
-
 }

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

@@ -28,6 +28,10 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getDeptInfo" resultType="cn.ezhizao.project.system.domain.SysDept">
+        select distinct t1.dept_id as value,t1.dept_name as label from biz_daywork_item t1 where t1.daywork_id = #{dayworkId}
+    </select>
+
     <select id="getItemScreen" parameterType="BizDayworkItem" resultMap="BizDayworkItemResult">
         SELECT bdi.*
         FROM biz_daywork_item bdi

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

@@ -122,11 +122,13 @@
         t4.furnace_number,
         t3.production_quantity,
         t4.technology_version as technologyVersion,
-        t4.one_lot_quantity as oneLotQuantity
+        t4.one_lot_quantity as oneLotQuantity,
+        t5.dept_name
         FROM biz_daywork t1
         LEFT JOIN biz_lot t3 ON t1.lot_id = t3.id
         LEFT JOIN biz_production_plan_detail t4 ON t1.production_plan_detail_id = t4.id
         LEFT JOIN biz_product t2 ON t4.product_id = t2.id
+        LEFT JOIN sys_dept t5 on t1.dept_id = t5.dept_id
 
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
@@ -185,9 +187,9 @@
     </select>
     <select id="getDayworkProcessList" resultType="cn.ezhizao.project.business.domain.BizProcess">
         select distinct t3.id as Value,t3.process_alias as Label from biz_daywork t1 left join biz_daywork_item t2 on
-        t1.id = t2.daywork_id left join biz_technological_process_detail t3 on t2.technological_process_detail_id =
+        t1.id = t2.daywork_id left join biz_process t3 on t2.process_id =
         t3.id
-        where t1.id = #{id} and t2.status &lt; 4 order by t3.process_step_number asc
+        where t1.id = #{id} and t2.dept_id = #{deptId} and t2.status &lt; 4 order by t2.create_time asc
     </select>
     <delete id="physicalDelete">
         DELETE FROM biz_daywork