|
@@ -70,7 +70,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (model.getCustomerId() != null) {
|
|
if (model.getCustomerId() != null) {
|
|
|
Customer customerParam = new Customer();
|
|
Customer customerParam = new Customer();
|
|
|
customerParam.setId(model.getCustomerId());
|
|
customerParam.setId(model.getCustomerId());
|
|
|
- model.setCustomer(jdbcClient.getJdbcModelById(customerParam, connection));
|
|
|
|
|
|
|
+ Customer customer = jdbcClient.getJdbcModelById(customerParam, connection);
|
|
|
|
|
+ if (customer != null) {
|
|
|
|
|
+ model.setCustomerName(customer.getName());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 6. 补全负责人姓名 ManagerName
|
|
// 6. 补全负责人姓名 ManagerName
|
|
@@ -93,7 +96,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
if (detail.getMaterialCode() != null) {
|
|
if (detail.getMaterialCode() != null) {
|
|
|
ProductMaterial materialParam = new ProductMaterial();
|
|
ProductMaterial materialParam = new ProductMaterial();
|
|
|
materialParam.setCode(detail.getMaterialCode());
|
|
materialParam.setCode(detail.getMaterialCode());
|
|
|
- detail.setProductMaterial(jdbcClient.getJdbcModel(materialParam, connection));
|
|
|
|
|
|
|
+ detail.setMaterial(jdbcClient.getJdbcModel(materialParam, connection));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
model.setChildrenList(detailList);
|
|
model.setChildrenList(detailList);
|