采购订单相关接口暂提

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/entity/StockGoods.java

@@ -283,6 +283,24 @@ public class StockGoods implements Serializable {
 		@TableField(exist = false)
 		private String updateUserName;
 
+		/**
+		 * 进口的采购订单号  出口销售订单号
+		 */
+		@ApiModelProperty(value = "进口的采购订单号  出口销售订单号")
+		private String orderNo;
+
+		/**
+		 * 进口的提单号
+		 */
+		@ApiModelProperty(value = "进口的提单号")
+		private String billNo;
+
+		/**
+		 * 合同号
+		 */
+		@ApiModelProperty(value = "合同号")
+		private String contractNumber;
+
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/serial/controller/StorageDescController.java

@@ -16,6 +16,8 @@
  */
 package org.springblade.client.serial.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +29,7 @@ import javax.validation.Valid;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -36,6 +39,9 @@ import org.springblade.client.vo.StorageDescVO;
 import org.springblade.client.serial.service.IStorageDescService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * 库区表 控制器
  *
@@ -145,5 +151,21 @@ public class StorageDescController extends BladeController {
 		return R.status(storageDescService.removeByIds(Func.toLongList(ids)));
 	}
 
+	/**
+	 * 仓库列表全部返回
+	 */
+	@GetMapping("/storage/list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "仓库列表", notes = "无需传入")
+	public List<?> storageList()
+	{
+		LambdaQueryWrapper<StorageDesc> storageDescLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		storageDescLambdaQueryWrapper
+			.eq(StorageDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(StorageDesc::getIsDeleted,0);
+		List<StorageDesc> list = storageDescService.list(storageDescLambdaQueryWrapper);
+		return CollectionUtils.isEmpty(list)?Collections.EMPTY_LIST:list;
+	}
+
 
 }

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

@@ -33,7 +33,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-@SeataCloudApplication
+/*@SeataCloudApplication*/
 public class PurchaseSalesApplication {
 
 	public static void main(String[] args) {

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

@@ -1,5 +1,6 @@
 package org.springblade.purchase.sales.entrance;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -15,11 +16,16 @@ 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.Order;
+import org.springblade.purchase.sales.entity.OrderItems;
+import org.springblade.purchase.sales.service.IOrderItemsService;
 import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.purchase.sales.vo.OrderVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 进口销售单控制器
@@ -32,6 +38,8 @@ public class EntranceOrderController extends BladeController {
 
 	private final IOrderService orderService;
 
+	private final IOrderItemsService itemsService;
+
 	/**
 	 * 详情
 	 */
@@ -133,4 +141,38 @@ public class EntranceOrderController extends BladeController {
 		order.setTradeType(OrderTypeEnum.IMPORT.getType());
 		return R.data(orderService.deliverGoods(order));
 	}
+
+
+	/**
+	 * 根据提单号查询合同号
+	 * @param billNo
+	 * @return
+	 */
+	@GetMapping("/findContractNoByBillNo")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "通过提单号查询合同号", notes = "传入提单号")
+	public List<Order> findContractNoByBillNo(@ApiParam(value = "billNo", required = true) @RequestParam String billNo)
+	{
+		LambdaQueryWrapper<OrderItems> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemsLambdaQueryWrapper.eq(OrderItems::getBillNo,billNo.trim());
+		List<OrderItems> orderItems = itemsService.list(itemsLambdaQueryWrapper);
+		if(CollectionUtils.isEmpty(orderItems))
+		{
+			throw new SecurityException("无此提单号的记录");
+		}
+		List<Long> pids = orderItems.stream().map(OrderItems::getPid).distinct().collect(Collectors.toList());
+		if(CollectionUtils.isEmpty(pids))
+		{
+			return Collections.EMPTY_LIST;
+		}
+		else
+		{
+			LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
+			orderLambdaQueryWrapper.in(Order::getId,pids);
+			return orderService.list(orderLambdaQueryWrapper);
+		}
+
+	}
+
+
 }