|
|
|
@ -24,10 +24,7 @@ import org.springblade.core.tool.api.R; |
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
import org.springblade.core.tool.utils.DateUtil; |
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
import org.springblade.core.tool.utils.Func; |
|
|
|
import org.springblade.desk.basic.constant.FlowConst; |
|
|
|
import org.springblade.desk.basic.constant.FlowConst; |
|
|
|
import org.springblade.desk.basic.pojo.entity.BsAssignEntity; |
|
|
|
import org.springblade.desk.basic.pojo.entity.*; |
|
|
|
import org.springblade.desk.basic.pojo.entity.CenterTeam; |
|
|
|
|
|
|
|
import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity; |
|
|
|
|
|
|
|
import org.springblade.desk.basic.pojo.entity.WorkCenter; |
|
|
|
|
|
|
|
import org.springblade.desk.basic.service.*; |
|
|
|
import org.springblade.desk.basic.service.*; |
|
|
|
import org.springblade.desk.dashboard.pojo.entity.*; |
|
|
|
import org.springblade.desk.dashboard.pojo.entity.*; |
|
|
|
import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO; |
|
|
|
import org.springblade.desk.dashboard.pojo.vo.DsProcessProjectVO; |
|
|
|
@ -404,7 +401,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
workOrderRunService.save(workOrderRun); |
|
|
|
workOrderRunService.save(workOrderRun); |
|
|
|
|
|
|
|
|
|
|
|
wo.setApprovalStatus(WorkOrder.APPROVAL_STATUS_UNDER); |
|
|
|
wo.setApprovalStatus(WorkOrder.APPROVAL_STATUS_UNDER); |
|
|
|
wo.setWorId(workOrderRun.getId()); |
|
|
|
|
|
|
|
this.updateById(wo); |
|
|
|
this.updateById(wo); |
|
|
|
|
|
|
|
|
|
|
|
Boolean frontHandle = null; |
|
|
|
Boolean frontHandle = null; |
|
|
|
@ -413,9 +409,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
//当前序选中，上序不允许不选
|
|
|
|
//当前序选中，上序不允许不选
|
|
|
|
if (frontHandle != null && !frontHandle && item.getHandle()) { |
|
|
|
if (frontHandle != null && !frontHandle && item.getHandle()) { |
|
|
|
if (WorkOrderRun.RUN_TYPE_1.equals(workOrderRun.getRunType())) { |
|
|
|
if (WorkOrderRun.RUN_TYPE_1.equals(workOrderRun.getRunType())) { |
|
|
|
throw new ServiceException("product.frontHandle"); |
|
|
|
throw new ServiceException("上序必须一起外协！"); |
|
|
|
} else if (WorkOrderRun.RUN_TYPE_2.equals(workOrderRun.getRunType())) { |
|
|
|
} else if (WorkOrderRun.RUN_TYPE_2.equals(workOrderRun.getRunType())) { |
|
|
|
throw new ServiceException("product.nextHandle"); |
|
|
|
throw new ServiceException("下序必须一起回收！"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
item.setWorId(workOrderRun.getId()); |
|
|
|
item.setWorId(workOrderRun.getId()); |
|
|
|
@ -1238,7 +1234,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void maintainOrder(WorkOrder workOrder, Long planner, Long dispatcher, WorkOrderRun workOrderRun, Boolean oem) throws Exception { |
|
|
|
public void maintainOrder(WorkOrder workOrder, Long planner, Long dispatcher, WorkOrderRun workOrderRun, Boolean oem) { |
|
|
|
YieldOrder pjYieldOrder = yieldOrderMapper.selectById(workOrder.getYoId()); |
|
|
|
YieldOrder pjYieldOrder = yieldOrderMapper.selectById(workOrder.getYoId()); |
|
|
|
int days = 5; |
|
|
|
int days = 5; |
|
|
|
// 旧MES有个烧结配置，从配置里读取信息。改为通过枚举方式读取
|
|
|
|
// 旧MES有个烧结配置，从配置里读取信息。改为通过枚举方式读取
|
|
|
|
@ -2813,7 +2809,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
List<WorkPlanItemDetail> planItemDetails = workPlanItemDetailService.listByWoId(woId); |
|
|
|
List<WorkPlanItemDetail> planItemDetails = workPlanItemDetailService.listByWoId(woId); |
|
|
|
Map<Long, List<WorkPlanItemDetail>> itemDetailMap = planItemDetails.stream() |
|
|
|
Map<Long, List<WorkPlanItemDetail>> itemDetailMap = planItemDetails.stream() |
|
|
|
.collect(Collectors.groupingBy(WorkPlanItemDetail::getWorkPlanItemId)); |
|
|
|
.collect(Collectors.groupingBy(WorkPlanItemDetail::getWorkPlanItemId)); |
|
|
|
for (WorkPlanItemVO planItem : planItemLst) { |
|
|
|
for (WorkPlanItemVO planItem : planItemLst) { |
|
|
|
List<WorkPlanItemDetail> itemDetails = itemDetailMap.get(planItem.getId()); |
|
|
|
List<WorkPlanItemDetail> itemDetails = itemDetailMap.get(planItem.getId()); |
|
|
|
String checkManByNewErp = null; |
|
|
|
String checkManByNewErp = null; |
|
|
|
try { |
|
|
|
try { |
|
|
|
@ -2821,8 +2817,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
// DB Link 等异常降级，避免阻塞 PDF 生成
|
|
|
|
// DB Link 等异常降级，避免阻塞 PDF 生成
|
|
|
|
} |
|
|
|
} |
|
|
|
if(CollectionUtils.isNotEmpty(itemDetails)){ |
|
|
|
if (CollectionUtils.isNotEmpty(itemDetails)) { |
|
|
|
for(WorkPlanItemDetail itemDetail : itemDetails){ |
|
|
|
for (WorkPlanItemDetail itemDetail : itemDetails) { |
|
|
|
Map<String, Object> map = new HashMap<>(12); |
|
|
|
Map<String, Object> map = new HashMap<>(12); |
|
|
|
map.put("projectNo", planItem.getItemCode()); |
|
|
|
map.put("projectNo", planItem.getItemCode()); |
|
|
|
map.put("equipmentName", itemDetail.getTools()); |
|
|
|
map.put("equipmentName", itemDetail.getTools()); |
|
|
|
@ -2872,9 +2868,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
map.put("testQty", planItem.getTestQty()); |
|
|
|
map.put("testQty", planItem.getTestQty()); |
|
|
|
map.put("checkQty", planItem.getCheckQty()); |
|
|
|
map.put("checkQty", planItem.getCheckQty()); |
|
|
|
map.put("checkResult", planItem.getCheckResult() == -1 ? "未检验" : planItem.getCheckResult() == 1 ? "合格" : |
|
|
|
map.put("checkResult", planItem.getCheckResult() == -1 ? "未检验" : planItem.getCheckResult() == 1 ? "合格" : |
|
|
|
planItem.getCheckResult() == 2 ? "不合格" : planItem.getCheckResult() == 3 ? "NA" : ""); |
|
|
|
planItem.getCheckResult() == 2 ? "不合格" : planItem.getCheckResult() == 3 ? "NA" : ""); |
|
|
|
map.put("inspectorName", checkManByNewErp); |
|
|
|
map.put("inspectorName", checkManByNewErp); |
|
|
|
if(planItem.getCheckDate() != null){ |
|
|
|
if (planItem.getCheckDate() != null) { |
|
|
|
map.put("checkDate", planItem.getCheckDate().toLocalDate().toString()); |
|
|
|
map.put("checkDate", planItem.getCheckDate().toLocalDate().toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
list.add(map); |
|
|
|
list.add(map); |
|
|
|
@ -2891,9 +2887,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
map.put("testQty", planItem.getTestQty()); |
|
|
|
map.put("testQty", planItem.getTestQty()); |
|
|
|
map.put("checkQty", planItem.getCheckQty()); |
|
|
|
map.put("checkQty", planItem.getCheckQty()); |
|
|
|
map.put("checkResult", planItem.getCheckResult() == -1 ? "未检验" : planItem.getCheckResult() == 1 ? "合格" : |
|
|
|
map.put("checkResult", planItem.getCheckResult() == -1 ? "未检验" : planItem.getCheckResult() == 1 ? "合格" : |
|
|
|
planItem.getCheckResult() == 2 ? "不合格" : planItem.getCheckResult() == 3 ? "NA" : ""); |
|
|
|
planItem.getCheckResult() == 2 ? "不合格" : planItem.getCheckResult() == 3 ? "NA" : ""); |
|
|
|
map.put("inspectorName", checkManByNewErp); |
|
|
|
map.put("inspectorName", checkManByNewErp); |
|
|
|
if(planItem.getCheckDate() != null){ |
|
|
|
if (planItem.getCheckDate() != null) { |
|
|
|
map.put("checkDate", planItem.getCheckDate().toLocalDate().toString()); |
|
|
|
map.put("checkDate", planItem.getCheckDate().toLocalDate().toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
list.add(map); |
|
|
|
list.add(map); |
|
|
|
@ -2903,6 +2899,40 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
return data; |
|
|
|
return data; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
|
|
public void addPrWorkOrderRun(WorkOrder workOrder) { |
|
|
|
|
|
|
|
WorkPlan prWorkPlan = workPlanService.getById(workOrder.getWpId()); |
|
|
|
|
|
|
|
if (prWorkPlan.getOcId() != null) { |
|
|
|
|
|
|
|
//产生外协生产进度记录信息
|
|
|
|
|
|
|
|
WorkOrderRun wr = new WorkOrderRun(workOrder.getId(), workOrder.getWoCode(), WorkOrderRun.RUN_TYPE_1, |
|
|
|
|
|
|
|
null, null, null, prWorkPlan.getOcId(), "分派默认(厂外)", |
|
|
|
|
|
|
|
null, "1", workOrder.getCollaborate()); |
|
|
|
|
|
|
|
workOrderRunService.save(wr); |
|
|
|
|
|
|
|
//更改订单调度员和计划员
|
|
|
|
|
|
|
|
OemCraftAbilityEntity oa = oemCraftAbilityService.findBsOemAbility(prWorkPlan.getOcId(), prWorkPlan.getCaId()); |
|
|
|
|
|
|
|
if (oa != null) { |
|
|
|
|
|
|
|
this.maintainOrder(workOrder, oa.getPlanner(), oa.getDispatcher(), wr, true); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
throw new ServiceException("请核实外协商[" + prWorkPlan.getOcId() + "]的工艺能力是否有误!!!!"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
//产生车间运行记录信息
|
|
|
|
|
|
|
|
WorkOrderRun wr = new WorkOrderRun(workOrder.getId(), workOrder.getWoCode(), WorkOrderRun.RUN_TYPE_2, |
|
|
|
|
|
|
|
null, prWorkPlan.getMakeTeam(), null, null, "分派默认（厂内）", |
|
|
|
|
|
|
|
null, "1", workOrder.getCollaborate()); |
|
|
|
|
|
|
|
workOrderRunService.save(wr); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//更改订单调度员和计划员
|
|
|
|
|
|
|
|
BsTeamSetEntity teamSet = teamSetService.getById(prWorkPlan.getMakeTeam()); |
|
|
|
|
|
|
|
// 2025-07-23 线上迁移修改 增加if判断
|
|
|
|
|
|
|
|
if (prWorkPlan.getMakeTeam() != null) { |
|
|
|
|
|
|
|
this.maintainOrder(workOrder, teamSet.getPlanner(), teamSet.getDispatcher(), wr, false); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
throw new ServiceException("未找到合适的班组或厂家"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void launchTest(Map<String, Object> data, BladeUser user) throws Exception { |
|
|
|
public void launchTest(Map<String, Object> data, BladeUser user) throws Exception { |
|
|
|
// 提取参数
|
|
|
|
// 提取参数
|
|
|
|
|
李涛
1 week ago