暂存

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/dto/OrderSubmitDto.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.trade.purchase.order.entity.Order;
 import com.trade.purchase.order.entity.OrderFees;
 import com.trade.purchase.order.entity.OrderFiles;
+import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderStatusEnum;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import com.trade.purchase.order.vo.OrderItemsVO;
@@ -74,5 +75,10 @@ public class OrderSubmitDto extends Order {
 	 */
 	@ApiModelProperty(value = "订单文件")
 	private List<OrderFiles> orderFilesList;
+	/**
+	 * 订单明细
+	 */
+	@ApiModelProperty(value = "订单明细")
+	private List<OrderItems> orderItemsList;
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderVO.java

@@ -92,5 +92,10 @@ public class OrderVO extends Order {
 	@ApiModelProperty(value = "回显客户中文名")
 	@TableField(exist = false)
 	private List<Map<String,Object>> purchaserName;
+	/**
+	 * 订单明细
+	 */
+	@ApiModelProperty(value = "订单明细")
+	private List<OrderItems> orderItemsList;
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -30,6 +30,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.purchase.sales.entity.OrderItems;
+import org.springblade.purchase.sales.service.IOrderItemsService;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.purchase.sales.entity.Order;
@@ -51,6 +53,8 @@ public class OrderController extends BladeController {
 
 	private final IOrderService orderService;
 
+	private final IOrderItemsService orderItemsService;
+
 	/**
 	 * 详情
 	 */
@@ -158,6 +162,14 @@ public class OrderController extends BladeController {
 		order.setTradeType(OrderTypeEnum.DOMESTIC.getType());
 		return R.data(orderService.deliverGoods(order));
 	}
-
-
+	/**
+	 * 分页 订单明细表
+	 */
+	@GetMapping("/orderItemsList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入orderItems")
+	public R<IPage<OrderItems>> orderItemsList(OrderItems orderItems, Query query) {
+		IPage<OrderItems> pages = orderItemsService.page(Condition.getPage(query), Condition.getQueryWrapper(orderItems));
+		return R.data(pages);
+	}
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/PurchaseEnquiry.java

@@ -122,10 +122,10 @@ public class PurchaseEnquiry  extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入order")
-	public R<String> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
+	public R<OrderSubmitDto> submit(@Valid @RequestBody OrderSubmitDto submitDto) {
 		submitDto.setBillType(OrderTypeEnum.PURCHASE_ENQUIRY.getType());
 		submitDto.setTradeTypeEnum(OrderTypeEnum.EXPORT);
-		return orderService.submitOrderMessage(submitDto);
+		return orderService.savePurchase(submitDto);
 	}
 
 	/**

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IOrderService.java

@@ -93,5 +93,11 @@ public interface IOrderService extends IService<Order> {
 	 * @return
 	 */
 	R<OrderVO> submit(Order order);
+	/**
+	 * 保存采购询价信息
+	 * @param submitDto
+	 * @return
+	 */
+	R<OrderSubmitDto> savePurchase(OrderSubmitDto submitDto);
 
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -195,6 +195,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = this.getOrderItems(vo.getId(),null);
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
+			vo.setOrderItemsList(orderItemsList);
 			vo.setItemsVOList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
 		}
 		//获取订单费用信息
@@ -452,6 +453,35 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return R.data(vo);
 	}
 
+	@Override
+	public R<OrderSubmitDto> savePurchase(OrderSubmitDto submitDto) {
+		if (submitDto.getId()== null){
+			submitDto.setCreateUser(SecureUtil.getUserId());
+			submitDto.setCreateTime(new Date());
+			baseMapper.insert(submitDto);
+		}else {
+			submitDto.setUpdateUser(SecureUtil.getUserId());
+			submitDto.setUpdateTime(new Date());
+			baseMapper.updateById(submitDto);
+		}
+		if (CollectionUtils.isNotEmpty(submitDto.getOrderItemsList())){
+			submitDto.getOrderItemsList().stream().forEach(item ->{
+				item.setTenantId(SecureUtil.getTenantId());
+				if (item.getId() == null){
+					item.setPid(submitDto.getId());
+					item.setCreateUser(SecureUtil.getUserId());
+					item.setCreateTime(new Date());
+					orderItemsService.save(item);
+				}else {
+					item.setUpdateUser(SecureUtil.getUserId());
+					item.setUpdateTime(new Date());
+					orderItemsService.updateById(item);
+				}
+			});
+		}
+		return R.data(submitDto);
+	}
+
 	/**
 	 * 获取订单明细数据
 	 *