Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeShowConstant.java

@@ -0,0 +1,44 @@
+package org.springblade.common.constant.basiccode;
+
+import lombok.Data;
+
+/**
+ * 租户编码姐
+ * 类型码表
+ */
+public enum BasicCodeShowConstant {
+
+	/**
+	 * 二维码
+	 */
+	QR_CODE("qr_code",1),
+
+	/**
+	 * 条形码
+	 */
+	BAR_CODE("bar_code",2);
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private Integer value;
+
+	BasicCodeShowConstant(String name, Integer value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public Integer getValue() {
+		return value;
+	}
+}

blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeTypeConstant.java

@@ -0,0 +1,68 @@
+package org.springblade.common.constant.basiccode;
+
+/**
+ * 租户编码姐
+ * 类型码表
+ */
+public enum BasicCodeTypeConstant {
+
+
+	waybill_code("运单码","1"),
+	ORDER_CODE("订单码","2"),
+	ORDER_PACKAGE_CODE("包件码","3"),
+//	仓库码
+	WAREHOUSE_CODE("仓库码","4"),
+	// 货区码
+	AREA_CODE("货区码","5"),
+	// 货架码
+	SHELF_CODE("货架码","6"),
+	// 货位码
+	POSITION_CODE("货位码","7"),
+	// 托盘码
+	TRAY_CODE("托盘码","8"),
+	// 客户编码
+	CLIENT_CODE("客户编码","9"),
+	// 提货单 配载计划 三方中转 直发商家签收单
+	// 提货单码
+	PICKUP_CODE("提货单码","10"),
+	// 配载计划码
+	ALLOCATION_CODE("配载计划码","11"),
+	// 三方中转码
+	THIRD_TRANSFER_CODE("三方中转码","12"),
+	// 直发商家签收单码
+	DIRECT_SIGN_CODE("直发商家签收单码","13"),
+
+
+	//配送计划 自提单 预约单 备货码
+	DELIVERY_PLAN_CODE("配送计划码","20"),
+	// 自提单码
+	PICKUP_ORDER_CODE("自提单码","21"),
+	// 预约单码
+	APPOINTMENT_CODE("预约单码","22"),
+	// 备货码
+	STOCK_CODE("备货码","23");
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+	BasicCodeTypeConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+}

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java

@@ -39,13 +39,7 @@ import java.io.Serializable;
 public class BasicTenantCodeEntity  extends TenantEntity implements Serializable{
 
 	private static final long serialVersionUID = 1L;
-//	/**
-//	 * 主键
-//	 */
-//	@JsonSerialize(using = ToStringSerializer.class)
-//	@ApiModelProperty(value = "主键")
-//	@TableId(value = "id", type = IdType.ASSIGN_ID)
-//	private Long id;
+
 
 	/**
 	 * 编码类型
@@ -53,7 +47,7 @@ public class BasicTenantCodeEntity  extends TenantEntity implements Serializable
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty(value = "编码类型")
 	@TableField(value = "code_type")
-	private Integer codeType;
+	private String codeType;
 
 	/**
 	 * 编码展示类型
@@ -63,7 +57,6 @@ public class BasicTenantCodeEntity  extends TenantEntity implements Serializable
 	@TableField(value = "show_type")
 	private Integer showType;
 
-//	private Integer isDeleted;
 
 	/***
 	 * 编码

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java

@@ -64,5 +64,9 @@ public interface IBasicTenantCodeClient {
 	 */
 	@GetMapping(TOP+"/shelfCode")
 	String shelfCode(@RequestParam String tenantId,@RequestParam String codeType);
+	@GetMapping(TOP+"/findBasicTenantCodeByCodeAndShowType")
+	BasicTenantCodeEntity findBasicTenantCodeByCodeAndShowType(@RequestParam("codeType") String codeType,@RequestParam("showType")Integer showType);
+
+
 
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java

@@ -67,5 +67,8 @@ public class BasicTenantCodeClient implements IBasicTenantCodeClient {
 		return shelfCode;
 	}
 
-
+	@Override
+	public BasicTenantCodeEntity findBasicTenantCodeByCodeAndShowType(String codeType, Integer showType) {
+		return basicTenantCodeService.findBasicTenantCodeByCodeAndShowType(codeType,showType);
+	}
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java

@@ -68,4 +68,6 @@ public interface IBasicTenantCodeService extends BaseService<BasicTenantCodeEnti
 	BasicTenantCodeEntity gerOne(Long id);
 
     String shelfCode(String tenantId,String codeType);
+
+    BasicTenantCodeEntity findBasicTenantCodeByCodeAndShowType(String codeType, Integer showType);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicTenantCodeServiceImpl.java

@@ -17,6 +17,7 @@
 package com.logpm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basic.entity.BasicTenantCodeEntity;
 import com.logpm.basic.excel.BasicTenantCodeExcel;
@@ -42,11 +43,10 @@ import java.util.Map;
 @AllArgsConstructor
 public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeMapper, BasicTenantCodeEntity> implements IBasicTenantCodeService {
 
-	private BasicTenantCodeMapper basicTenantCodeMapper;
 
 	@Override
 	public IPage<BasicTenantCodeEntity> list(Map<String, Object> basicTenantCode, IPage<BasicTenantCodeEntity> page) {
-		IPage<BasicTenantCodeEntity> basicTenantCodeEntityIPage = basicTenantCodeMapper.selectTenantCodeList(page,basicTenantCode);
+		IPage<BasicTenantCodeEntity> basicTenantCodeEntityIPage = baseMapper.selectTenantCodeList(page,basicTenantCode);
 		return basicTenantCodeEntityIPage;
 	}
 
@@ -54,7 +54,7 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeM
 	public BasicTenantCodeEntity gerOne(Long id) {
 		BasicTenantCodeEntity basicTenantCodeEntity = new BasicTenantCodeEntity();
 		if (id!=null){
-			 basicTenantCodeEntity = basicTenantCodeMapper.selectTenantCodeDetail(id);
+			 basicTenantCodeEntity = baseMapper.selectTenantCodeDetail(id);
 		}
 		return basicTenantCodeEntity;
 	}
@@ -64,7 +64,7 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeM
 		Map<String,String> map = new HashMap<>();
 		map.put("tenantId",tenantId);
 		map.put("codeType",codeType);
-		String shelfCode = basicTenantCodeMapper.shelfCode(map);
+		String shelfCode = baseMapper.shelfCode(map);
 		return shelfCode;
 	}
 
@@ -83,14 +83,23 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl<BasicTenantCodeM
 		return basicTenantCodeList;
 	}
 
+	@Override
+	public BasicTenantCodeEntity findBasicTenantCodeByCodeAndShowType(String codeType, Integer showType) {
+
+		BasicTenantCodeEntity basicTenantCodeEntity = baseMapper.selectOne(new QueryWrapper<BasicTenantCodeEntity>().eq("code_type", codeType).eq("show_type", showType).eq("is_deleted",0));
+
+
+		return basicTenantCodeEntity;
+	}
+
 	@Override
 	public boolean save(BasicTenantCodeEntity entity) {
 		String code = entity.getCode();
-		Integer codeType = entity.getCodeType();
-		if (Func.isBlank(code)){
-			code = "DA--00"+codeType;
-			entity.setCode(code);
-		}
+		String codeType = entity.getCodeType();
+//		if (Func.isBlank(code)){
+//			code = "DA--00"+codeType;
+//			entity.setCode(code);
+//		}
 		return super.save(entity);
 	}
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -26,6 +26,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basic.entity.BasicTenantCodeEntity;
+import com.logpm.basic.feign.IBasicTenantCodeClient;
 import com.logpm.basicdata.entity.BasicdataBrandEntity;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
@@ -51,6 +53,8 @@ import com.logpm.basicdata.vo.ClientInfoVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.RedisKeyConstant;
+import org.springblade.common.constant.basiccode.BasicCodeShowConstant;
+import org.springblade.common.constant.basiccode.BasicCodeTypeConstant;
 import org.springblade.common.model.dto.NameDTO;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -101,6 +105,10 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 	private IBasicdataWarehouseService warehouseService;
 //	private final IBasicdataClientUserService basicdataClientUserService;
 
+
+	@Autowired
+	private IBasicTenantCodeClient basicTenantCodeClient;
+
 	@Autowired
 	private IUserClient userClient;
 
@@ -669,15 +677,30 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 
 	@Override
 	public String getFinallyClientCode() {
+
+		String tenantCode ="HT";
+		BasicTenantCodeEntity basicTenantCodeByCodeAndShowType = basicTenantCodeClient.findBasicTenantCodeByCodeAndShowType(BasicCodeTypeConstant.CLIENT_CODE.getValue(), BasicCodeShowConstant.QR_CODE.getValue());
+		if (ObjectUtils.isNull(basicTenantCodeByCodeAndShowType)) {
+			log.error("获取货区码失败");
+		}else{
+			tenantCode = basicTenantCodeByCodeAndShowType.getCode();
+		}
+
 		String finaClientCode = redis.get(RedisKeyConstant.FINAL_CLIENT_CODE + AuthUtil.getTenantId());
 		if (StringUtils.isBlank(finaClientCode)) {
 			List<String> str = baseMapper.getFinallyClientCode();
-			finaClientCode = str.get(0);
+			if(!str.isEmpty()){
+				finaClientCode = str.get(0);
+			}else{
+				finaClientCode =tenantCode+"0000000";
+			}
 			redis.set(RedisKeyConstant.FINAL_CLIENT_CODE + AuthUtil.getTenantId(), finaClientCode);
+
 		}
-		String num = finaClientCode.replaceAll("HT", "");
+		String num = finaClientCode.replaceAll(tenantCode, "");
 		int anInt = Integer.parseInt(num) + 1;
-		return "HT00" + anInt;
+		String formattedNum = String.format("%07d", anInt);
+		return tenantCode + formattedNum;
 	}
 
 	@Override