Browse Source

Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

1021934019@qq.com 4 years ago
parent
commit
796eae93a9

+ 1 - 0
blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -335,5 +335,6 @@ public class Delivery implements Serializable {
 	private Integer deliveryType;
 
 	@TableField(exist = false)
+	@ApiModelProperty(value = "仓库中文名")
 	private String storageName;
 }

+ 9 - 1
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -28,7 +28,9 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.feign.IStorageClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
@@ -63,7 +65,7 @@ public class DeliveryController extends BladeController {
 	private final IDeliveryService deliveryService;
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IUserClient iUserClient;//获取用户信息
-
+	private IStorageClient iStorageClient;//库区信息
 	/**
 	 * 详情
 	 */
@@ -118,6 +120,12 @@ public class DeliveryController extends BladeController {
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());
 				}
+				//仓库信息
+				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
+				if(storageDesc!=null)
+				{
+					item.setStorageName(storageDesc.getCname());
+				}
 
 			});
 		}

+ 9 - 0
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ExportDeliveryController.java

@@ -27,7 +27,9 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.feign.IStorageClient;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -60,6 +62,7 @@ public class ExportDeliveryController extends BladeController {
 	private final IDeliveryService deliveryService;
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IUserClient iUserClient;//获取用户信息
+	private IStorageClient iStorageClient;//库区信息
 
 	/**
 	 * 详情
@@ -115,6 +118,12 @@ public class ExportDeliveryController extends BladeController {
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());
 				}
+				//仓库信息
+				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
+				if(storageDesc!=null)
+				{
+					item.setStorageName(storageDesc.getCname());
+				}
 			});
 		}
 		return R.data(pages);

+ 9 - 1
blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/ImportDeliveryController.java

@@ -28,7 +28,9 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
+import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.feign.IStorageClient;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -64,7 +66,7 @@ public class ImportDeliveryController extends BladeController {
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IUserClient iUserClient;//获取用户信息
 	private IStockGoodsClient stockGoodsClient;
-
+	private IStorageClient iStorageClient;//库区信息
 	/**
 	 * 详情
 	 */
@@ -119,6 +121,12 @@ public class ImportDeliveryController extends BladeController {
 				if (user.isSuccess() && user.getData() != null){
 					item.setCreateUserName(user.getData().getName());
 				}
+				//仓库信息
+				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
+				if(storageDesc!=null)
+				{
+					item.setStorageName(storageDesc.getCname());
+				}
 			});
 		}
 		return R.data(pages);

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

@@ -186,7 +186,7 @@ public class OrderController extends BladeController {
 		Order orderMessage = orderService.getById(order.getId());
 		//是否生成采购单
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQueryWrapper.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQueryWrapper.eq(Order::getTradeType,OrderTypeEnum.DOMESTIC.getType());
 		lambdaQueryWrapper.eq(Order::getIsDeleted,0);
 		lambdaQueryWrapper.eq(Order::getBillType,OrderTypeEnum.PURCHASE.getType());
@@ -196,7 +196,7 @@ public class OrderController extends BladeController {
 		}
 		//是否生成发货单
 		LambdaQueryWrapper<Order> lambdaQuery = new LambdaQueryWrapper<>();
-		lambdaQuery.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQuery.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQuery.eq(Order::getTradeType,OrderTypeEnum.DOMESTIC.getType());
 		lambdaQuery.eq(Order::getBillType,OrderTypeEnum.SHIP.getType());
 		lambdaQuery.eq(Order::getIsDeleted,0);

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

@@ -172,7 +172,7 @@ public class EntranceOrderController extends BladeController {
 		Order orderMessage = orderService.getById(order.getId());
 		//是否生成采购单
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQueryWrapper.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQueryWrapper.eq(Order::getTradeType,OrderTypeEnum.IMPORT.getType());
 		lambdaQueryWrapper.eq(Order::getBillType,OrderTypeEnum.PURCHASE.getType());
 		lambdaQueryWrapper.eq(Order::getIsDeleted,0);
@@ -182,7 +182,7 @@ public class EntranceOrderController extends BladeController {
 		}
 		//是否生成发货单
 		LambdaQueryWrapper<Order> lambdaQuery = new LambdaQueryWrapper<>();
-		lambdaQuery.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQuery.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQuery.eq(Order::getTradeType,OrderTypeEnum.DOMESTIC.getType());
 		lambdaQuery.eq(Order::getBillType,OrderTypeEnum.SHIP.getType());
 		lambdaQuery.eq(Order::getIsDeleted,0);

+ 2 - 2
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportEnquiryController.java

@@ -161,7 +161,7 @@ public class ExportEnquiryController extends BladeController {
 		//先查订单信息
 		Order orderMessage = orderService.getById(order.getId());
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQueryWrapper.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQueryWrapper.eq(Order::getTradeType,OrderTypeEnum.IMPORT.getType());
 		lambdaQueryWrapper.eq(Order::getBillType,OrderTypeEnum.SALES.getType());
 		lambdaQueryWrapper.eq(Order::getIsDeleted,0);
@@ -206,7 +206,7 @@ public class ExportEnquiryController extends BladeController {
 		}
 		order.setBillType(OrderTypeEnum.SALES.getType());
 		order.setTradeType(OrderTypeEnum.EXPORT.getType());
-		return R.data(orderService.createMarket(order));
+		return R.data(orderService.quotation(order));
 	}
 	/**
 	 * 确认询价单

+ 2 - 2
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -162,7 +162,7 @@ public class ExportOrderController extends BladeController {
 		Order orderMessage = orderService.getById(order.getId());
 		//是否生成采购单
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQueryWrapper.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQueryWrapper.eq(Order::getTradeType,OrderTypeEnum.EXPORT.getType());
 		lambdaQueryWrapper.eq(Order::getBillType,OrderTypeEnum.PURCHASE.getType());
 		lambdaQueryWrapper.eq(Order::getIsDeleted,0);
@@ -172,7 +172,7 @@ public class ExportOrderController extends BladeController {
 		}
 		//是否生成发货单
 		LambdaQueryWrapper<Order> lambdaQuery = new LambdaQueryWrapper<>();
-		lambdaQuery.eq(Order::getSysNo,orderMessage.getSysNo());
+		lambdaQuery.eq(Order::getSrcOrderNo,orderMessage.getSysNo());
 		lambdaQuery.eq(Order::getTradeType,OrderTypeEnum.DOMESTIC.getType());
 		lambdaQuery.eq(Order::getBillType,OrderTypeEnum.SHIP.getType());
 		lambdaQuery.eq(Order::getIsDeleted,0);

+ 8 - 1
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderService.java

@@ -71,11 +71,18 @@ public interface IOrderService extends IService<Order> {
 	 */
 	R affirm(Order order);
 	/**
-	 * 保存订单信息
+	 * 销售单生成采购单
 	 * @param order
 	 * @return
 	 */
 	R createMarket(Order order);
+	/**
+	 * 报价单生成销售单
+	 * @param order
+	 * @return
+	 */
+	R quotation(Order order);
+
 
 	List<OrderItemBillNoVO> findContractNoByBillNo(@Param("billNo")String billNo, @Param("billType")String billType);
 

+ 86 - 0
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -354,6 +354,92 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
+	public R quotation(Order order) {
+		Order selectById = baseMapper.selectById(order.getId());
+		if (selectById == null){
+			throw  new RuntimeException("找不到单据信息");
+		}
+		//保存订单主表信息
+		//获取系统编号
+		R billNo = serialClient.getBillNo(order.getBillType(),order.getTradeType());
+		if (billNo.getCode() != 200){
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			throw  new RuntimeException("生成系统编号失败");
+		}
+		R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(selectById.getCorpId());
+		if (corpMessage.isSuccess()){
+			R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(),order.getTradeType());
+			if (!clientBillNo.isSuccess()){
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				return R.fail(500,"生成订单编号失败");
+			}
+			selectById.setOrderNo((String) clientBillNo.getData());
+			selectById.setOrgOrderNo(selectById.getOrderNo());
+		}
+		selectById.setSrcId(order.getId());
+		selectById.setSrcOrderNo(selectById.getSysNo());
+		selectById.setId(null);
+		selectById.setSysNo((String) billNo.getData());
+		selectById.setTenantId(SecureUtil.getTenantId());
+		selectById.setCreateTime(new Date());
+		selectById.setCreateUser(SecureUtil.getUserId());
+		selectById.setUpdateUser(null);
+		selectById.setUpdateTime(null);
+		selectById.setOrderStatus("录入");
+		selectById.setIfEnquiry(null);
+		selectById.setIfShipping(null);
+		selectById.setIfInvoice("否");
+		selectById.setBillType(order.getBillType());
+		selectById.setTradeType(order.getTradeType());
+		selectById.setBillType(order.getBillType());
+		selectById.setTradeType(order.getTradeType());
+		if (order.getBusinesDate() == null){
+			selectById.setBusinesDate(new Date());
+		}
+		baseMapper.insert(selectById);
+		//保存订单费用明细
+		List<OrderFees> orderFeesList = orderFeesService.list(new QueryWrapper<OrderFees>().eq("pid", order.getId()).eq("is_deleted", 0));
+		if (CollectionUtils.isNotEmpty(orderFeesList)){
+			orderFeesList.stream().forEach(fee ->{
+				fee.setPid(selectById.getId());
+				fee.setId(null);
+				fee.setCreateTime(new Date());
+				fee.setCreateUser(SecureUtil.getUserId());
+				fee.setUpdateTime(null);
+				fee.setUpdateUser(null);
+				orderFeesService.save(fee);
+			});
+		}
+		//保存订单明细
+		List<OrderItems> orderItemsList = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", order.getId()).eq("is_deleted", 0));
+		if (CollectionUtils.isNotEmpty(orderItemsList)){
+			orderItemsList.stream().forEach(item ->{
+				item.setPid(selectById.getId());
+				item.setId(null);
+				item.setCreateTime(new Date());
+				item.setCreateUser(SecureUtil.getUserId());
+				item.setUpdateTime(null);
+				item.setUpdateUser(null);
+				orderItemsService.save(item);
+			});
+		}
+		//保存订单文件信息
+		List<OrderFiles> orderFilesList = orderFilesService.list(new QueryWrapper<OrderFiles>().eq("pid", order.getId()).eq("is_deleted", 0));
+		if (CollectionUtils.isNotEmpty(orderFilesList)){
+			orderFilesList.stream().forEach(file ->{
+				file.setPid(selectById.getId());
+				file.setId(null);
+				file.setCreateTime(new Date());
+				file.setCreateUser(SecureUtil.getUserId());
+				file.setUpdateTime(null);
+				file.setUpdateUser(null);
+				orderFilesService.save(file);
+			});
+		}
+		return R.data(order);
+	}
+
+	@Override
 	public List<OrderItemBillNoVO> findContractNoByBillNo(String billNo, String billType)
 	{
 		return orderMapper.findContractNoByBillNo(billNo,billType);