Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -159,5 +159,32 @@ public class GoodsDesc implements Serializable {
 	@TableField(exist = false)
 	private List<GoodsFiles> filesList;
 
+	/**
+	 * 规格尺寸1
+	 * */
+	private String specsOne;
+
+	/**
+	 * 规格尺寸2
+	 * */
+	private String specsTwo;
+
+	/**
+	 * 级别
+	 * */
+	private String level;
+
+	/**
+	 * 产地
+	 * */
+	private String placeProduction;
+
+	/**
+	 * 三包
+	 * */
+	private String threeGuarantees;
+
+
+
 
 }

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

@@ -309,5 +309,19 @@ public class Delivery implements Serializable {
 		@TableField(exist = false)
 		private List<Map<String, Object>> salesCompanyNameList;
 
+	@ApiModelProperty(value = "详情回显所属公司中文名")
+	@TableField(exist = false)
+	private List<Map<String,Object>> companyName;
 
+	@TableField(exist = false)
+	private String businessStartDate;
+
+	@TableField(exist = false)
+	private String businessEndDate;
+
+	@TableField(exist = false)
+	private String createStartTime;
+
+	@TableField(exist = false)
+	private String createEndTime;
 }

blade-service/blade-client/src/main/java/org/springblade/client/affairs/controller/AffairsController.java

@@ -1,6 +1,7 @@
 package org.springblade.client.affairs.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -12,6 +13,7 @@ import org.springblade.client.goods.enums.GoodsTypeEnum;
 import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -108,6 +110,18 @@ public class AffairsController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入goodsDesc")
 	public R submit(@Valid @RequestBody GoodsDesc goodsDesc) {
+		 //验证唯一性
+		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getCode,goodsDesc.getCode());
+		lambdaQueryWrapper.eq(GoodsDesc::getCname,goodsDesc.getCname());
+		lambdaQueryWrapper.eq(GoodsDesc::getType,1);
+		int count = goodsDescService.count(lambdaQueryWrapper);
+		if(count>0)
+		{
+			throw new ServiceException("存在重复数据,请修改后添加");
+		}
+
+
 		if (StringUtils.isBlank(goodsDesc.getTenantId())) {
 			goodsDesc.setTenantId(AuthUtil.getTenantId());
 		}

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.client.goods.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -177,6 +178,16 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	@Transactional
 	public void modify(GoodsDesc goodsDesc)
 	{
+		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(GoodsDesc::getType,0);
+		lambdaQueryWrapper.eq(GoodsDesc::getCode,goodsDesc.getCode());
+		lambdaQueryWrapper.eq(GoodsDesc::getCname,goodsDesc.getCname());
+		int count = baseMapper.selectCount(lambdaQueryWrapper);
+		if(count>0)
+		{
+			throw new ServiceException("存在重复数据,请修改后添加");
+		}
+
 		List<GoodsFiles> filesList = goodsDesc.getFilesList();
 		List<GoodsPrice> chilList=new ArrayList<>();
 		if(CollectionUtils.isNotEmpty(goodsDesc.getBuyGoodsPrice()))

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ReCeVingController.java

@@ -16,7 +16,9 @@
  */
 package org.springblade.deliver.goods.receiving;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.enums.OrderTypeEnum;
 import io.swagger.annotations.Api;
@@ -26,6 +28,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 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;
@@ -68,11 +71,13 @@ public class ReCeVingController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入delivery")
 	public R<IPage<Delivery>> list(Delivery delivery, Query query) {
-		delivery.setIsDeleted(0);
-		delivery.setTenantId(SecureUtil.getTenantId());
-		delivery.setBillType(OrderTypeEnum.RECEIPT.getType());
-		delivery.setTradeType(OrderTypeEnum.DOMESTIC.getType());
-		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), Condition.getQueryWrapper(delivery));
+		QueryWrapper<Delivery> queryWrapper = Condition.getQueryWrapper(delivery);
+		queryWrapper.eq("bill_type","SH")
+		.eq("trade_type","GN")
+		.eq("tenant_id", AuthUtil.getTenantId())
+		.between(StringUtils.isNotBlank(delivery.getCreateStartTime())&&StringUtils.isNotBlank(delivery.getCreateEndTime()),"create_time",delivery.getCreateStartTime(),delivery.getCreateEndTime())
+		.between(StringUtils.isNotBlank(delivery.getBusinessStartDate())&&StringUtils.isNotBlank(delivery.getBusinessEndDate()),"business_date",delivery.getBusinessStartDate(),delivery.getBusinessEndDate());
+		IPage<Delivery> pages = deliveryService.page(Condition.getPage(query), queryWrapper);
 		return R.data(pages);
 	}
 	/**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -132,6 +132,15 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				selectById.setSalesCompanyNameList(corpMessage.getData());
 			}
 		}
+
+		//获取所属公司
+		if (selectById.getSalesCompany() != null){
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(String.valueOf(selectById.getSalesCompany()));
+			if (corpMessage.isSuccess() && corpMessage.getData() != null){
+				selectById.setCompanyName(corpMessage.getData());
+			}
+		}
+
 		//获取销售客户中文名
 		//获取发货明细表数据
 		List<DeliveryItems> deliveryItemsList = deliveryItemsService.getDeliveryItems(delivery);

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

@@ -87,6 +87,8 @@ public class PurchaseOrderController extends BladeController {
 								 @RequestParam(value = "dateOfEndArrival",required = false) String dateOfEndArrival,//付款开始时间,
 								 @RequestParam(value = "requiredDeliveryStartDate",required = false) String requiredDeliveryStartDate,//付款开始时间
 								 @RequestParam(value = "requiredDeliveryEndDate",required = false) String requiredDeliveryEndDate,//付款开始时间
+								 @RequestParam(value = "requiredArrivalStartDate",required = false) String requiredArrivalStartDate,//付款开始时间
+								 @RequestParam(value = "requiredArrivalEndDate",required = false) String requiredArrivalEndDate,//付款开始时间
 								 Order order
 								)
 	{
@@ -99,6 +101,7 @@ public class PurchaseOrderController extends BladeController {
 		queryWrapper.between(StringUtils.isNotBlank(accountsCollectionStartDate)&&StringUtils.isNotBlank(accountsCollectionEndDate),"accounts_collection_date",accountsCollectionStartDate,accountsCollectionEndDate);
 		queryWrapper.between(StringUtils.isNotBlank(dateOfStartArrival)&&StringUtils.isNotBlank(dateOfEndArrival),"arrival_date",dateOfStartArrival,dateOfEndArrival);
 		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);
 		Page<Order> page=new Page<>(current,size);
 		IPage<Order> pages = orderService.page(page,queryWrapper);
 		List<Order> records = pages.getRecords();