增加客服，入库，出库速度优化，复制租户系统参数修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -2017,6 +2017,17 @@ public class Bills implements Serializable {
 	private Date lockedDate;
 
 	/**
+	 * 客服
+	 */
+	@ApiModelProperty(value = "客服")
+	private Long customerServiceId;
+	/**
+	 * 客服
+	 */
+	@ApiModelProperty(value = "客服")
+	private String customerServiceName;
+
+	/**
 	 * 临时来源id
 	 */
 	@TableField(exist = false)

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -182,6 +182,9 @@ public class BillsController extends BladeController {
 				} else if (AuthUtil.getUserRole().contains("业务员")) {
 					lambdaQueryWrapper.and(i -> i.eq(Bills::getSrcId, AuthUtil.getUserId()).or()
 						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
+				} else if (AuthUtil.getUserRole().contains("客服")) {
+					lambdaQueryWrapper.and(i -> i.eq(Bills::getCustomerServiceId, AuthUtil.getUserId()).or()
+						.eq(Bills::getCreateUser, AuthUtil.getUserId()));
 				} else {
 					lambdaQueryWrapper.eq(Bills::getCreateUser, AuthUtil.getUserId());
 				}

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -353,10 +354,18 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 				reportsList.add(item);
 			}
 			losClient.addBCurrencyList(reportsList);
-		}else if (type.contains("9")) {
+		} else if (type.contains("9")) {
+			String salesCompanyId = "1703929959275413506";
+			Dept dept1 = deptService.getOne(new LambdaQueryWrapper<Dept>()
+				.eq(Dept::getTenantId, tenantId)
+				.eq(Dept::getIsDeleted, 0)
+				.last("LIMIT 1"));
+			if (dept1 != null) {
+				salesCompanyId = dept1.getId() + "";
+			}
 			// 业务参数
 			List<ParamService> roleLinkedList = new ArrayList<>();
-			List<ParamService> roleList = paramServiceService.selectParamService(tenantId,"1703929959275413506");
+			List<ParamService> roleList = paramServiceService.selectParamService(tenantId, salesCompanyId);
 			for (ParamService item : roleList) {
 				item.setId(null);
 				item.setTenantId(tenantIdCopy);

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

@@ -1344,12 +1344,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submitWarehousing(OrderSubmitDto submitDto) {
 		List<OrderItemsVO> orderItemsList = submitDto.getItemsVOList();
-		//获取系统编号
-		R billNo = serialClient.getBillNo(submitDto.getBillType(), OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType(), submitDto.getBillType());
-		if (!billNo.isSuccess()) {
-			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-			throw new Error("生成系统编号失败");
-		}
 		submitDto.setBillType(submitDto.getBillType());//业务类型
 		submitDto.setTradeType(OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());//类型
 		submitDto.setTenantId(AuthUtil.getTenantId());
@@ -1360,6 +1354,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			submitDto.setUpdateTime(new Date());
 			baseMapper.updateById(submitDto);
 		} else {
+			//获取系统编号
+			R billNo = serialClient.getBillNo(submitDto.getBillType(), OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType(), submitDto.getBillType());
+			if (!billNo.isSuccess()) {
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				throw new Error("生成系统编号失败");
+			}
 			if (OrderTypeEnum.WAREHOUSING.getType().equals(submitDto.getBillType())) {
 				submitDto.setOrderNo(billNo.getData().toString());
 				submitDto.setOrgOrderNo(billNo.getData().toString());
@@ -2221,11 +2221,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						qRCode = qRCode.replace("/home/minio", "http://121.37.83.47");
 						item.setQrCode(qRCode);
 						item.setIsIssue(isIssue);
-						orderItemsMapper.updateById(item);
+//						orderItemsMapper.updateById(item);
 					} catch (IOException e) {
 						throw new SecurityException("生成码失败");
 					}
 				}
+				orderItemsService.updateBatchById(orderItems);
 			}
 		} else if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(type)) {
 			if ("app".equals(toolType)) {
@@ -2240,18 +2241,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(OrderItems::getPid, order.getId())
 				.eq(OrderItems::getTenantId, AuthUtil.getTenantId());
 			List<OrderItems> CKOrderItemsList = orderItemsMapper.selectList(CKOrderItemsLambdaQueryWrapper);
+			List<OrderItems> RkList = new ArrayList<>();
 			for (OrderItems orderItems : CKOrderItemsList) {
 				OrderItems Rk = new OrderItems();
 				Rk.setId(orderItems.getSrcItemId());
 				Rk.setIsIssue(isIssue);
 				Rk.setScanningComparison(scanningComparison);
 				Rk.setDeliveryDate(new Date());
+				RkList.add(Rk);
 				orderItems.setIsIssue(isIssue);
 				orderItems.setDeliveryDate(new Date());
 				orderItems.setScanningComparison(scanningComparison);
-				orderItemsMapper.updateById(Rk);
-				orderItemsMapper.updateById(orderItems);
+//				orderItemsMapper.updateById(Rk);
+//				orderItemsMapper.updateById(orderItems);
 			}
+			orderItemsService.updateBatchById(RkList);
+			orderItemsService.updateBatchById(CKOrderItemsList);
 		}
 		order.setStatus(status);
 		order.setUpdateUser(AuthUtil.getUserId());