From dad4c3efeedd1971235d7907d9066ea06dc30e11 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 11 七月 2023 18:02:21 +0800
Subject: [PATCH] 倒仓和性质变更优化
---
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
index 6ffe9db..24fe0fe 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
@@ -5,8 +5,11 @@
import java.util.List;
import java.util.Map;
+import com.ld.igds.constant.RedisConst;
+import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.InoutStockChange;
import com.ld.igds.util.DateUtil;
+import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
@@ -17,8 +20,15 @@
import com.ld.igds.models.InoutVarietyChange;
import com.ld.igds.util.ContextUtil;
+import javax.annotation.Resource;
+
+import static com.bstek.dorado.view.widget.form.DateTimeSpinnerType.date;
+
@Component
public class HVarietyChangeService extends HibernateDao {
+
+ @Resource
+ private RedisUtil redisUtil;
public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
throws Exception {
@@ -69,19 +79,8 @@
try {
if (null == data.getId()) {
- Map<String, Object> param = new HashMap<>();
- param.put("dateTime", data.getChangeTime());
- List<InoutVarietyChange> list = queryAll(param);
- int max = 0;
- if (list.size() != 0) {
- int num;
- for (InoutVarietyChange varietyChange : list) {
- num = Integer.parseInt(varietyChange.getId().substring(varietyChange.getId().length() - 3));
- max = Math.max(max, num);
- }
- }
- String date = DateFormatUtils.format(new Date(), "yyyyMMdd");
- data.setId(data.getHwdm() + date + String.format("%03d", max + 1));
+ String id = createId(data.getChangeTime(), ContextUtil.getCompanyId(), data.getHwdm());
+ data.setId(id);
data.setCzbz("i");
session.save(data);
} else {
@@ -123,8 +122,62 @@
args.put("endTime", DateUtil.getNextZero(date));
}
- hql += " order by updateTime desc limit 20";
+ hql += " order by updateTime desc ";
return this.query(hql, args);
}
+ public List<InoutVarietyChange> getMaxId(Map<String, Object> param) {
+
+ String hql = "from " + InoutVarietyChange.class.getName() + " where 1 = 1 ";
+ Map<String, Object> args = new HashMap<String, Object>();
+ if (null != param) {
+ String str = (String) param.get("timeKey");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and id like :timeKey";
+ args.put("timeKey", str);
+ }
+ }
+ hql += " order by id desc ";
+ return this.query(hql, args);
+ }
+
+ public String createId(Date date, String companyId, String freightId) {
+ // 鏃堕棿鎴虫爣绛�
+ String timeKey = DateFormatUtils.format(date, "yyyyMMdd");
+
+ // 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
+ String cacheKey = RedisConst.buildKey(companyId,
+ InoutManageUtil.CACHE_VARIETY_ID);
+
+ String cacheId = (String) redisUtil.get(cacheKey);
+
+ if (null != cacheId && cacheId.indexOf(freightId + timeKey) >= 0) {
+ String temp = cacheId.substring(cacheId.length() - 3);
+ Integer i = Integer.valueOf(temp);
+ i++;
+ cacheId = freightId + timeKey + String.format("%03d", i);
+ } else {
+ Map<String, Object> args = new HashMap<>();
+ args.put("timeKey", "%" + freightId + timeKey + "%");
+ List<InoutVarietyChange> result = getMaxId(args);
+
+ if (null == result || result.size() == 0) {
+ cacheId = freightId + timeKey + "001";
+ } else {
+ int max = 0;
+ int num;
+ for (InoutVarietyChange varietyChange : result) {
+ num = Integer.parseInt(varietyChange.getId().substring(varietyChange.getId().length() - 3));
+ max = Math.max(max, num);
+ }
+ cacheId = freightId + timeKey + String.format("%03d", ++max);
+ }
+ }
+ // 鏇存柊缂撳瓨
+ redisUtil.set(cacheKey, cacheId);
+
+ return cacheId;
+ }
+
+
}
--
Gitblit v1.9.3