|
@@ -394,6 +394,40 @@ public class BizReturnTurnoverController extends BaseController {
|
|
|
item.setProductionDeptId(outsourcedOrderDetail.getProductionDeptId());
|
|
|
});
|
|
|
bizOutsourcedOrderDetailService.updateBatchById(outsourceOrderDetailList);
|
|
|
+ // 自动派活
|
|
|
+ SysDept sysDept = sysDeptMapper.selectDeptById(outsourcedOrderDetail.getProductionDeptId());
|
|
|
+
|
|
|
+ List<BizProductionResourceGroup> productionResourceGroupList = bizProductionResourceGroupService.list(new QueryWrapper<BizProductionResourceGroup>().eq("dept_id", outsourcedOrderDetail.getProductionDeptId()).eq("is_deactivate", 0));
|
|
|
+
|
|
|
+ if (sysDept.getAutoAllocation() == 1) {
|
|
|
+ // 查资源组
|
|
|
+
|
|
|
+ //查询是否已经分配资源组
|
|
|
+ BizProductionResourceGroupSubPlan groupSubPlan = new BizProductionResourceGroupSubPlan();
|
|
|
+ groupSubPlan.setDeptId(outsourcedOrderDetail.getProductionDeptId());
|
|
|
+ groupSubPlan.setProductionPlanDetailId(outsourcedOrderDetail.getProductionPlanDetailId());
|
|
|
+
|
|
|
+ List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getAotList(groupSubPlan);
|
|
|
+
|
|
|
+ List<BizProductionResourceGroupSubPlan> subPlanList = new ArrayList<>();
|
|
|
+ //如果没分配
|
|
|
+ if (groupSubPlanList.size() == 0) {
|
|
|
+ //查产品id
|
|
|
+ BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", outsourcedOrderDetail.getProductionPlanDetailId()));
|
|
|
+ for (BizProductionResourceGroup info : productionResourceGroupList) {
|
|
|
+ BizProductionResourceGroupSubPlan subPlan = new BizProductionResourceGroupSubPlan();
|
|
|
+ subPlan.setProductId(productionPlanDetail.getProductId());
|
|
|
+ subPlan.setProductionPlanDetailId(outsourcedOrderDetail.getProductionPlanDetailId());
|
|
|
+ subPlan.setTechnologicalProcessId(outsourcedOrderDetail.getTechnologicalProcessId());
|
|
|
+ subPlan.setResourceGroupId(info.getId());
|
|
|
+ subPlan.setDeptId(outsourcedOrderDetail.getProductionDeptId());
|
|
|
+ subPlan.setResourceGroupCode(info.getCode());
|
|
|
+ subPlanList.add(subPlan);
|
|
|
+ }
|
|
|
+ bizProductionResourceGroupSubPlanService.saveBatch(subPlanList);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
return success();
|
|
|
}
|
|
|
|