2024年12月17日16:20:14

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -75,7 +75,7 @@ public interface ISysClient {
 	String GET_PARAM_SERVICE_BY_DEPT = API_PREFIX + "/getParamServiceByDept";
 	String UPDATE_BY_DEPT = API_PREFIX + "/updateByDept";
 	String GET_DEPT_LIST = API_PREFIX + "/getDeptList";
-	String GET_TENANTS = API_PREFIX + "/getTenants";
+	String GET_TENANT_IDS = API_PREFIX + "/getTenantIds";
 
 
 	/**
@@ -384,6 +384,6 @@ public interface ISysClient {
 	@GetMapping(GET_DEPT_LIST)
 	R<List<Dept>> getDeptList(@RequestParam(value = "ids", required = false) String ids, @RequestParam(value = "name", required = false) String name);
 
-	@GetMapping(GET_TENANTS)
-	String getTenants(@RequestParam("tenantId") String paramKey);
+	@GetMapping(GET_TENANT_IDS)
+	String getTenantIds(@RequestParam("paramKey") String paramKey);
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -206,7 +206,7 @@ public class ISysClientFallback implements ISysClient {
 	}
 
 	@Override
-	public String getTenants(String paramKey) {
+	public String getTenantIds(String paramKey) {
 		return "";
 	}
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/SalesPolicyMapper.xml

@@ -83,6 +83,9 @@
         <if test="salesPolicy.tenantId!=null and salesPolicy.tenantId!=''">
             and dept.tenant_id = #{salesPolicy.tenantId}
         </if>
+        <if test="salesPolicy.brand!=null and salesPolicy.brand!=''">
+            and dept.brand = #{salesPolicy.brand}
+        </if>
         <if test="salesPolicy.newTime!=null and salesPolicy.newTime!=''">
             and dept.start_time &lt;= #{salesPolicy.newTime}
         </if>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/excel/AgencyOrderItemsExcel.java

@@ -25,11 +25,6 @@ public class AgencyOrderItemsExcel implements Serializable {
 	@ExcelProperty(value = "品号(必填)")
 	private String code;
 	/**
-	 * 商品名称
-	 */
-	@ExcelProperty(value = "商品名称(必填)")
-	private String cname;
-	/**
 	 * 规格
 	 */
 	@ExcelProperty(value = "规格")

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

@@ -296,7 +296,6 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 			GoodsDesc goodsDesc = goodsDescClient.getGoodsDescById(item.getGoodsId(), AuthUtil.getTenantId());
 			if (goodsDesc != null) {
 				agencyOrderItemsExcel.setCode(goodsDesc.getCode());
-				agencyOrderItemsExcel.setCname(goodsDesc.getCname());
 				agencyOrderItemsExcel.setBrandItem(goodsDesc.getBrandItem());
 				agencyOrderItemsExcel.setTypeno(goodsDesc.getTypeno());
 			}
@@ -345,7 +344,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 					orderItems.setPriceCategory(goodsType.getCname());//商品类别名称
 					list.add(orderItems);
 				} else {
-					throw new RuntimeException("商品名称" + item.getCname() + "不存在");
+					throw new RuntimeException("商品编码" + item.getCode() + "不存在");
 				}
 			}
 		}

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

@@ -356,7 +356,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				} else {
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
 					if (corpMessage.isSuccess()) {
-						R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(), order.getTradeType(), order.getBillType());
+						String code = "";
+						if ("DLDD".equals(order.getBillType())) {
+							code = "JH" + corpMessage.getData().getCode();
+						} else {
+							code = corpMessage.getData().getCode();
+						}
+						R clientBillNo = serialClient.getBillNo(code, order.getTradeType(), order.getBillType());
 						if (!clientBillNo.isSuccess()) {
 							TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 							return R.fail(500, "生成订单编号失败");
@@ -433,7 +439,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					} else {
 						R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(order.getCorpId());
 						if (corpMessage.isSuccess()) {
-							R clientBillNo = serialClient.getBillNo(corpMessage.getData().getCode(), order.getTradeType(), order.getBillType());
+							String code = "";
+							if ("DLDD".equals(order.getBillType())) {
+								code = "JH" + corpMessage.getData().getCode();
+							} else {
+								code = corpMessage.getData().getCode();
+							}
+							R clientBillNo = serialClient.getBillNo(code, order.getTradeType(), order.getBillType());
 							if (!clientBillNo.isSuccess()) {
 								TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 								return R.fail(500, "生成订单编号失败");
@@ -511,7 +523,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			order.setOrderItemsList(order.getOrderItemsList());
 			if (order.getTradeType().equals(OrderTypeEnum.DOMESTIC.getType()) && OrderTypeEnum.SALES.getType().equals(order.getBillType())) {
 				List<Long> pidList = order.getOrderItemsList().stream()
-					.filter(e -> ObjectUtils.isNotNull(e.getType()) && OrderTypeEnum.DOMESTIC.getType().equals(e.getType()))
+					.filter(e -> ObjectUtils.isNotNull(e.getType()) && OrderTypeEnum.PROXY_ORDER.getType().equals(e.getType()))
 					.map(OrderItems::getSrcId).distinct().collect(Collectors.toList());
 				if (!pidList.isEmpty()) {
 					List<Order> orderList = baseMapper.selectList(new LambdaQueryWrapper<Order>()
@@ -525,7 +537,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						this.updateBatchById(orderList);
 					}
 				}
-				long count = order.getOrderItemsList().stream().map(OrderItems::getBrand).distinct().count();
+				/*long count = order.getOrderItemsList().stream().map(OrderItems::getBrand).distinct().count();
 				if (count > 1) {
 					throw new RuntimeException("销售明细存在多个品牌");
 				}
@@ -538,7 +550,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 							throw new RuntimeException("销售明细-商品：" + itemsList.get(0).getCname() + "存在多个供应商");
 						}
 					}
-				}
+				}*/
 			}
 			if (order.getTradeType().equals(OrderTypeEnum.DOMESTIC.getType()) && OrderTypeEnum.PROXY_ORDER.getType().equals(order.getBillType())) {
 				order.setMinOrder(order.getOrderItemsList().stream().map(OrderItems::getOrderQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/smartLargeScreenApi/controller/ApiController.java → blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/smartLargeScreenApi/controller/SmartLargeScreenApiController.java

@@ -1,6 +1,5 @@
 package org.springblade.salesPart.smartLargeScreenApi.controller;
 
-import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
@@ -19,9 +18,8 @@ import java.util.Map;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/app/index")
-@Api(value = "贸易代理app首页统计", tags = "贸易代理app首页统计接口")
-public class ApiController extends BladeController {
+@RequestMapping("/api/smartLargeScreen")
+public class SmartLargeScreenApiController extends BladeController {
 
 	private final ApiService apiService;
 
@@ -40,7 +38,7 @@ public class ApiController extends BladeController {
 	@GetMapping("/getTotalMonth")
 	public R<Map<String, Object>> getTotalMonth(@RequestParam(value = "year") String year,
 												@RequestParam(value = "month") String month) {
-		return R.data(apiService.getTotalMonth(year,month));
+		return R.data(apiService.getTotalMonth(year, month));
 	}
 
 	/**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/smartLargeScreenApi/service/impl/ApiServiceImpl.java

@@ -40,7 +40,7 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public Map<String, Object> getTotalYear(String year) {
-		String tenantId = sysClient.getTenants("whether.financing");
+		String tenantId = sysClient.getTenantIds("whether.financing");
 		List<PjOrder> orderList = orderService.getTotalYear(tenantId, year);
 		Map<String, Object> map = new HashMap<>();
 		if (!orderList.isEmpty()) {
@@ -54,7 +54,7 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public Map<String, Object> getTotalMonth(String year, String month) {
-		String tenantId = sysClient.getTenants("whether.financing");
+		String tenantId = sysClient.getTenantIds("whether.financing");
 		if (month.length() == 1) {
 			month = "0" + month;
 		}
@@ -74,7 +74,7 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public List<Map<String, Object>> getBrandSort(String year) {
-		String tenantId = sysClient.getTenants("whether.financing");
+		String tenantId = sysClient.getTenantIds("whether.financing");
 		List<PjBrandDesc> brandDescList = brandDescService.getTenants(tenantId);
 		BigDecimal numberSum = new BigDecimal("0");
 		List<PjOrderItems> orderItemsList = orderItemsService.getListByTenant(tenantId, year);
@@ -122,7 +122,7 @@ public class ApiServiceImpl implements ApiService {
 
 	@Override
 	public Map<String, Object> getWarehouseSort(String year) {
-		String tenantId = sysClient.getTenants("whether.financing");
+		String tenantId = sysClient.getTenantIds("whether.financing");
 		List<PjStorageDesc> storageDescList = storageDescService.getTenants(tenantId);
 		List<PjOrder> orderList = orderService.getTotalYear(tenantId, year);
 		List<WarehouseSort> warehouseSortList = new ArrayList<>();

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -277,7 +277,8 @@ public class SysClient implements ISysClient {
 	}
 
 	@Override
-	public String getTenants(String paramKey) {
+	@GetMapping(GET_TENANT_IDS)
+	public String getTenantIds(String paramKey) {
 		return paramServiceService.getTenants(paramKey);
 	}
 

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

@@ -607,7 +607,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		sendMessage.setUrl("/exportTrade/customerInquiry/index");
 		sendMessage.setPageLabel(order.getPageLabel());
 		sendMessage.setPageStatus(order.getPageStatus());
-		sendMessage.setMessageBody("单号：" + order.getOrderNo() + "船务询价已完成,请查看");
+		sendMessage.setMessageBody("单号：" + order.getSysNo() + "船务询价已完成,请查看");
 		R save = messageClient.save(sendMessage);
 		if (!save.isSuccess()) {
 			throw new SecurityException("发送消息失败");
@@ -686,7 +686,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		sendMessage.setUrl("/exportTrade/customerInquiry/index");
 		sendMessage.setPageLabel(order.getPageLabel());
 		sendMessage.setPageStatus(order.getPageStatus());
-		sendMessage.setMessageBody("单号：" + submitDto.getOrderNo() + "船务询价已完成,请查看");
+		sendMessage.setMessageBody("单号：" + submitDto.getSysNo() + "船务询价已完成,请查看");
 		R save = messageClient.save(sendMessage);
 		if (!save.isSuccess()) {
 			throw new SecurityException("发送消息失败");