|
|
|
@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -41,11 +42,18 @@ public class MesPartController {
|
|
|
|
|
|
|
|
|
|
ListPager<MesPart> mesPartListPager = mesPartService.queryMesPart(mesPart, pager);
|
|
|
|
|
List<MesPart> partList = mesPartListPager.getObjectList();
|
|
|
|
|
for (MesPart part : partList) {
|
|
|
|
|
MesPartSap partSap = mesPartService.getMesPartSapByPartNo(part.getPartNo(), part.getOrganizeCode());
|
|
|
|
|
if (partSap != null) {
|
|
|
|
|
part.setUnit(partSap.getUnit());
|
|
|
|
|
Iterator<MesPart> iterator = partList.iterator();
|
|
|
|
|
while (iterator.hasNext()) {
|
|
|
|
|
MesPart part = iterator.next();
|
|
|
|
|
try {
|
|
|
|
|
MesPartSap partSap = mesPartService.getMesPartSapByPartNo(part.getPartNo(), part.getOrganizeCode());
|
|
|
|
|
if (partSap != null) {
|
|
|
|
|
part.setUnit(partSap.getUnit());
|
|
|
|
|
}
|
|
|
|
|
} catch (ImppBusiException e) {
|
|
|
|
|
iterator.remove();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
mesPartListPager.setObjectList(partList);
|
|
|
|
|
return ResultBean.success("查询成功").setListPager(mesPartListPager);
|
|
|
|
|