From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 180 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 116 insertions(+), 64 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
index ca72905..9479b46 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
@@ -2,13 +2,21 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
import javax.transaction.Transactional;
+
+import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.m.InoutManageUtil;
+import com.ld.igds.models.InoutLossOver;
+import com.ld.igds.models.InoutVarietyChange;
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.apache.commons.lang3.time.DateUtils;
@@ -18,18 +26,19 @@
import com.bstek.bdf2.core.business.IUser;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.models.MLossOver;
import com.ld.igds.util.ContextUtil;
@Component
public class HLossOverService extends HibernateDao {
+ @Resource
+ private RedisUtil redisUtil;
@Autowired
private InoutService inoutService;
- public void pageData(Page<MLossOver> page, Map<String, Object> param)
+ public void pageData(Page<InoutLossOver> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + MLossOver.class.getName()
+ String hql = " from " + InoutLossOver.class.getName()
+ " where companyId=:companyId";
Map<String, Object> args = new HashMap<String, Object>();
@@ -71,17 +80,10 @@
}
@Transactional(rollbackOn = Exception.class)
- public void saveData(MLossOver data) throws Exception {
+ public void saveData(InoutLossOver data) throws Exception {
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
-
- InoutData inoutData = inoutService.getLastRecord(ContextUtil.getCompanyId(), data.getDepotId());
-
- if (null != inoutData && null != inoutData.getCompleteTime() &&
- data.getSubmitTime().before(inoutData.getCompleteTime())) {
- throw new Exception("鐧昏鏃堕棿涓嶈兘鏃╀簬鏈�鍚庝竴杈嗚溅瀹屾垚鏃堕棿锛�" + DateFormatUtils.format(inoutData.getCompleteTime(), "yyyy-MM-dd HH:mm"));
- }
try {
if (null == data.getId()) {
@@ -94,14 +96,13 @@
//鑾峰彇鎻愪氦鏃堕棿鏃ユ湡鐨�01:00:00鏃堕棿
Date curDate = DateUtil.getCurZero(data.getSubmitTime());
- curDate = DateUtils.addHours(curDate,1);
+ curDate = DateUtils.addHours(curDate, 1);
//濡傛灉瀹屾垚鏃堕棿鍦╟urDate涔嬪墠锛屽垯灏嗗畬鎴愭椂闂磋涓哄綋鍓嶅ぉ鐨�01:00:00
- if(data.getSubmitTime().before(curDate)){
+ if (data.getSubmitTime().before(curDate)) {
data.setSubmitTime(curDate);
}
-
- String id = addInoutDataByLossOver(data);
-
+ String id = createId(data.getSubmitTime(), data.getCompanyId(), data.getType());
+// String id = addInoutDataByLossOver(data);
data.setId(id);
session.save(data);
@@ -116,45 +117,45 @@
}
}
- private String addInoutDataByLossOver(MLossOver lossOver){
- if (null == lossOver.getSubmitTime()) {
- lossOver.setSubmitTime(new Date());
- }
-
- InoutData data = new InoutData();
- data.setRecordStatus(InoutConstant.RECORD_STATUS_ADD);
- data.setProgress(InoutConstant.PROGRESS_RECORD);
- data.setType(lossOver.getType());
- data.setSettleWeight(lossOver.getAmount());
- data.setDepotId(lossOver.getDepotId());
- data.setDeptId(lossOver.getDeptId());
- data.setCompanyId(lossOver.getCompanyId());
- data.setFoodVariety(lossOver.getFoodVariety());
- data.setCheckStatus(InoutConstant.STATUS_PASS);
+ private String addInoutDataByLossOver(InoutLossOver lossOver) {
+ if (null == lossOver.getSubmitTime()) {
+ lossOver.setSubmitTime(new Date());
+ }
- String loginUser = lossOver.getUpdateUser();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
- data.setCompleteTime(lossOver.getSubmitTime());
- data.setRegisterTime(data.getCompleteTime());
- data.setFullWeightTime(data.getCompleteTime());
- data.setEmptyWeightTime(data.getCompleteTime());
- if (StringUtils.isEmpty(data.getUserId())) {
- data.setUserId(InoutConstant.DEFAULT_ID_CARD);
- }
-
- return inoutService.addInoutDataByLossOver(data);
- }
+ InoutData data = new InoutData();
+ data.setRecordStatus(InoutConstant.RECORD_STATUS_ADD);
+ data.setProgress(InoutConstant.PROGRESS_RECORD);
+ data.setType(lossOver.getType());
+ data.setSettleWeight(lossOver.getAmount());
+ data.setDepotId(lossOver.getDepotId());
+ data.setDeptId(lossOver.getDeptId());
+ data.setCompanyId(lossOver.getCompanyId());
+ //data.setFoodVariety(lossOver.getFoodVariety());
+ data.setCheckStatus(InoutConstant.STATUS_PASS);
- @Transactional(rollbackOn = Exception.class)
- public String delData(MLossOver data) throws Exception {
+ String loginUser = lossOver.getUpdateUser();
+ data.setRegisterUser(loginUser);
+ data.setFullWeightUser(loginUser);
+ data.setEmptyWeightUser(loginUser);
+ data.setHandleUser(loginUser);
+ data.setCompleteUser(loginUser);
+ data.setCompleteTime(lossOver.getSubmitTime());
+ data.setRegisterTime(data.getCompleteTime());
+ data.setFullWeightTime(data.getCompleteTime());
+ data.setEmptyWeightTime(data.getCompleteTime());
+ if (StringUtils.isEmpty(data.getUserId())) {
+ data.setUserId(InoutConstant.DEFAULT_ID_CARD);
+ }
+
+ return inoutService.addInoutDataByLossOver(data);
+ }
+
+ @Transactional(rollbackOn = Exception.class)
+ public String delData(InoutLossOver data) throws Exception {
Session session = this.getSessionFactory().openSession();
try {
if (null != data.getId()) {
- this.delInoutDataByLossOver(data);
+ this.delInoutDataByLossOver(data);
session.delete(data);
}
} catch (Exception e) {
@@ -166,19 +167,70 @@
return null;
}
- private void delInoutDataByLossOver(MLossOver lossOver) {
- InoutParam param = new InoutParam();
- param.setCompanyId(lossOver.getCompanyId());
- param.setId(lossOver.getId());
- param.setProgress(InoutConstant.PROGRESS_RECORD);
- param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
- param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц鍒犻櫎");
- param.setType(lossOver.getType());
- param.setDepotId(lossOver.getDepotId());
- param.setWeight(lossOver.getAmount());
-
-
- inoutService.delInoutDataByLossOver(param);
- }
+ private void delInoutDataByLossOver(InoutLossOver lossOver) {
+ InoutParam param = new InoutParam();
+ param.setCompanyId(lossOver.getCompanyId());
+ param.setId(lossOver.getId());
+ param.setProgress(InoutConstant.PROGRESS_RECORD);
+ param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
+ param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц鍒犻櫎");
+ param.setType(lossOver.getType());
+ param.setDepotId(lossOver.getDepotId());
+ param.setWeight(lossOver.getAmount());
+
+
+ inoutService.delInoutDataByLossOver(param);
+ }
+
+ public List<InoutLossOver> getMaxId(Map<String, Object> param) {
+
+ String hql = "from " + InoutLossOver.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 type) {
+ // 鏃堕棿鎴虫爣绛�
+ String timeKey = DateFormatUtils.format(date, "yyyyMMdd");
+
+ // 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
+ String cacheKey = RedisConst.buildKey(companyId,
+ InoutManageUtil.CACHE_LOSS_OVER_ID);
+
+ String cacheId = (String) redisUtil.get(cacheKey);
+
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
+ String temp = cacheId.substring(cacheId.length() - 3);
+ Integer i = Integer.valueOf(temp);
+ cacheId = timeKey + String.format("%03d", ++i);
+ } else {
+ Map<String, Object> args = new HashMap<>();
+ args.put("timeKey", timeKey + "%");
+ List<InoutLossOver> result = getMaxId(args);
+ if (null == result || result.size() == 0) {
+ cacheId = timeKey + "001";
+ } else {
+ int max = 0;
+ int num;
+ for (InoutLossOver inoutLossOver : result) {
+ num = Integer.parseInt(inoutLossOver.getId().substring(inoutLossOver.getId().length() - 3));
+ max = Math.max(max, num);
+ }
+ cacheId = timeKey + String.format("%03d", ++max);
+ }
+ }
+ // 鏇存柊缂撳瓨
+ redisUtil.set(cacheKey, cacheId);
+
+ return cacheId;
+ }
}
--
Gitblit v1.9.3