达沃特修改

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/OrderVO.java

@@ -137,4 +137,9 @@ public class OrderVO extends Order {
 	 */
 	@ApiModelProperty(value = "删除的id")
 	private String ids;
+	/**
+	 * 是否收款
+	 */
+	@ApiModelProperty(value = "是否收款 0 已收款 1 未收款")
+	private Integer gathering;
 }

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

@@ -153,6 +153,11 @@ public class OrderController extends BladeController {
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryStart()), Order::getPlannedDeliveryDate, order.getPlannedDeliveryStart());//计划交货开始
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getPlannedDeliveryEnd()), Order::getPlannedDeliveryDate, order.getPlannedDeliveryEnd());//计划交货结束
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderRemark()), Order::getOrderRemark, order.getOrderRemark());//备注
+		if (order.getGathering() != null && order.getGathering() == 0){
+			lambdaQueryWrapper.eq(Order::getBalanceAmount,BigDecimal.ZERO);
+		}else if (order.getGathering() != null && order.getGathering() == 1){
+			lambdaQueryWrapper.gt(Order::getBalanceAmount,BigDecimal.ZERO);
+		}
 		lambdaQueryWrapper.orderByDesc(Order::getId);
 		IPage<Order> page = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {

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

@@ -82,7 +82,7 @@ public interface IOrderItemsService extends IService<OrderItems> {
 	 * @param isCovered
 	 * @return
 	 */
-	R<List<OrderItems>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId);
+	R<Map<String,Object>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId);
 
 	/**
 	 * 获取订单明细

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -151,8 +151,10 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	}
 
 	@Override
-	public R<List<OrderItems>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId) {
-		List<OrderItems> list = new ArrayList<>();
+	public R<Map<String,Object>> importDealerOrder(List<DealerOrderItem> data, Boolean isCovered, Long storageId) {
+		Map<String,Object> map = new HashMap<>();
+		List<OrderItems> list = new ArrayList<>();//导入成功的
+		List<String> lose = new ArrayList<>();//导入失败的
 		data.forEach(item -> {
 			R<GoodsDesc> goods = goodsDescClient.GoodsByCode(item.getCode());
 			if (goods.isSuccess() && goods.getData() != null) {
@@ -202,9 +204,13 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 				}
 
 				list.add(orderItems);
+			}else {
+				lose.add(item.getCode());
 			}
 		});
-		return R.data(list);
+		map.put("list",list);
+		map.put("lose",lose);
+		return R.data(map);
 	}
 
 	/**

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

@@ -156,6 +156,7 @@ public class PurchaseOrderController extends BladeController {
 
 					             @RequestParam(value = "creditStartDate",required = false) String creditStartDate,//信用证到期日-开始日期  credit_date
 					             @RequestParam(value = "creditEndDate",required = false) String creditEndDate,//信用证到期日-结束时间
+					             @RequestParam(value = "gathering",required = false) Integer gathering,//是否付款 0 已付款 1 未付款
 								 Order order
 								)
 	{
@@ -213,6 +214,11 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.between(StringUtils.isNotBlank(requiredDeliveryStartDate)&&StringUtils.isNotBlank(requiredDeliveryEndDate),"required_delivery_date",requiredDeliveryStartDate,requiredDeliveryEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(requiredArrivalStartDate)&&StringUtils.isNotBlank(requiredArrivalEndDate),"required_arrival_date",requiredArrivalStartDate,requiredArrivalEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(creditStartDate)&&StringUtils.isNotBlank(creditEndDate),"credit_date",creditStartDate,creditEndDate);
+		if (gathering != null && gathering == 0){
+			queryWrapper.eq("balance_amount",BigDecimal.ZERO);
+		}else if (gathering != null && gathering == 1){
+			queryWrapper.gt("balance_amount",BigDecimal.ZERO);
+		}
 		queryWrapper.orderByDesc("create_time");
 		Page<Order> page=new Page<>(current,size);
 		IPage<Order> pages = orderService.page(page,queryWrapper);