Commit 803c0ab6 by huluobin

订单详情新增采购订单内容

parent 8ad3e8b7
...@@ -4,6 +4,7 @@ import com.bailuntec.ana.application.address.IOrderAddressService; ...@@ -4,6 +4,7 @@ import com.bailuntec.ana.application.address.IOrderAddressService;
import com.bailuntec.ana.application.order.IOrderDetailService; import com.bailuntec.ana.application.order.IOrderDetailService;
import com.bailuntec.ana.application.order.IOrderService; import com.bailuntec.ana.application.order.IOrderService;
import com.bailuntec.ana.application.order.IOrderSpecificationService; import com.bailuntec.ana.application.order.IOrderSpecificationService;
import com.bailuntec.ana.application.purchase.IPurchaseOrderService;
import com.bailuntec.ana.application.purchase.IPurchaseTaskService; import com.bailuntec.ana.application.purchase.IPurchaseTaskService;
import com.bailuntec.ana.domain.address.OrderAddress; import com.bailuntec.ana.domain.address.OrderAddress;
import com.bailuntec.ana.domain.order.Order; import com.bailuntec.ana.domain.order.Order;
...@@ -51,6 +52,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements ...@@ -51,6 +52,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
private IPurchaseTaskService purchaseTaskService; private IPurchaseTaskService purchaseTaskService;
@Resource @Resource
private PamsApi pamsApi; private PamsApi pamsApi;
@Resource
private IPurchaseOrderService purchaseOrderService;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
...@@ -116,6 +119,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements ...@@ -116,6 +119,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
orderDetailService.setOrderDetail(order); orderDetailService.setOrderDetail(order);
orderAddressService.setOrderAddress(order); orderAddressService.setOrderAddress(order);
purchaseOrderService.setPurchaseOrder(order);
return order; return order;
} }
......
...@@ -45,4 +45,13 @@ public interface IPurchaseOrderService extends IService<PurchaseOrder> { ...@@ -45,4 +45,13 @@ public interface IPurchaseOrderService extends IService<PurchaseOrder> {
* @param order 订单详情 * @param order 订单详情
*/ */
void callbackOms(Order order); void callbackOms(Order order);
/**
* <p>
* 为订单设置采购订单详情
* </p>
*
* @param order order
*/
void setPurchaseOrder(Order order);
} }
...@@ -193,6 +193,12 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P ...@@ -193,6 +193,12 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
omsApi.updateOrderStatusForAna(callBackRequest); omsApi.updateOrderStatusForAna(callBackRequest);
} }
@Override
public void setPurchaseOrder(Order order) {
List<PurchaseOrder> purchaseOrderList = this.listByOrderId(order.getId());
order.setPurchaseOrderList(purchaseOrderList);
}
@Resource @Resource
IPurchaseOrderDetailService purchaseOrderDetailService; IPurchaseOrderDetailService purchaseOrderDetailService;
......
package com.bailuntec.ana.domain.order; package com.bailuntec.ana.domain.order;
import com.bailuntec.ana.domain.address.OrderAddress; import com.bailuntec.ana.domain.address.OrderAddress;
import com.bailuntec.ana.domain.purchase.PurchaseOrder;
import com.bailuntec.ana.infrastructure.common.annotation.DictParam; import com.bailuntec.ana.infrastructure.common.annotation.DictParam;
import com.bailuntec.ana.infrastructure.common.base.BaseModel; import com.bailuntec.ana.infrastructure.common.base.BaseModel;
import com.bailuntec.ana.interfaces.order.OrderValidGroup; import com.bailuntec.ana.interfaces.order.OrderValidGroup;
...@@ -168,4 +169,8 @@ public class Order extends BaseModel { ...@@ -168,4 +169,8 @@ public class Order extends BaseModel {
private OrderAddress orderAddress; private OrderAddress orderAddress;
@TableField(exist = false)
private List<PurchaseOrder> purchaseOrderList;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment