|
|
|
@ -175,6 +175,8 @@ public class ProOrderServiceImpl implements IProOrderService {
|
|
|
|
|
List<ProOrderWorkorder> proOrderWorkorderList = proOrderWorkorderMapper.selectFirWorkOrder(id);
|
|
|
|
|
// 母工单循环遍历
|
|
|
|
|
for (int i = 0; i < proOrderWorkorderList.size(); i++) {
|
|
|
|
|
// 通过班次id查询班次名称
|
|
|
|
|
String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorderList.get(i).getShiftId());
|
|
|
|
|
// 通过设备code查询出机型名称
|
|
|
|
|
String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderList.get(i).getProdLineCode());
|
|
|
|
|
// 通过工单id查询批次号
|
|
|
|
@ -192,15 +194,18 @@ public class ProOrderServiceImpl implements IProOrderService {
|
|
|
|
|
List<ProOrderWorkorder> thiProOrderWorkorders = proOrderWorkorderMapper.selectChildWorkOrder(secProOrderWorkorder.get(0).getWorkorderCode());
|
|
|
|
|
if (thiProOrderWorkorders.size() > 0 && thiProOrderWorkorders != null) {
|
|
|
|
|
// 将三级放入二级child
|
|
|
|
|
thiProOrderWorkorders.get(0).setShiftDesc(shiftDesc);
|
|
|
|
|
thiProOrderWorkorders.get(0).setProdLineCode(prodLineName);
|
|
|
|
|
thiProOrderWorkorders.get(0).setBatchCodeList(batchCodes);
|
|
|
|
|
secProOrderWorkorder.get(0).setChildren(thiProOrderWorkorders);
|
|
|
|
|
}
|
|
|
|
|
// 将二级放入到母工单child
|
|
|
|
|
secProOrderWorkorder.get(0).setShiftDesc(shiftDesc);
|
|
|
|
|
secProOrderWorkorder.get(0).setProdLineCode(prodLineName);
|
|
|
|
|
secProOrderWorkorder.get(0).setBatchCodeList(batchCodes);
|
|
|
|
|
proOrderWorkorderList.get(i).setChildren(secProOrderWorkorder);
|
|
|
|
|
}
|
|
|
|
|
proOrderWorkorderList.get(i).setShiftDesc(shiftDesc);
|
|
|
|
|
proOrderWorkorderList.get(i).setProdLineCode(prodLineName);
|
|
|
|
|
proOrderWorkorderList.get(i).setBatchCodeList(batchCodes);
|
|
|
|
|
}
|
|
|
|
|