Merge remote-tracking branch 'origin/dev' into dev

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<BasicdataWarehouseVO> 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() {

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);
 
 	}