2023年8月21日18:05:13

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/feign/IBrandClient.java

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * @author caifc
  * @date 2023年8月14日10:18:34
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface IBrandClient {
 	String API_PREFIX = "/blade-sales-part";
 	String GET_BRAND = API_PREFIX + "/getBrand";
+	String GET_BRAND_LIST = API_PREFIX + "/getBrandList";
 
 
 	/**
@@ -30,4 +33,13 @@ public interface IBrandClient {
 	 */
 	@GetMapping(GET_BRAND)
 	PjBrandDesc getBrand(@RequestBody PjBrandDesc brandDesc);
+
+	/**
+	 * 获取品牌
+	 *
+	 * @param brandDesc
+	 * @return
+	 */
+	@GetMapping(GET_BRAND_LIST)
+	List<PjBrandDesc> getBrandList(@RequestBody PjBrandDesc brandDesc);
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/Maintenance.java

@@ -264,5 +264,9 @@ public class Maintenance implements Serializable {
 	@ApiModelProperty(value = "档案id")
 	private Long archivesId;
 
+	//维修描述
+	@ApiModelProperty(value = "维修描述")
+	private Long repairDescription;
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsInfoPartsExcel.java

@@ -71,7 +71,7 @@ public class GoodsInfoPartsExcel implements Serializable {
 	@ExcelProperty("进货价(必填)")
 	private BigDecimal purchasePrice;
 
-	//规格尺寸	@ExcelProperty("规格尺寸")
+	@ExcelProperty("规格尺寸")
 	private String specs;
 
 
@@ -83,10 +83,19 @@ public class GoodsInfoPartsExcel implements Serializable {
 
 
 	//是否批次号管理
-	@ExcelProperty("是否批次号管理")
+	@ExcelProperty("是否批次号管理(0否 1是)")
 	private String whether;
 
 	/**
+	 * 是否为积分商品
+	 */
+	@ExcelProperty("是否为积分商品(0否 1是)")
+	private String whetherIntegral;
+
+	@ApiModelProperty(value = "商品积分")
+	private BigDecimal integral;
+
+	/**
 	 * 门店积分
 	 */
 	@ExcelProperty("门店积分")
@@ -104,6 +113,15 @@ public class GoodsInfoPartsExcel implements Serializable {
 	@ExcelProperty("业务员积分")
 	private BigDecimal salesmanIntegral;
 
+	/**
+	 * 厂家
+	 */
+	@ExcelProperty(value = "厂家")
+	private String corpName;
+
+	@ExcelProperty(value = "备注")
+	private String remarks;
+
 
 
 

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

@@ -818,7 +818,31 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 						goodsDesc.setBrandId(pjBrandDesc.getId());
 					}
 				}
-
+				if (ObjectUtils.isNotNull(e.getCategoryitem())) {
+					PjBrandDesc brandDesc = new PjBrandDesc();
+					brandDesc.setCname(e.getCategoryitem());
+					List<PjBrandDesc> pjBrandDescList = brandClient.getBrandList(brandDesc);
+					goodsDesc.setCategoryitem(e.getCategoryitem());
+					if (ObjectUtils.isNotNull(pjBrandDescList) && pjBrandDescList.size() > 0) {
+						StringBuilder ids = new StringBuilder();
+						for (PjBrandDesc item : pjBrandDescList) {
+							ids.append(item.getId()).append(",");
+						}
+						goodsDesc.setCategoryitemId(ids.toString());
+					}
+				}
+				if (ObjectUtils.isNotNull(e.getCorpName())) {
+					LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+					lambdaQueryWrapper.eq(CorpsDesc::getCname, e.getCorpName())
+						.eq(CorpsDesc::getCorpType, "GS")
+						.eq(CorpsDesc::getIsDeleted, 0)
+						.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId());
+					CorpsDesc corpsDesc = corpsDescMapper.selectOne(lambdaQueryWrapper);
+					if (ObjectUtils.isNotNull(corpsDesc)) {
+						goodsDesc.setCorpId(corpsDesc.getId());
+						goodsDesc.setCorpName(corpsDesc.getCname());
+					}
+				}
 				goodsDesc.setType(0L);
 				goodsDesc.setCode(goodsDesc.getCname());
 				goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));

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

@@ -952,26 +952,28 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			List<BusinessOverpaymentItem> businessOverpaymentItemList = new ArrayList<>();
 			BigDecimal packageAmount = new BigDecimal("0.00");
 			List<OrderFees> orderFees = orderDescClient.getOrderFee(delivery.getSrcId());
+			List<DeliveryFees> deliveryFees = deliveryFeesService.list(new LambdaQueryWrapper<DeliveryFees>()
+				.eq(DeliveryFees::getPid, delivery.getId())
+				.eq(DeliveryFees::getTenantId, AuthUtil.getTenantId())
+				.eq(DeliveryFees::getIsDeleted, 0));
+			BigDecimal orderFeesAmount = new BigDecimal("0.00");
+			BigDecimal deliveryFeesAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(orderFees) && orderFees.size() > 0) {
-				List<DeliveryFees> deliveryFees = deliveryFeesService.list(new LambdaQueryWrapper<DeliveryFees>()
-					.eq(DeliveryFees::getPid, delivery.getId())
-					.eq(DeliveryFees::getTenantId, AuthUtil.getTenantId())
-					.eq(DeliveryFees::getIsDeleted, 0));
-				if (ObjectUtils.isNotNull(deliveryFees) && deliveryFees.size() > 0) {
-					BigDecimal orderFeesAmount = orderFees.stream().map(OrderFees::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-					BigDecimal deliveryFeesAmount = deliveryFees.stream().map(DeliveryFees::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-					packageAmount = orderFeesAmount.subtract(deliveryFeesAmount);
-				}
-				if (new BigDecimal("0.00").compareTo(packageAmount) != 0){
-					BusinessOverpaymentItem overpaymentItem = new BusinessOverpaymentItem();
-					overpaymentItem.setBillNo(delivery.getSrcOrderNo());
-					overpaymentItem.setSrcOrderNo(delivery.getSysNo());
-					overpaymentItem.setOrderNo(delivery.getSysNo());
-					overpaymentItem.setSrcPid(delivery.getId());
-					overpaymentItem.setSrcId(delivery.getId());
-					overpaymentItem.setOverpayment(packageAmount);
-					businessOverpaymentItemList.add(overpaymentItem);
-				}
+				orderFeesAmount = orderFees.stream().map(OrderFees::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+			}
+			if (ObjectUtils.isNotNull(deliveryFees) && deliveryFees.size() > 0) {
+				deliveryFeesAmount = deliveryFees.stream().map(DeliveryFees::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+			}
+			packageAmount = orderFeesAmount.subtract(deliveryFeesAmount);
+			if (new BigDecimal("0.00").compareTo(packageAmount) != 0) {
+				BusinessOverpaymentItem overpaymentItem = new BusinessOverpaymentItem();
+				overpaymentItem.setBillNo(delivery.getSrcOrderNo());
+				overpaymentItem.setSrcOrderNo(delivery.getSysNo());
+				overpaymentItem.setOrderNo(delivery.getSysNo());
+				overpaymentItem.setSrcPid(delivery.getId());
+				overpaymentItem.setSrcId(delivery.getId());
+				overpaymentItem.setOverpayment(packageAmount);
+				businessOverpaymentItemList.add(overpaymentItem);
 			}
 
 			//获取溢付款金额 溢付款金额等于发货数量-到货数量的值 乘以单价 等于溢付款

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

@@ -1317,10 +1317,10 @@ public class ExportOrderController extends BladeController {
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getBillType, OrderTypeEnum.SALES.getType())
 			.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType())
-			.isNotNull(Order::getProductionScheduling)
+			.and(i -> i.ne(Order::getProductionScheduling, "").isNotNull(Order::getProductionScheduling))
 			.and(i -> i.apply("storage_quantity > purchase_quantity").or()
 				.apply("storage_quantity_pj > purchase_quantity_pj"))
-		.orderByDesc(Order::getCreateTime);//销售数量大于采购数量
+			.orderByDesc(Order::getCreateTime);//销售数量大于采购数量
 		List<Order> orderList = orderService.list(lambdaQueryWrapper);
 		return R.data(orderList);
 	}
@@ -1346,6 +1346,7 @@ public class ExportOrderController extends BladeController {
 					.eq(Order::getTenantId, AuthUtil.getTenantId())
 					.eq(Order::getBillType, OrderTypeEnum.SALES.getType())
 					.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType())
+					.and(i -> i.ne(Order::getProductionScheduling, "").isNotNull(Order::getProductionScheduling))
 					.and(i -> i.apply("storage_quantity > purchase_quantity").or()
 						.apply("storage_quantity_pj > purchase_quantity_pj"));//销售数量大于采购数量
 				List<Order> orderList = orderService.list(orderLambdaQueryWrapper);
@@ -1365,6 +1366,7 @@ public class ExportOrderController extends BladeController {
 		}
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(orderItems.getCorpId()), OrderItems::getCorpId, orderItems.getCorpId());//供应商
 		//0代表不显示全部
+		lambdaQueryWrapper.and(i -> i.ne(OrderItems::getFudaPurchaseStatus, "").isNotNull(OrderItems::getFudaPurchaseStatus));
 		if (ObjectUtils.isNotEmpty(orderItems.getShowAll()) && orderItems.getShowAll() == 0) {
 			//采购状态
 //			lambdaQueryWrapper.eq(OrderItems::getFudaPurchaseStatus, "待采购");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -219,7 +219,8 @@ public class BrandDescController extends BladeController {
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
 			.eq(PjBrandDesc::getType, brandDesc.getType())
-			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname());
+			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
+		.orderByDesc(PjBrandDesc::getSort);
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
 
 		if (ObjectUtil.isNotEmpty(list)) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/feign/BrandClient.java

@@ -1,6 +1,7 @@
 package org.springblade.salesPart.brand.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
@@ -10,6 +11,8 @@ import org.springblade.salesPart.feign.IBrandClient;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 @NonDS
 @ApiIgnore()
 @RestController
@@ -25,4 +28,12 @@ public class BrandClient implements IBrandClient {
 			.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getCname, brandDesc.getCname()));
 	}
+
+	@Override
+	public List<PjBrandDesc> getBrandList(PjBrandDesc brandDesc) {
+		return brandDescService.list(new LambdaQueryWrapper<PjBrandDesc>()
+			.eq(PjBrandDesc::getIsDeleted, 0)
+			.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
+			.apply(ObjectUtils.isNotNull(brandDesc.getCname()),"find_in_set(cname,'"+brandDesc.getCname()+"')"));
+	}
 }