|
|
|
@ -575,6 +575,19 @@ public class ReturnCargoOrderController {
|
|
|
|
|
returnCargoOrderMap.put("id", returnCargoOrderMap.get("id"));
|
|
|
|
|
//副表数据
|
|
|
|
|
//子表数据
|
|
|
|
|
if (entity.getDocumentType().equals("1")) {
|
|
|
|
|
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.eq("a.id",entity.getBusinessId());
|
|
|
|
|
queryWrapper.isNull("a.f_delete_mark");
|
|
|
|
|
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(queryWrapper);
|
|
|
|
|
returnCargoOrderMap.put("purchaseOrderInfo",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessOrderEntityList)));
|
|
|
|
|
}else if (entity.getDocumentType().equals("2")){
|
|
|
|
|
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
queryWrapper.eq("a.id",entity.getBusinessId());
|
|
|
|
|
queryWrapper.isNull("a.f_delete_mark");
|
|
|
|
|
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(queryWrapper);
|
|
|
|
|
returnCargoOrderMap.put("saleOrderInfo",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessOrderEntityList)));
|
|
|
|
|
}
|
|
|
|
|
List<DeliveryVoucherRelationEntity> deliveryVoucherRelationList = returnCargoOrderService.getDeliveryVoucherRelationList(entity.getId());
|
|
|
|
|
returnCargoOrderMap.put("deliveryVoucherRelationList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryVoucherRelationList)));
|
|
|
|
|
List<DeliveryProductRelationEntity> deliveryProductRelationList = returnCargoOrderService.getDeliveryProductRelationList(entity.getId());
|
|
|
|
|