From e6b42023fbc82168bc05c328e0479d0adff43e0e Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Mon, 21 Aug 2023 15:14:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=89=98=E7=9B=98=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/service/impl/BasicdataCodeServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java index 12d67f0fd..80ed4af71 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCodeServiceImpl.java @@ -103,11 +103,12 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { log.warn("############generateTraysCode: 未找到对应仓库warehouseCode={}",warehouseCode); return null; } - String abbreviation = entity.getAbbreviation();//简称 +// String abbreviation = entity.getAbbreviation();//简称 + String code = entity.getCode(); //获得年月日短字符串 String dateShort = CommonUtil.dateToStringShortYM(new Date()); - String key = "汇通"+":"+abbreviation+":"+dateShort; + String key = "HT"+":"+code+":"+dateShort; //获得序号 Long incr = bladeRedis.incr(key); @@ -116,7 +117,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService { bladeRedis.expireAt(key,CommonUtil.getMonthDayEnd()); } - return "汇通"+abbreviation+dateShort+CommonUtil.geFourNumber(incr,5); + return "HT"+code+dateShort+CommonUtil.geFourNumber(incr,5); } From e23454e4254a6b7f11918cc57f4a00679706bb40 Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 21 Aug 2023 15:25:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/feign/BasicdataWarehouseClient.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java index 548ece55b..6c68cd5e6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java @@ -115,6 +115,10 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { } + /** + * 查看当前登录人能够操作的仓库列表 + * @return + */ @GetMapping(API_PREFIX+"/getMyWarehouseList") @Override public List getMyWarehouseList() { @@ -122,6 +126,11 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { return myWarehouseList; } + /** + * 将用户当前选择仓库存放至Redis + * @param warehouseEntity + * @return + */ @PostMapping(API_PREFIX+"/preserveCurrentWarehouse") @Override public BasicdataWarehouseEntity preserveCurrentWarehouse(BasicdataWarehouseEntity warehouseEntity) { @@ -129,6 +138,10 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient { return null; } + /** + * 根据当前登录人获取Redis中用户选择的仓库信息 + * @return + */ @GetMapping(API_PREFIX+"/getMyCurrentWarehouse") @Override public Object getMyCurrentWarehouse() {