|
@@ -503,11 +503,15 @@ public class BizDayworkItemController extends BaseController {
|
|
daywork.setDeptId(bizDayworkItem.getDeptId());
|
|
daywork.setDeptId(bizDayworkItem.getDeptId());
|
|
daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
|
|
daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
|
|
bizDayworkService.updateById(daywork);
|
|
bizDayworkService.updateById(daywork);
|
|
|
|
+ // 如果被邀请人不是本工段内的人,则需要从当前资源组中删除被邀请人
|
|
|
|
+ bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
|
|
}
|
|
}
|
|
|
|
|
|
if (bizDayworkItem.getStatus().equals("5")) {
|
|
if (bizDayworkItem.getStatus().equals("5")) {
|
|
daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
|
|
daywork.setProcessQualifiedNum(daywork.getTemporaryProcessQualifiedNum());
|
|
bizDayworkService.updateById(daywork);
|
|
bizDayworkService.updateById(daywork);
|
|
|
|
+ // 如果被邀请人不是本工段内的人,则需要从当前资源组中删除被邀请人
|
|
|
|
+ bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
|
|
}
|
|
}
|
|
/** 当最后一道序完成时,释放该批次下所有载具 */
|
|
/** 当最后一道序完成时,释放该批次下所有载具 */
|
|
if (bizDayworkItem.getStatus().equals("3")) {
|
|
if (bizDayworkItem.getStatus().equals("3")) {
|
|
@@ -529,7 +533,6 @@ public class BizDayworkItemController extends BaseController {
|
|
//最后一道序的时候,把daywork表的status设置为2
|
|
//最后一道序的时候,把daywork表的status设置为2
|
|
daywork.setStatus(2);
|
|
daywork.setStatus(2);
|
|
}
|
|
}
|
|
- bizProductionResourceGroupDetailService.deleTemporanyPeople(daywork);
|
|
|
|
bizDayworkService.updateById(daywork);
|
|
bizDayworkService.updateById(daywork);
|
|
}
|
|
}
|
|
//如果没有合格数,则投产数量为总数量,上道序的合格数为下到序的投产数
|
|
//如果没有合格数,则投产数量为总数量,上道序的合格数为下到序的投产数
|
|
@@ -576,7 +579,7 @@ public class BizDayworkItemController extends BaseController {
|
|
groupSubPlan.setProductionPlanDetailId(bizDayworkItem.getProductionPlanDetailId());
|
|
groupSubPlan.setProductionPlanDetailId(bizDayworkItem.getProductionPlanDetailId());
|
|
List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getList(groupSubPlan);
|
|
List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getList(groupSubPlan);
|
|
//如果没分配
|
|
//如果没分配
|
|
- if(groupSubPlanList.size()==0){
|
|
|
|
|
|
+ if(groupSubPlanList.isEmpty()){
|
|
//查产品id
|
|
//查产品id
|
|
BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", bizDayworkItem.getProductionPlanDetailId()));
|
|
BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", bizDayworkItem.getProductionPlanDetailId()));
|
|
//存放保存的subPlanList
|
|
//存放保存的subPlanList
|