2023年12月1日17:50:51

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

@@ -427,6 +427,11 @@ public class PjOrder implements Serializable {
 	 */
 	@ApiModelProperty(value = "是否是积分商品")
 	private String whetherIntegral;
+	/**
+	 * 一键入库状态
+	 */
+	@ApiModelProperty(value = "一键入库状态")
+	private String shortcutWarehousingStatus;
 
 	//小程序检索
 	@TableField(exist = false)
@@ -478,4 +483,16 @@ public class PjOrder implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String corpType;
+
+	/**
+	 * 库管员id
+	 */
+	@TableField(exist = false)
+	private Long stockClerkId;
+
+	/**
+	 * 库管员名称
+	 */
+	@TableField(exist = false)
+	private String stockClerkName;
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxRentController.java

@@ -284,12 +284,13 @@ public class TradingBoxRentController extends BladeController {
 	public R importTradingBoxInfo(MultipartFile file,
 								  @RequestParam(value = "corpId", required = false) Long corpId,
 								  @RequestParam(value = "corpName", required = false) String corpName,
+								  @RequestParam(value = "pid") Long pid,
 								  @RequestParam(value = "billType", required = false) String billType) {
 		List<TradingBoxItemRentExcelEnter> excelList = ExcelUtil.read(file, TradingBoxItemRentExcelEnter.class);
 		if (CollectionUtils.isEmpty(excelList)) {
 			throw new SecurityException("数据不能为空");
 		}
-		return tradingBoxService.importTradingBoxInfo(excelList, false, corpId, corpName, billType);
+		return tradingBoxService.importTradingBoxInfo(excelList, false, corpId, corpName, billType,pid);
 	}
 
 	/**

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportController.java

@@ -315,12 +315,15 @@ public class TransportController extends BladeController {
 	@PostMapping("/import-transport-info")
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "导入箱明细", notes = "传入excel")
-	public R importTransportInfo(MultipartFile file, @RequestParam("corpId") Long corpId, @RequestParam("corpName") String corpName, @RequestParam("billType") String billType) {
+	public R importTransportInfo(MultipartFile file, @RequestParam("corpId") Long corpId,
+								 @RequestParam("corpName") String corpName,
+								 @RequestParam(value = "pid") Long pid,
+								 @RequestParam("billType") String billType) {
 		List<TransportItemExcelEnter> excelList = ExcelUtil.read(file, TransportItemExcelEnter.class);
 		if (CollectionUtils.isEmpty(excelList)) {
 			throw new SecurityException("数据不能为空");
 		}
-		return transportService.importTransportInfo(excelList, false, corpId, corpName, billType);
+		return transportService.importTransportInfo(excelList, false, corpId, corpName, billType,pid);
 	}
 
 	/**

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/ITradingBoxService.java

@@ -66,7 +66,7 @@ public interface ITradingBoxService extends IService<TradingBox> {
 
 	TradingBox revokeRentCalculation(TradingBox tradingBox);
 
-	R importTradingBoxInfo(List<TradingBoxItemRentExcelEnter> excelList, boolean b, Long corpId, String corpName, String billType);
+	R importTradingBoxInfo(List<TradingBoxItemRentExcelEnter> excelList, boolean b, Long corpId, String corpName, String billType,Long pid);
 
     TradingBox copyDocument(TradingBox tradingBox);
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/ITransportService.java

@@ -62,7 +62,7 @@ public interface ITransportService extends IService<Transport> {
 
 	Transport withdrawTransport(Transport transport);
 
-	R importTransportInfo(List<TransportItemExcelEnter> excelList, boolean b, Long corpId, String corpName,String billType);
+	R importTransportInfo(List<TransportItemExcelEnter> excelList, boolean b, Long corpId, String corpName,String billType,Long pid);
 
     Transport copyDocument(Transport transport);
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -185,8 +185,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			.orderByDesc(TradingBoxItem::getCreateTime);
 		List<TradingBoxItem> tradingBoxItemList = tradingBoxItemService.list(tradingBoxItemLambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(tradingBoxItemList) && tradingBoxItemList.size() > 0) {
-			tradingBox.setTotalAmount(tradingBoxItemList.stream().filter(e-> "CNY".equals(e.getCurrency())).map(TradingBoxItem::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
-			tradingBox.setTotalAmountU(tradingBoxItemList.stream().filter(e-> "USD".equals(e.getCurrency())).map(TradingBoxItem::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			tradingBox.setTotalAmount(tradingBoxItemList.stream().filter(e -> "CNY".equals(e.getCurrency())).map(TradingBoxItem::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+			tradingBox.setTotalAmountU(tradingBoxItemList.stream().filter(e -> "USD".equals(e.getCurrency())).map(TradingBoxItem::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			//箱号拼接字符串
 			List<String> codes = tradingBoxItemList.stream().map(TradingBoxItem::getCode).distinct().collect(Collectors.toList());
 			if (tradingBoxItemList.size() != codes.size()) {
@@ -1043,7 +1043,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
-	public R importTradingBoxInfo(List<TradingBoxItemRentExcelEnter> excelList, boolean b, Long corpId, String corpName, String billType) {
+	public R importTradingBoxInfo(List<TradingBoxItemRentExcelEnter> excelList, boolean b, Long corpId, String corpName, String billType, Long pid) {
 		List<TradingBoxItem> tradingBoxItemList = new ArrayList<>();
 		List<TradingBoxFees> tradingBoxFeesList = new ArrayList<>();
 		for (TradingBoxItemRentExcelEnter tradingBoxItemExcelEnter : excelList) {
@@ -1052,6 +1052,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			if (ObjectUtils.isNull(tradingBoxItem.getCode())) {
 				throw new RuntimeException("箱号不能为空");
 			}
+			tradingBoxItem.setPid(pid);
 			if ("SELL".equals(billType) || "ZC".equals(billType)) {
 				LambdaQueryWrapper<Archives> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(Archives::getIsDeleted, 0)
@@ -1108,6 +1109,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxItem.setAmount(tradingBoxItem.getPrice());
 				TradingBoxFees tradingBoxFees = new TradingBoxFees();
 				tradingBoxFees.setCorpId(corpId);
+				tradingBoxFees.setPid(pid);
 				tradingBoxFees.setCorpName(corpName);
 				tradingBoxFees.setAmount(tradingBoxItem.getPrice());
 				if ("SELL".equals(billType)) {
@@ -1147,6 +1149,12 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 
 			tradingBoxItemList.add(tradingBoxItem);
 		}
+		if (tradingBoxItemList.size() > 0) {
+			tradingBoxItemService.saveOrUpdateBatch(tradingBoxItemList);
+		}
+		if (tradingBoxFeesList.size() > 0) {
+			tradingBoxFeesService.saveOrUpdateBatch(tradingBoxFeesList);
+		}
 		if ("SELL".equals(billType) || "BUY".equals(billType)) {
 			Map<String, Object> map = new HashMap<>();
 			map.put("tradingBoxItemList", tradingBoxItemList);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -635,11 +635,12 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 	}
 
 	@Override
-	public R importTransportInfo(List<TransportItemExcelEnter> excelList, boolean b, Long corpId, String corpName, String billType) {
+	public R importTransportInfo(List<TransportItemExcelEnter> excelList, boolean b, Long corpId, String corpName, String billType,Long pid) {
 		List<TransportItem> transportItemList = new ArrayList<>();
 		List<TransportItemFees> transportItemFeesList = new ArrayList<>();
 		for (TransportItemExcelEnter transportItemExcelEnter : excelList) {
 			TransportItem transportItem = new TransportItem();
+			transportItem.setPid(pid);
 			BeanUtil.copy(transportItemExcelEnter, transportItem);
 			if (ObjectUtils.isNull(transportItem.getCode())) {
 				throw new RuntimeException("箱号不能为空");
@@ -687,6 +688,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			}
 			transportItemList.add(transportItem);
 			TransportItemFees transportItemFees = new TransportItemFees();
+			transportItemFees.setPid(pid);
 			transportItemFees.setCorpId(corpId);
 			transportItemFees.setCorpName(corpName);
 			//获取费用id
@@ -715,6 +717,12 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			transportItemFees.setCode(transportItem.getCode());
 			transportItemFeesList.add(transportItemFees);
 		}
+		if (transportItemList.size()>0){
+			transportItemService.saveOrUpdateBatch(transportItemList);
+		}
+		if (transportItemFeesList.size()>0){
+			transportItemFeesService.saveOrUpdateBatch(transportItemFeesList);
+		}
 		Map<String, Object> map = new HashMap<>();
 		map.put("transportItemList", transportItemList);
 		map.put("transportItemFeesList", transportItemFeesList);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/accountManagement/controller/AccountManagementController.java

@@ -84,7 +84,7 @@ public class AccountManagementController extends BladeController {
 			.eq(StringUtils.isNotBlank(accountManagement.getCurrency()), PjAccountManagement::getCurrency, accountManagement.getCurrency())//账户类型
 			.eq(StringUtils.isNotBlank(accountManagement.getStatus()), PjAccountManagement::getStatus, accountManagement.getStatus())//状态
 			.eq(ObjectUtils.isNotNull(accountManagement.getEnableOrNot()), PjAccountManagement::getEnableOrNot, accountManagement.getEnableOrNot());//状态
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjAccountManagement::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		IPage<PjAccountManagement> pages = accountManagementService.page(Condition.getPage(query), lambdaQueryWrapper);

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

@@ -95,7 +95,7 @@ public class BrandDescController extends BladeController {
 			lambdaQueryWrapper.ge(PjBrandDesc::getCreateTime, brandDesc.getCreateTimeList().get(0));
 			lambdaQueryWrapper.le(PjBrandDesc::getCreateTime, brandDesc.getCreateTimeList().get(1));
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		lambdaQueryWrapper.orderByDesc(PjBrandDesc::getSort);
@@ -236,7 +236,7 @@ public class BrandDescController extends BladeController {
 			.eq(PjBrandDesc::getEnableOrNot, brandDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
 			.orderByDesc(PjBrandDesc::getSort);
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
@@ -264,7 +264,7 @@ public class BrandDescController extends BladeController {
 			.eq(PjBrandDesc::getType, brandDesc.getType())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
 			.orderByDesc(PjBrandDesc::getSort);
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditPathsActsController.java

@@ -70,7 +70,7 @@ public class AuditPathsActsController extends BladeController {
 		LambdaQueryWrapper<PjAuditPathsActs> lambdaQueryWrapper=new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjAuditPathsActs::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPathsActs.getActName()),PjAuditPathsActs::getActName,auditPathsActs.getActName());
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjAuditPathsActs::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		IPage<PjAuditPathsActs> pages = auditPathsActsService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditPathsController.java

@@ -91,7 +91,7 @@ public class AuditPathsController extends BladeController {
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPaths.getPathName()),PjAuditPaths::getPathName,auditPaths.getPathName())
 			.eq(PjAuditPaths::getTenantId, AuthUtil.getTenantId())
 			.orderByDesc(PjAuditPaths::getOpDate);
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjAuditPaths::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		IPage<PjAuditPaths> pages = auditPathsService.page(Condition.getPage(query),lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditPathsLevelsController.java

@@ -70,7 +70,7 @@ public class AuditPathsLevelsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入auditPathsLevels")
 	public R<IPage<PjAuditPathsLevels>> list(PjAuditPathsLevels auditPathsLevels, Query query) {
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			auditPathsLevels.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		IPage<PjAuditPathsLevels> pages = auditPathsLevelsService.page(Condition.getPage(query), Condition.getQueryWrapper(auditPathsLevels));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/check/controller/AuditProecessController.java

@@ -98,7 +98,7 @@ public class AuditProecessController extends BladeController {
 			lambdaQueryWrapper.lt( PjAuditProecess::getBillTime, auditProecess.getBillTimeList().get(1));
 		}
 		lambdaQueryWrapper.ne(StringUtils.isBlank(auditProecess.getAuditStatus()), PjAuditProecess::getAuditStatus, "N");
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjAuditProecess::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		IPage pages = auditProecessService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsDescController.java

@@ -329,8 +329,10 @@ public class CorpsDescController extends BladeController {
 			.apply("find_in_set(corp_type,'" + corpsDesc.getCorpType() + "')")
 			.eq(ObjectUtils.isNotNull(corpsDesc.getEnableOrNot()), PjCorpsDesc::getEnableOrNot, corpsDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotNull(corpsDesc.getCname()), PjCorpsDesc::getCname, corpsDesc.getCname());
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapper.eq(PjCorpsDesc::getSalesmanId, AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(PjCorpsDesc::getSalesmanId, AuthUtil.getUserId());
+			}
 		}
 		List<PjCorpsDesc> list = corpsDescService.list(lambdaQueryWrapper);
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsTypeController.java

@@ -75,7 +75,7 @@ public class CorpsTypeController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入corpsType")
 	public R<IPage<PjCorpsType>> list(PjCorpsType corpsType, Query query) {
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		IPage<PjCorpsType> pages = corpsTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(corpsType));
@@ -91,7 +91,7 @@ public class CorpsTypeController extends BladeController {
 	public R<IPage<CorpsTypeVO>> page(CorpsTypeVO corpsType, Query query) {
 		corpsType.setIsDeleted(0);
 		corpsType.setTenantId(SecureUtil.getTenantId());
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		IPage<CorpsTypeVO> pages = corpsTypeService.selectCorpsTypePage(Condition.getPage(query), corpsType);
@@ -191,7 +191,7 @@ public class CorpsTypeController extends BladeController {
 		lambdaQueryWrapper.eq(PjCorpsType::getIsDeleted, 0)
 			.eq(PjCorpsType::getTenantId, AuthUtil.getTenantId())
 			.apply("find_in_set(corp_type,'" + corpsType.getCorpType() + "')");
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjCorpsType::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		List<PjCorpsType> pages = corpsTypeService.list(lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -152,7 +152,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		corpsDesc.setTenantId(AuthUtil.getTenantId());
 		corpsDesc.setIsDeleted(0);
 		corpsDesc.setStrTenantId(Arrays.asList(AuthUtil.getDeptId().split(",")));
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				corpsDesc.setSalesmanId(AuthUtil.getUserId());
 			}
@@ -588,8 +588,10 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		corpsDescDto.setTenantId(AuthUtil.getTenantId());
 		corpsDescDto.setId(corpsDescDto.getId());
 		corpsDescDto.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			corpsDescDto.setSalesmanId(AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				corpsDescDto.setSalesmanId(AuthUtil.getUserId());
+			}
 		}
 		return page.setRecords(baseMapper.selectPartsCorpsDescPage(page, corpsDescDto));
 	}
@@ -621,8 +623,10 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		corpsDescDto.setTenantId(AuthUtil.getTenantId());
 		corpsDescDto.setId(corpsDescDto.getId());
 		corpsDescDto.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			corpsDescDto.setSalesmanId(AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				corpsDescDto.setSalesmanId(AuthUtil.getUserId());
+			}
 		}
 		return baseMapper.selectPartsCorpsStatistics(corpsDescDto);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsTypeServiceImpl.java

@@ -121,7 +121,7 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, PjCorpsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType,Long.parseLong(AuthUtil.getDeptId())));
 		}else{
 			return ForestNodeMerger.merge(baseMapper.tree(tenantId, corpType,null));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsTypeController.java

@@ -83,7 +83,7 @@ public class GoodsTypeController extends BladeController {
 	public R<IPage<PjGoodsType>> list(PjGoodsType goodsType, Query query) {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		IPage<PjGoodsType> pages = goodsTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(goodsType));
@@ -99,7 +99,7 @@ public class GoodsTypeController extends BladeController {
 	public R<IPage<GoodsTypeVO>> page(GoodsTypeVO goodsType, Query query) {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		IPage<GoodsTypeVO> pages = goodsTypeService.selectGoodsTypePage(Condition.getPage(query), goodsType);
@@ -116,7 +116,7 @@ public class GoodsTypeController extends BladeController {
 		goodsType.setTenantId(AuthUtil.getTenantId());
 		goodsType.setType(GoodsTypeEnum.GOODS.getType());
 		goodsType.setIsDeleted(0);
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		List<PjGoodsType> list = goodsTypeService.list(Condition.getQueryWrapper(goodsType));
@@ -228,7 +228,7 @@ public class GoodsTypeController extends BladeController {
 		goodsType.setParentId(0l);
 		goodsType.setIsDeleted(0);
 		goodsType.setStatus(0);
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			goodsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		List<PjGoodsType> list = goodsTypeService.list(Condition.getQueryWrapper(goodsType));
@@ -252,7 +252,7 @@ public class GoodsTypeController extends BladeController {
 		}else{
 			goodsTypeLambdaQueryWrapper.gt(PjGoodsType::getParentId,0);
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			goodsTypeLambdaQueryWrapper.eq(PjGoodsType::getSalesCompanyId,Long.parseLong(AuthUtil.getDeptId()));
 		}
 		List<PjGoodsType> list = goodsTypeService.list(goodsTypeLambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsTypeServiceImpl.java

@@ -87,7 +87,7 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, PjGoodsTy
 		if (StringUtils.isBlank(tenantId)) {
 			tenantId = SecureUtil.getTenantId();
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			return ForestNodeMerger.merge(baseMapper.tree(tenantId, type,Long.parseLong(AuthUtil.getDeptId())));
 		}else{
 			return ForestNodeMerger.merge(baseMapper.tree(tenantId, type,null));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/controller/MaintenanceController.java

@@ -111,7 +111,7 @@ public class MaintenanceController extends BladeController {
 			.or().like(Maintenance::getRepairDescription,maintenance.getRetrieval())
 			);
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			if (ObjectUtils.isNotNull(maintenance.getStatus())) {
 				if (maintenance.getStatus() == 1) {
 					lambdaQueryWrapper.eq(Maintenance::getDispatchingWorkers,"1");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -139,11 +139,12 @@ public class OrderController extends BladeController {
 		}
 		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
-
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
-		} else if (AuthUtil.getUserRole().contains("客户")) {
-			lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
+			} else if (AuthUtil.getUserRole().contains("客户")) {
+				lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+			}
 		}
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 
@@ -223,11 +224,12 @@ public class OrderController extends BladeController {
 		}
 		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND actual_payment_status = 2 ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
-
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
-		} else if (AuthUtil.getUserRole().contains("客户")) {
-			lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
+			} else if (AuthUtil.getUserRole().contains("客户")) {
+				lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+			}
 		}
 		List<PjOrder> pages = orderService.list(lambdaQueryWrapper);
 
@@ -460,10 +462,12 @@ public class OrderController extends BladeController {
 				.or().like(PjOrder::getShortcutJoin, order.getRetrieval()))
 			.apply(ObjectUtils.isNotEmpty(order.getXcxStatus()), "find_in_set(xcx_status,'" + order.getXcxStatus() + "')")
 			.orderByDesc(PjOrder::getCreateTime);
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
-		} else if (AuthUtil.getUserRole().contains("客户")) {
-			lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
+			} else if (AuthUtil.getUserRole().contains("客户")) {
+				lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+			}
 		}
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 
@@ -744,8 +748,10 @@ public class OrderController extends BladeController {
 			.ge(ObjectUtils.isNotNull(statusDate), PjOrder::getBusinesDate, statusDate)
 			.le(ObjectUtils.isNotNull(endDate), PjOrder::getBusinesDate, endDate)
 			.eq(PjOrder::getBsType, "XS");
-		if (AuthUtil.getUserRole().contains("业务员")) {
-			lambdaQueryWrapperXS.gt(PjOrder::getSalerId, AuthUtil.getTenantId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
+			if (AuthUtil.getUserRole().contains("业务员")) {
+				lambdaQueryWrapperXS.gt(PjOrder::getSalerId, AuthUtil.getTenantId());
+			}
 		}
 		lambdaQueryWrapperXS.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		List<PjOrder> pjOrderListXS = orderService.list(lambdaQueryWrapperXS);
@@ -790,7 +796,7 @@ public class OrderController extends BladeController {
 	@GetMapping("/statistics")
 	@ApiOperation(value = "app营业分析", notes = "传入参数")
 	public R<IPage<PjOrderStatisticsWeb>> statistics(PjOrderStatisticsWeb order, Query query) {
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			order.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		order.setTenantId(AuthUtil.getTenantId());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderStatisticsController.java

@@ -65,7 +65,7 @@ public class OrderStatisticsController extends BladeController {
 	@GetMapping("/salesman")
 	public R<List<PjOrder>> salesman(PjOrder order) {
 		order.setTenantId(AuthUtil.getTenantId());
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			order.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));//公司
 		}
 		List<PjOrder> pjOrderList = orderService.salesman(order);
@@ -88,7 +88,7 @@ public class OrderStatisticsController extends BladeController {
 			lambdaQueryWrapper.ge(PjOrder::getBusinesDate, order.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(PjOrder::getBusinesDate, order.getBusinesDateList().get(1));
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -257,7 +257,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	 */
 	@Override
 	public IPage<OrderStatistics> collectionStatistics(IPage<OrderStatistics> page, OrderVO order) {
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			order.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
 		}
 		return page.setRecords(baseMapper.collectionStatistics(page, order));
@@ -301,7 +301,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			LocalDate firstDay = yearMonth.atDay(1);
 			LocalDate lastDay = yearMonth.atEndOfMonth();
 			Map<String, BigDecimal> sum = new HashMap<>();
-			if (!AuthUtil.getUserRole().contains("admin")) {
+			if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(), Long.parseLong(AuthUtil.getDeptId()));
 			} else {
 				sum = baseMapper.columnar(firstDay, lastDay, AuthUtil.getTenantId(), null);
@@ -556,6 +556,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R shortcutWarehousing(PjOrder order) {
 		PjOrder pjOrder = baseMapper.selectById(order.getId());
 
@@ -572,6 +574,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			//仓库名称
 			pjShip.setStorageName(storageDescMapper.selectById(pjOrder.getStorageId()).getCname());
 		}
+		pjShip.setStockClerkId(pjOrder.getStockClerkId());
+		pjShip.setStockClerkName(pjOrder.getStockClerkName());
+		pjShip.setStorageId(pjOrder.getStorageId());
 		pjShip.setBusinesDate(new Date());
 		pjShip.setBillno((String) billNo.getData());
 		pjShip.setOrdNo(pjOrder.getOrdNo());
@@ -585,6 +590,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjShip.setCreateUser(AuthUtil.getUserId());
 		pjShip.setCreateTime(new Date());
 		pjShip.setSendTotalNum(pjShip.getGoodsTotalNum());
+		pjShip.setGoodsTotalNum(pjShip.getGoodsTotalNum());
 		shipMapper.insert(pjShip);
 		//新建入库工单
 		PjShip gdShip = new PjShip();
@@ -597,6 +603,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		BeanUtil.copyProperties(pjShip, gdShip);
 
 		gdShip.setId(null);
+		gdShip.setStorageId(pjOrder.getStorageId());
 		gdShip.setBillno((String) billNoGD.getData());
 		gdShip.setStatusName(OrderTypeEnum.RECEIVED.getType());
 		gdShip.setTenantId(AuthUtil.getTenantId());
@@ -625,7 +632,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 					.eq(PjGoodsDesc::getIsDeleted, 0)
 					.in(PjGoodsDesc::getId, goodsIds)
-					.eq(PjGoodsDesc::getEnableOrNot, 0));
+					.eq(PjGoodsDesc::getEnableOrNot, 1));
 				pjStockDescList = stockDescService.list(new LambdaQueryWrapper<PjStockDesc>()
 					.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
 					.eq(PjStockDesc::getIsDeleted, 0)
@@ -666,7 +673,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				shipItems.setCreateTime(new Date());
 				shipItems.setCreateUser(AuthUtil.getUserId());
 				shipItems.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
-				shipItems.setSendNum(e.getGoodsNum().subtract(e.getSendNum()));
+				shipItems.setSendNum(e.getSendNum());
+				shipItems.setGoodsNum(e.getSendNum());
 				shipItemsList.add(shipItems);
 				//生成库存账
 				PjStockDesc stockDesc = new PjStockDesc();
@@ -784,11 +792,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//生成入库工单历史记录
 		saveHistory(gdShip.getId(), OrderTypeEnum.RECEIVED.getType());
 		//生成出库工单历史记录
-		saveHistory(pjShip.getId(), OrderTypeEnum.DISPATCHED.getType());
+		saveHistory(pjShip.getId(), "已完成");
 		//修改采购状态
 		pjOrder.setGenerateTask(OrderTypeEnum.SCRW.getType());
 		pjOrder.setStatus(OrderTypeEnum.RECEIVEDGOODS.getType());
 		pjOrder.setXcxStatus(OrderTypeEnum.RECEIVEDGOODS.getType());
+		pjOrder.setShortcutWarehousingStatus("1");
 		baseMapper.updateById(pjOrder);
 		return R.data(pjOrder);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/controller/SettlementController.java

@@ -102,7 +102,7 @@ public class SettlementController extends BladeController {
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getAccountId()), PjSettlement::getAccountId, settlement.getAccountId());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getFinanceStatus()), PjSettlement::getFinanceStatus, settlement.getFinanceStatus());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getSettlementDate()), PjSettlement::getSettlementDate, settlement.getSettlementDate());
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjSettlement::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}else{
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(settlement.getSalesCompanyId()), PjSettlement::getSalesCompanyId, settlement.getSalesCompanyId());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/controller/ShipController.java

@@ -114,11 +114,12 @@ public class ShipController extends BladeController {
 			lambdaQueryWrapper.le(PjShip::getBusinesDate, ship.getBusinesDateList().get(1));
 		}
 		lambdaQueryWrapper.orderByDesc(PjShip::getCreateTime);
-
-		if (AuthUtil.getUserRole().contains("库管")) {
-			lambdaQueryWrapper.and(i -> i.eq(PjShip::getStockClerkId, AuthUtil.getUserId()).or().isNull(PjShip::getStockClerkId));
-		} else if (AuthUtil.getUserRole().contains("客户")) {
-			lambdaQueryWrapper.eq(PjShip::getCustomerId, AuthUtil.getUserId());
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")){
+			if (AuthUtil.getUserRole().contains("库管")) {
+				lambdaQueryWrapper.and(i -> i.eq(PjShip::getStockClerkId, AuthUtil.getUserId()).or().isNull(PjShip::getStockClerkId));
+			} else if (AuthUtil.getUserRole().contains("客户")) {
+				lambdaQueryWrapper.eq(PjShip::getCustomerId, AuthUtil.getUserId());
+			}
 		}
 		IPage<PjShip> pages = shipService.page(Condition.getPage(query), lambdaQueryWrapper);
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/storage/controller/StorageDescController.java

@@ -92,7 +92,7 @@ public class StorageDescController extends BladeController {
 			.eq(ObjectUtils.isNotEmpty(storageDesc.getSalesCompanyId()), PjStorageDesc::getSalesCompanyId, storageDesc.getSalesCompanyId())//所属公司
 			.in(ObjectUtils.isNotEmpty(storageDesc.getSharedCompany()), PjStorageDesc::getSharedCompany, storageDesc.getSharedCompany());//共享公司
 
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		/*String role = AuthUtil.getUserRole();
@@ -184,7 +184,7 @@ public class StorageDescController extends BladeController {
 			.eq(PjStorageDesc::getIsDeleted, 0)
 			.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
 			.like(ObjectUtils.isNotEmpty(storageDesc.getCname()), PjStorageDesc::getCname, storageDesc.getCname());//仓库名称
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjStorageDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		List<PjStorageDesc> list = storageDescService.list(lambdaQueryWrapper);