2024年7月3日17:32:50

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

@@ -84,6 +84,8 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
 	private String billType;
+	@ApiModelProperty(value = "来源订单类型 销售订单 XS 报价 BJ")
+	private String srcBillType;
 	/**
 	 * 贸易类型(枚举：国内、进口、出口)
 	 */

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -67,6 +67,8 @@ public class Order extends OrderBase {
 	 */
 	@ApiModelProperty(value = "订单类型 销售订单 XS 采购订单 CG")
 	private String billType;
+	@ApiModelProperty(value = "来源订单类型 销售订单 XS 报价 BJ")
+	private String srcBillType;
 	/**
 	 * 贸易类型(枚举：国内、进口、出口)
 	 */

blade-service/blade-client/src/main/java/org/springblade/client/corps/excel/GoodsImportExcel.java

@@ -18,6 +18,6 @@ public class GoodsImportExcel implements Serializable {
 	private String code;
 
 	@ExcelProperty("分管员(必填)")
-	private String adminProfilesName;
+	private String supervisorUserNameGroup;
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -660,7 +660,19 @@ public class GoodsDescController extends BladeController {
 	}
 
 	/**
-	 * 导入商品
+	 * 导入模板-贸易
+	 */
+	@GetMapping("/export-template")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导入模板")
+	public void exportPrice(HttpServletResponse response) {
+		/*List<GoodsExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "导出模板-产品信息", "导入数据表", list, GoodsExcel.class);*/
+		List<GoodsExcels> list = new ArrayList<>();
+		ExcelUtil.export(response, "导入商品模板-商品信息", "导入商品模板", list, GoodsExcels.class);
+	}
+	/**
+	 * 导入商品-贸易
 	 */
 	@PostMapping("/import-desc")
 	@ApiOperationSupport(order = 12)
@@ -673,34 +685,8 @@ public class GoodsDescController extends BladeController {
 		}
 		return goodsDescService.importGoodsNew(excelList, false);
 	}
-
 	/**
-	 * 导出模板
-	 */
-	@GetMapping("/export-template")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出模板")
-	public void exportPrice(HttpServletResponse response) {
-		/*List<GoodsExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "导出模板-产品信息", "导入数据表", list, GoodsExcel.class);*/
-		List<GoodsExcels> list = new ArrayList<>();
-		ExcelUtil.export(response, "导出模板-商品信息", "导入数据表", list, GoodsExcels.class);
-	}
-
-
-	/**
-	 * 导出模板
-	 */
-	@GetMapping("/export-template-info")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出模板")
-	public void exportGoodsInfo(HttpServletResponse response) {
-		List<GoodsInfoExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "导入模板-产品信息", "导出数据表", list, GoodsInfoExcel.class);
-	}
-
-	/**
-	 * 导出数据
+	 * 导出数据-贸易
 	 */
 	@GetMapping("/exportData")
 	@ApiOperationSupport(order = 9)
@@ -710,10 +696,7 @@ public class GoodsDescController extends BladeController {
 						   @RequestParam(name = "cname", required = false) String cname,
 						   @RequestParam(name = "ename", required = false) String ename
 	) {
-
-
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
-
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);
@@ -734,11 +717,21 @@ public class GoodsDescController extends BladeController {
 			return gee;
 		}).collect(Collectors.toList());
 
-		ExcelUtil.export(response, "导入模板-产品信息", "导出数据表", exportList, GoodesExportExcel.class);
+		ExcelUtil.export(response, "导出数据-产品信息", "导出数据表", exportList, GoodesExportExcel.class);
 	}
 
 	/**
-	 * 导入产品信息
+	 * 导入模板-轮胎
+	 */
+	@GetMapping("/export-template-info")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导入模板")
+	public void exportGoodsInfo(HttpServletResponse response) {
+		List<GoodsInfoExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "导入模板-产品信息", "导入模板", list, GoodsInfoExcel.class);
+	}
+	/**
+	 * 导入产品信息-轮胎
 	 */
 	@PostMapping("/import-desc-info")
 	@ApiOperationSupport(order = 12)
@@ -996,7 +989,32 @@ public class GoodsDescController extends BladeController {
 	@GetMapping("/exportAdminProfiles")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入corpsDesc")
-	public void exportAdminProfiles(HttpServletResponse response) {
-		ExcelUtil.export(response, "分管员模板", "分管员模板", new ArrayList<>(), GoodsImportExcel.class);
+	public void exportAdminProfiles(HttpServletResponse response,
+									@RequestParam(name = "code", required = false) String code,
+									@RequestParam(name = "cname", required = false) String cname,
+									@RequestParam(name = "ename", required = false) String ename,
+									@RequestParam(name = "typeno", required = false) String typeno,
+									@RequestParam(name = "goodsTypeId", required = false) String goodsTypeId) {
+		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(typeno), GoodsDesc::getTypeno, typeno);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(goodsTypeId), GoodsDesc::getGoodsTypeId, goodsTypeId);
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
+		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
+		if (!"admin".equals(AuthUtil.getUserName())) {
+			goodsDescLambdaQueryWrapper.and(qw -> qw.like(GoodsDesc::getSupervisorUserIdGroup, AuthUtil.getUserId())
+				.or().isNull(GoodsDesc::getSupervisorUserIdGroup)
+				.or().eq(GoodsDesc::getSupervisorUserIdGroup, ""));
+		}
+		List<GoodsDesc> list = goodsDescService.list(goodsDescLambdaQueryWrapper);
+		List<GoodsImportExcel> exportList = list.stream().map(data -> {
+			GoodsImportExcel gee = new GoodsImportExcel();
+			BeanUtils.copyProperties(data, gee);
+			return gee;
+		}).collect(Collectors.toList());
+		ExcelUtil.export(response, "分管员模板-商品", "分管员模板-商品", exportList, GoodsImportExcel.class);
 	}
 }

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

@@ -903,7 +903,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	@Transactional
 	public R importCorp(List<GoodsImportExcel> excelList) {
 		List<GoodsDesc> goodsDescList = new ArrayList<>();
-		String adminProfilesName = excelList.stream().map(GoodsImportExcel::getAdminProfilesName).distinct().collect(Collectors.joining(","));
+		String adminProfilesName = excelList.stream().map(GoodsImportExcel::getSupervisorUserNameGroup).distinct().collect(Collectors.joining(","));
 		String userIds = userClient.selectUserByNames(adminProfilesName);
 		List<User> userList = new ArrayList<>();
 		if (ObjectUtils.isNotNull(userIds)){
@@ -919,7 +919,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			}
 			if (!userList.isEmpty()) {
 				goodsDesc.setSupervisorUserNameGroup(userList.stream().map(User::getRealName)
-					.filter(realName -> item.getAdminProfilesName().contains(realName)).collect(Collectors.joining(",")));
+					.filter(realName -> item.getSupervisorUserNameGroup().contains(realName)).collect(Collectors.joining(",")));
 				List<Long> ids = userList.stream().map(User::getId).distinct().collect(Collectors.toList());
 				StringBuilder supervisorUserIdGroup = new StringBuilder();
 				for (Long e : ids) {

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

@@ -96,6 +96,7 @@ public class ExportEnquiryController extends BladeController {
 		lambdaQueryWrapper.eq(Order::getTenantId, SecureUtil.getTenantId());//租户id
 		lambdaQueryWrapper.eq(Order::getIsDeleted, 0);//订单是否有效
 		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.ENQUIRY.getType());//订单类型
+//		lambdaQueryWrapper.apply("find_in_set(bill_type,'BJ,XS')");//订单类型
 		lambdaQueryWrapper.eq(Order::getTradeType, OrderTypeEnum.EXPORT.getType());//贸易类型
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getOrderNo()), Order::getOrderNo, order.getOrderNo());//订单号
 		lambdaQueryWrapper.like(Func.isNotEmpty(order.getCorpId()), Order::getCorpId, order.getCorpId());//客户id

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -624,6 +624,7 @@ public class StockDescController extends BladeController {
 						.add(stockBrandExcel.getGoodsSize20()).add(stockBrandExcel.getGoodsSize21()).add(stockBrandExcel.getGoodsSize22())
 						.add(stockBrandExcel.getGoodsSize23()).add(stockBrandExcel.getGoodsSize24()).add(stockBrandExcel.getGoodsSize25())
 						.add(stockBrandExcel.getGoodsSize26()).add(stockBrandExcel.getGoodsSize27()).add(stockBrandExcel.getGoodsSize28())
+						.add(stockBrandExcel.getGoodsSizeOther())
 					);
 					if (new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize12()) != 0 ||
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize13()) != 0 ||
@@ -641,7 +642,8 @@ public class StockDescController extends BladeController {
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize25()) != 0 ||
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize26()) != 0 ||
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize27()) != 0 ||
-						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize28()) != 0
+						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize28()) != 0 ||
+						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSizeOther()) != 0
 					) {
 						mapList.add(stockBrandExcel);
 					}
@@ -741,6 +743,7 @@ public class StockDescController extends BladeController {
 						.add(stockBrandExcel.getGoodsSize20()).add(stockBrandExcel.getGoodsSize21()).add(stockBrandExcel.getGoodsSize22())
 						.add(stockBrandExcel.getGoodsSize23()).add(stockBrandExcel.getGoodsSize24()).add(stockBrandExcel.getGoodsSize25())
 						.add(stockBrandExcel.getGoodsSize26()).add(stockBrandExcel.getGoodsSize27()).add(stockBrandExcel.getGoodsSize28())
+						.add(stockBrandExcel.getGoodsSizeOther())
 					);
 					if (new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize12()) != 0 ||
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize13()) != 0 ||
@@ -758,7 +761,8 @@ public class StockDescController extends BladeController {
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize25()) != 0 ||
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize26()) != 0 ||
 						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize27()) != 0 ||
-						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize28()) != 0
+						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSize28()) != 0 ||
+						new BigDecimal("0.00").compareTo(stockBrandExcel.getGoodsSizeOther()) != 0
 					) {
 						stockBrandExcelList.add(stockBrandExcel);
 					}

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -196,6 +196,7 @@ public class ShippingEnquiry extends BladeController {
 			return R.fail(500,"已提交船务询价,请勿重复提交");
 		}
 		order.setIfShipping("已提交");
+//		order.setSrcBillType("BJ");
 		//循环发送消息
 		Message sendMessage = new Message();
 		sendMessage.setParameter(String.valueOf(orderMessage.getId()));