|
@@ -165,6 +165,15 @@ public class BizDayworkItemController extends BaseController {
|
|
|
if(bizDayworkItem.getIsAmend() ==1 ||bizDayworkItem.getIsWasteRecycling() ==1 ) {
|
|
|
BizLot bizLot = bizLotService.query().eq("id",bizDayworkItem.getLotId()).list().get(0);
|
|
|
List<BizLotTechnologicalProcessDetail> bizTechnologicalWasteRecyclingDetails = bizLotTechnologicalProcessDetailService.query().eq("lot_technological_process_id",bizLot.getTechnologicalProcessId()).orderByAsc("process_step_number").list();
|
|
|
+ BizLotTechnologicalProcessDetail lotTechnologicalProcessDetail = bizLotTechnologicalProcessDetailService.query().eq("id", list.get(0).getTechnologicalProcessDetailId()).one();
|
|
|
+ BizTechnologicalProcessDetail bizTechnologicalProcessDetail = new BizTechnologicalProcessDetail();
|
|
|
+ bizTechnologicalProcessDetail.setProcessId(lotTechnologicalProcessDetail.getProcessId());
|
|
|
+ bizTechnologicalProcessDetail.setProcessAlias(lotTechnologicalProcessDetail.getProcessAlias());
|
|
|
+ bizTechnologicalProcessDetail.setProcessStepNumber(lotTechnologicalProcessDetail.getProcessStepNumber());
|
|
|
+ bizTechnologicalProcessDetail.setProcessCode(lotTechnologicalProcessDetail.getProcessCode());
|
|
|
+ bizTechnologicalProcessDetail.setProductId(lotTechnologicalProcessDetail.getProductId());
|
|
|
+
|
|
|
+
|
|
|
//查询所有工段下的工序
|
|
|
List<BizDeptProcess> deptProcessList = bizDeptProcessService.query().list();
|
|
|
List<BizProcess> processList = new ArrayList<>();
|
|
@@ -187,6 +196,7 @@ public class BizDayworkItemController extends BaseController {
|
|
|
.findFirst()
|
|
|
.orElse(null) // 如果未找到匹配的 process,则设置为 null
|
|
|
);
|
|
|
+ item.setTechnologicalProcessDetail(bizTechnologicalProcessDetail);
|
|
|
});
|
|
|
}
|
|
|
}
|