|
|
|
|
@ -1741,6 +1741,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO |
|
|
|
|
WorkPlanItemDetail workPlanItemDetail; |
|
|
|
|
List<InspectionItem> inspectionItems = inspectionService.list(); |
|
|
|
|
for (DsProcessProjectVO project : projects) { |
|
|
|
|
// 如果是耐蚀性检测,需要满足三个条件才允许生产对应的检测项目:1-工作订单备注包含HTBY,2-生产标识包含JHT,3-镀种含金或者Au
|
|
|
|
|
if ("耐蚀性检测".equals(project.getProjectName())) { |
|
|
|
|
if (!yieldOrder.getYpMemo().contains("HTBY") || !yieldOrder.getProductIdent().contains("JHT") || |
|
|
|
|
!(yieldOrder.getPlate().contains("金") || yieldOrder.getPlate().contains("Au") || yieldOrder.getPlate().contains("au"))) { |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
workPlanItem = new WorkPlanItem(); |
|
|
|
|
workPlanItem.setWpId(workPlan.getId()); |
|
|
|
|
workPlanItem.setItemCode(project.getTrialNo()); |
|
|
|
|
|