From 5a8389338e7ae54049e2ff7b01e431a568910610 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 01 十一月 2023 14:19:26 +0800
Subject: [PATCH] 药剂Id生成--三位顺序号
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java
index 05df914..4f59230 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1402.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.Building;
import com.ld.igds.models.DepotConf;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
@@ -11,6 +10,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -18,6 +18,7 @@
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -64,10 +65,10 @@
//灏佽鏁版嵁淇℃伅
for (DepotConf depotConf : dataList) {
dto1402 = new Dto1402();
- dto1402.setNm(depotConf.getDepotId().substring(0, 21));
- dto1402.setZznm(depotConf.getDepotId().substring(0, 21));
- dto1402.setCfnm(depotConf.getDepotId());
- dto1402.setCfbh(depotConf.getDepotId());
+ dto1402.setNm(ApiShUtil.getGbDepotId(depotConf.getDepotId()).substring(0, 21));
+ dto1402.setZznm(ApiShUtil.getGbDepotId(depotConf.getDepotId()).substring(0, 21));
+ dto1402.setCfnm(ApiShUtil.getGbDepotId(depotConf.getDepotId()).substring(0, 25));
+ dto1402.setCfbh(ApiShUtil.getGbDepotId(depotConf.getDepotId()));
String cableRule = depotConf.getCableRule();
String[] split = cableRule.split("-");
dto1402.setDlcs(split[0]);
@@ -96,7 +97,7 @@
log = inteStatusLogService.getLogByBizId(companyId, ApiShConst.API_SH_1402 + "_" + depotConf.getCompanyId() + depotConf.getDepotId());
if(null == log){
addLog = new InteStatusLog();
- addLog.setBizId(ApiShConst.API_SH_1402 + "_" + depotConf.getCompanyId() + depotConf.getDepotId());
+ addLog.setBizId(ApiShConst.API_SH_1402 + "_" + depotConf.getCompanyId() + ApiShUtil.getGbDepotId(depotConf.getDepotId()));
addLog.setCompanyId(companyId);
addLog.setBizType(ApiShConst.API_SH_TYPE_TASK);
addLog.setInterfaceId(ApiShConst.API_SH_1402);
--
Gitblit v1.9.3