提交

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IStorageClient.java

@@ -24,7 +24,7 @@ public interface IStorageClient {
 	String FIND_BY_ID = API_PREFIX + "/findById";
 
     @GetMapping(FIND_BY_ID)
-	public StorageDesc findById(@RequestParam(value = "id",required = true) Long id);
+	StorageDesc findById(@RequestParam(value = "id",required = true) Long id);
 
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -583,19 +583,7 @@ public class Order extends OrderBase {
 	@TableField(exist = false)
 	private BigDecimal actualQuantity;
 
-	/**
-	 * 总件数
-	 */
-	@ApiModelProperty(value = "总件数")
-	@TableField(exist = false)
-	private String orderQuantity;
 
-	/**
-	 * 总收件数
-	 */
-	@ApiModelProperty(value = "总收件数")
-	@TableField(exist = false)
-	private String actualQuantity;
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/storage/feign/StorageClient.java

@@ -34,7 +34,7 @@ import java.util.stream.Collectors;
 public class StorageClient implements IStorageClient {
 	private final IStorageDescService storageDescService;
 
-	@GetMapping("findById")
+	@GetMapping(FIND_BY_ID)
    	public StorageDesc findById(@RequestParam(value = "id",required = true) Long id)
 	{
 		return  storageDescService.getById(id);

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

@@ -40,6 +40,7 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -89,8 +90,10 @@ public class PurchaseOrderController extends BladeController {
 	public R<?> list( @RequestParam(name = "current", defaultValue = "1") Integer current,
 								 @RequestParam(name = "size", defaultValue = "10") Integer size,
 					 			 @RequestParam(value = "billNo",required = false) String billNo,//提单号
+					 			 @RequestParam(value = "orderNo",required = false) String orderNo,//合同号
 								 @RequestParam(value = "strCorpName",required = false) String strCorpName,//供应商名称
 								 @RequestParam(value = "strPurchaserName",required = false) String strPurchaserName,//采购商名称
+								 @RequestParam(value = "salesName",required = false) String salesName,//业务员
 
 								 @RequestParam(value = "businesStartDate",required = false) String businesStartDate,//订单开始时间  busines_date
 								 @RequestParam(value = "businesEndDate",required = false) String businesEndDate,//订单结束时间
@@ -145,6 +148,8 @@ public class PurchaseOrderController extends BladeController {
 			}
 
 		}
+		queryWrapper.like(StringUtils.isNotBlank(salesName),"sales_name",salesName);
+		queryWrapper.like(StringUtils.isNotBlank(orderNo),"order_no",orderNo);
 		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
 		queryWrapper.eq("bill_type",OrderTypeEnum.PURCHASE.getType());
 		queryWrapper.eq("trade_type",order.getTradeType());
@@ -179,8 +184,25 @@ public class PurchaseOrderController extends BladeController {
 					}
 				}
 
+				List<OrderItems> orderItemsList = orderItemsService.list(new LambdaQueryWrapper<OrderItems>().eq(OrderItems::getIsDeleted, 0).eq(OrderItems::getPid, e.getId()));
+				//是否有子项
 				Boolean flag=orderItemsService.count(new LambdaQueryWrapper<OrderItems>().eq(OrderItems::getPid,e.getId()))>0?true:false;
-				e.setHasItem(flag);
+				if(CollectionUtils.isNotEmpty(orderItemsList))
+				{
+					//子项总件数
+					BigDecimal orderQuantity = orderItemsList.stream().filter(it -> it.getOrderQuantity() != null)
+						.map(OrderItems::getOrderQuantity)
+						.reduce(BigDecimal.ZERO, BigDecimal::add);
+					e.setOrderQuantity(orderQuantity);
+
+					//子项总收货数
+					BigDecimal actualQuantity = orderItemsList.stream().filter(it -> it.getActualQuantity() != null)
+						.map(OrderItems::getOrderQuantity)
+						.reduce(BigDecimal.ZERO, BigDecimal::add);
+					e.setActualQuantity(actualQuantity);
+				}
+
+
 			});
 		}
 		return R.data(pages);