2022年11月9日19:23:39

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/CorpsDescDto.java

@@ -207,5 +207,17 @@ public class CorpsDescDto implements Serializable {
 	@ApiModelProperty(value = "授信额度")
 	private BigDecimal creditGrant;
 
+	/**
+	 * 分管员
+	 */
+	@ApiModelProperty(value = "分管员")
+	private String adminProfiles;
+
+	/**
+	 * 分管员中文名
+	 */
+	@TableField(exist = false)
+	private String adminProfilesName;
+
 
 }

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

@@ -435,5 +435,11 @@ public class CorpsDesc implements Serializable {
 	@TableField(exist = false)
 	private String typeSort;
 
+	/**
+	 * 分管员中文名
+	 */
+	@TableField(exist = false)
+	private String adminProfilesName;
+
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -1117,4 +1117,10 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal outFactoryPrice;
 
+	/**
+	 * 业务员中文
+	 */
+	@TableField(exist = false)
+	private String sales;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -25,6 +25,7 @@ import org.springblade.finance.feign.IFinanceClient;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -732,6 +733,20 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 		// 预(收)付款
 		BigDecimal advancePayment = new BigDecimal("0.00");
 		if (ObjectUtils.isNotNull(corpsDesc)) {
+
+			if (StringUtils.isNotBlank(corpsDescDto.getAdminProfiles())) {
+				List<User> updateUserList = userClient.selectUserIds(corpsDescDto.getAdminProfiles());
+				StringBuffer stringBuffer = new StringBuffer();
+				if (CollectionUtils.isNotEmpty(updateUserList)) {
+					updateUserList.forEach(items -> {
+						if (items != null) {
+							stringBuffer.append(items.getName()).append(",");
+						}
+					});
+				}
+				corpsDescDto.setAdminProfilesName(stringBuffer.toString());
+			}
+
 			//客户信息
 			corpsDescDto = BeanUtil.copy(corpsDesc, CorpsDescDto.class);
 			//获取订单记录
@@ -777,6 +792,18 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 	public CorpsDesc getMessageByIDParts(CorpsDesc corpsDesc) {
 		CorpsDesc desc = baseMapper.selectById(corpsDesc.getId());
 		if (desc != null) {
+			if (StringUtils.isNotBlank(desc.getAdminProfiles())) {
+				List<User> updateUserList = userClient.selectUserIds(desc.getAdminProfiles());
+				StringBuffer stringBuffer = new StringBuffer();
+				if (CollectionUtils.isNotEmpty(updateUserList)) {
+					updateUserList.forEach(items -> {
+						if (items != null) {
+							stringBuffer.append(items.getName()).append(",");
+						}
+					});
+				}
+				desc.setAdminProfilesName(stringBuffer.toString());
+			}
 			//获取客户文件
 			desc.setCorpsFiles(corpsFilesService.list(new QueryWrapper<CorpsFiles>().eq("pid", corpsDesc.getId()).eq("is_deleted", 0).eq("status", 0)));
 			//获取客户地址

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

@@ -798,11 +798,16 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				if (StringUtil.isBlank(goodsDesc.getCnameInt())) {
 					goodsDesc.setCnameInt(getCnameInt(goodsDesc.getCname()));
 				}
-				if (e.getWhether().equals("是")){
-					goodsDesc.setWhether("1");
-				}else if(e.getWhether().equals("否")){
+				if (ObjectUtils.isNotNull(e.getWhether())){
+					if (e.getWhether().equals("是")){
+						goodsDesc.setWhether("1");
+					}else if(e.getWhether().equals("否")){
+						goodsDesc.setWhether("0");
+					}
+				}else{
 					goodsDesc.setWhether("0");
 				}
+
 				goodsDesc.setType(0L);
 				goodsDesc.setCode(goodsDesc.getCname());
 				goodsDesc.setGoodsTypeId(String.valueOf(goodsType.getId()));

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

@@ -44,6 +44,7 @@ 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.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -123,6 +124,7 @@ public class AppPartsController extends BladeController {
 		} else {
 			lambdaQueryWrapper.like(Func.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId());//客户id
 		}
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order),Order::getSalesName, order.getSalesName());//业务员
 		lambdaQueryWrapper.ge(Func.isNotEmpty(order.getContractStartDate()), Order::getBusinesDate, order.getContractStartDate());//合同日期开始
 		lambdaQueryWrapper.le(Func.isNotEmpty(order.getContractEndDate()), Order::getBusinesDate, order.getContractEndDate());//合同日期结束
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getSrcOrderNo()), Order::getSrcOrderNo, order.getSrcOrderNo());//订单来源
@@ -168,6 +170,7 @@ public class AppPartsController extends BladeController {
 		String corpIds = "";//客户拼接
 		String belongToCorpIds = "";//销售公司
 		String storageIds = "";//仓库
+		String salesNames = "";//业务员
 
 		for (Order orders : page.getRecords()) {
 			if (ObjectUtil.isNotEmpty(orders.getCorpId())) {
@@ -179,11 +182,15 @@ public class AppPartsController extends BladeController {
 			if (ObjectUtil.isNotEmpty(orders.getStorageId())) {
 				storageIds = storageIds + orders.getStorageId() + ",";
 			}
+			if (ObjectUtil.isNotEmpty(orders.getSalesName())) {
+				salesNames = salesNames + orders.getSalesName() + ",";
+			}
 		}
 
 		List<CorpsDesc> corpsDescList = corpsDescClient.selectByCorpIds(corpIds);
 		List<CorpsDesc> belongToCorpList = corpsDescClient.selectByCorpIds(belongToCorpIds);
 		List<StorageDesc> storageList = iStorageClient.selectStorageIds(storageIds);
+		List<User> users = userClient.selectUserIds(salesNames);
 
 		if (CollectionUtils.isNotEmpty(page.getRecords())) {
 			page.getRecords().stream().forEach(item -> {
@@ -221,14 +228,15 @@ public class AppPartsController extends BladeController {
 				if (ObjectUtils.isNotNull(acc)) {
 					item.setSrcAccId(acc.getId());
 				}
-				//获取订单明细
-				/*List<OrderItems> list = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", item.getId()).eq("is_deleted", 0));
-				if (CollectionUtils.isNotEmpty(list)) {
-					item.setOrderQuantity(list.stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//数量合计
-					item.setAmount(list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));//销售金额
-					item.setPurchaseAmount(list.stream().map(OrderItems::getPurchaseAmount).reduce(BigDecimal.ZERO, BigDecimal::add));//采购金额
-					item.setActualQuantity(list.stream().map(OrderItems::getActualQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));//发货数量
-				}*/
+				//业务员信息
+				if (item.getStorageId() != null) {
+					if (ObjectUtil.isNotEmpty(users)) {
+						User user = users.stream().filter(d -> d.getId().equals(Long.parseLong(item.getSalesName()))).findFirst().orElse(null);
+						if (ObjectUtils.isNotNull(user)) {
+							item.setSales(user.getRealName());
+						}
+					}
+				}
 			});
 		}
 		return R.data(page);
@@ -318,6 +326,7 @@ public class AppPartsController extends BladeController {
 		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.SALES.getType());
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.PARTS.getType());
 		lambdaQueryWrapper.eq(Order::getConfirmStatus, 1);
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order),Order::getSalesName, order.getSalesName());//业务员
 		List<Order> orderList = orderService.list(lambdaQueryWrapper);
 
 		BigDecimal total = new BigDecimal("0.00");
@@ -392,6 +401,7 @@ public class AppPartsController extends BladeController {
 						}
 					}
 				}
+
 			});
 		}
 		return R.data(page);

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

@@ -1820,6 +1820,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public Order getOrderMessageParts(Order order) {
 		// 获取订单主表信息
 		Order orderMessage = baseMapper.selectById(order.getId());
+		// 获取业务员中文名
+		R<User> salesUser = userClient.userInfoById(Long.parseLong(orderMessage.getSalesName()));
+		if (salesUser.isSuccess() || salesUser.getData() != null) {
+			orderMessage.setSales(salesUser.getData().getName());
+		}
 		// 获取创建人中文名
 		R<User> createUser = userClient.userInfoById(orderMessage.getCreateUser());
 		if (createUser.isSuccess() || createUser.getData() != null) {
@@ -2067,14 +2072,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						surplusRouteQuantity = surplusRouteQuantity.add(r.getData().getSurplusRouteQuantity().add(orderItems.getStorageInQuantity()));
 						balanceQuantity = balanceQuantity.add(surplusRouteQuantity);
 						balanceAmount = balanceAmount.add(r.getData().getBalanceAmount().add(balanceQuantity.multiply(orderItems.getPrice(), MathContext.DECIMAL32)));
-						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity), MathContext.DECIMAL32);
+						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity, MathContext.DECIMAL32).setScale(2,RoundingMode.HALF_UP));
 						r.getData().setOutQuantity(r.getData().getOutQuantity().subtract(orderItems.getStorageInQuantity()));
 						r.getData().setOutAmount(r.getData().getOutAmount().subtract(orderItems.getAmount()));
 					} else {
 						surplusRouteQuantity = surplusRouteQuantity.add(r.getData().getSurplusRouteQuantity().subtract(orderItems.getStorageInQuantity()));
 						balanceQuantity = balanceQuantity.add(surplusRouteQuantity);
 						balanceAmount = balanceAmount.add(r.getData().getBalanceAmount().subtract(balanceQuantity.multiply(orderItems.getPrice(), MathContext.DECIMAL32)));
-						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity), MathContext.DECIMAL32);
+						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity, MathContext.DECIMAL32).setScale(2,RoundingMode.HALF_UP));
 						r.getData().setInQuantity(r.getData().getInQuantity().subtract(orderItems.getStorageInQuantity()));
 						r.getData().setInAmount(r.getData().getInAmount().subtract(orderItems.getAmount()));
 					}
@@ -2296,7 +2301,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 
 						balanceAmount = balanceAmount.add(balanceQuantity.multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
-						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity), MathContext.DECIMAL32);
+						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity, MathContext.DECIMAL32).setScale(2,RoundingMode.HALF_UP));
 
 						r.getData().setOutQuantity(r.getData().getOutQuantity().add(orderItems.getStorageInQuantity()));
 						r.getData().setOutAmount(r.getData().getOutAmount().add(costAmount));
@@ -2308,7 +2313,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						surplusRouteQuantity = surplusRouteQuantity.add(r.getData().getSurplusRouteQuantity().add(orderItems.getStorageInQuantity()));
 						balanceQuantity = balanceQuantity.add(surplusRouteQuantity);
 						balanceAmount = balanceAmount.add(balanceQuantity.multiply(orderItems.getPrice(), MathContext.DECIMAL32));
-						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity), MathContext.DECIMAL32);
+						stockPrice = stockPrice.add(balanceAmount.divide(balanceQuantity, MathContext.DECIMAL32).setScale(2,RoundingMode.HALF_UP));
 
 						r.getData().setInQuantity(r.getData().getInQuantity().add(orderItems.getStorageInQuantity()));
 						r.getData().setInAmount(r.getData().getInAmount().add(orderItems.getAmount()));

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -160,7 +160,7 @@
             t1.is_deleted = 0
             and t1.tenant_id = #{stock.tenantId}
             <if test="stock.goods != null and stock.goods != ''">
-                and t3.cname like concat('%', #{stock.goods}, '%')
+                and (t3.cname like concat('%', #{stock.goods}, '%') or t3.cname_int like concat('%', #{stock.goods}, '%'))
             </if>
             <if test="stock.brand != null and stock.brand != ''">
                 and t3.brand = #{stock.brand}

blade-service/store-goods/src/main/java/com/store/goods/service/impl/AppServiceImpl.java

@@ -67,7 +67,7 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements IAppS
 
 	@Override
 	public App getLatestVersion(String packageName, List<Integer> isRelease, Integer type) {
-		App app = baseMapper.selectOne(new LambdaQueryWrapper<App>().eq(type != null, App::getType, type).eq(App::getPackageName, packageName));
+		App app = baseMapper.selectOne(new LambdaQueryWrapper<App>().eq(type != null, App::getType, type).eq(App::getAppName, packageName));
 		try {
 			AppVersion appVersion = getLatestVersionById(app.getId(), isRelease);
 			app.setAppVersion(appVersion);

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -420,6 +420,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
 			submitDto.setItemsVOList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
 		}
+		submitDto.setOrderFeesList(submitDto.getOrderFeesList());
 		return R.data(submitDto);
 	}