From 3165b46e7efa28e194e654fa7fb7cef8a9af8e80 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 20 Jun 2024 16:19:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E9=85=8D=E7=BD=AE=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basiccode/BasicCodeShowConstant.java | 44 ++++++++++++ .../basiccode/BasicCodeTypeConstant.java | 68 +++++++++++++++++++ .../basic/entity/BasicTenantCodeEntity.java | 11 +-- .../basic/feign/IBasicTenantCodeClient.java | 4 ++ .../basic/feign/BasicTenantCodeClient.java | 5 +- .../service/IBasicTenantCodeService.java | 2 + .../impl/BasicTenantCodeServiceImpl.java | 27 +++++--- .../impl/BasicdataClientServiceImpl.java | 29 +++++++- 8 files changed, 168 insertions(+), 22 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeShowConstant.java create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeTypeConstant.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeShowConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeShowConstant.java new file mode 100644 index 000000000..16d32b9c9 --- /dev/null +++ b/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; + } +} diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeTypeConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/basiccode/BasicCodeTypeConstant.java new file mode 100644 index 000000000..6baba2791 --- /dev/null +++ b/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; + } +} diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java index 76ef9b221..d4de7f1b0 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/entity/BasicTenantCodeEntity.java +++ b/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; /*** * 编码 diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java index d8cf2a25a..0a549d345 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicTenantCodeClient.java +++ b/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); + + } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java index af50642dd..e8982c795 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicTenantCodeClient.java +++ b/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); + } } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java index 51e875ca0..11411b37b 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicTenantCodeService.java @@ -68,4 +68,6 @@ public interface IBasicTenantCodeService extends BaseService implements IBasicTenantCodeService { - private BasicTenantCodeMapper basicTenantCodeMapper; @Override public IPage list(Map basicTenantCode, IPage page) { - IPage basicTenantCodeEntityIPage = basicTenantCodeMapper.selectTenantCodeList(page,basicTenantCode); + IPage basicTenantCodeEntityIPage = baseMapper.selectTenantCodeList(page,basicTenantCode); return basicTenantCodeEntityIPage; } @@ -54,7 +54,7 @@ public class BasicTenantCodeServiceImpl extends BaseServiceImpl 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().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); } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 675564f65..704f58530 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/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 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