From 585e878b169bdeb2bc8cc452b9d2e640d00caa6d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 04 七月 2023 09:00:35 +0800
Subject: [PATCH] 质检报告
---
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
index 62c12a4..f086af0 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -2,20 +2,25 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.models.MStockChange;
+import com.ld.igds.models.InoutStockChange;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
+
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
public class HMAtockChangeService extends HibernateDao {
- public void pageData(Page<MStockChange> page, Map<String, Object> param)
+ public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + MStockChange.class.getName()
+ String hql = " from " + InoutStockChange.class.getName()
+ " where companyId=:companyId";
Map<String, Object> args = new HashMap<String, Object>();
@@ -25,8 +30,9 @@
String str = (String) param.get("depotId");
if (StringUtils.isNotEmpty(str)) {
- hql += " and depotId =:depotId";
- args.put("depotId", str);
+ hql += " and depotIdIn =:depotIdIn or depotIdOut =:depotIdOut";
+ args.put("depotIdIn", str);
+ args.put("depotIdOut", str);
}
}
@@ -36,7 +42,7 @@
}
- public void saveData(MStockChange data) {
+ public void saveData(InoutStockChange data) {
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -47,10 +53,24 @@
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getCzbz()) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("dateTime", data.getChangeDate());
+ List<InoutStockChange> list = queryAll(param);
+ int max = 0;
+ if (list.size() != 0) {
+ int num;
+ for (InoutStockChange stockChange : list) {
+ num = Integer.parseInt(stockChange.getId().substring(stockChange.getId().length() - 4));
+ max = Math.max(max, num);
+ }
+ }
+ String date = DateFormatUtils.format(new Date(), "yyyyMMdd");
+ data.setId(date + String.format("%04d", max + 1));
+ data.setCzbz("i");
session.save(data);
} else {
+ data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
@@ -60,7 +80,8 @@
session.close();
}
}
- public String delData(MStockChange data) {
+
+ public String delData(InoutStockChange data) {
Session session = this.getSessionFactory().openSession();
try {
if (null != data.getId()) {
@@ -74,4 +95,20 @@
}
return null;
}
+
+
+ public List<InoutStockChange> queryAll(Map<String, Object> param) {
+
+ String hql = "from " + InoutStockChange.class.getName() + " where 1 = 1 ";
+ Map<String, Object> args = new HashMap<String, Object>();
+ Date date = (Date) param.get("dateTime");
+ if (null != date) {
+ hql += " and updateTime >= :startTime and updateTime < :endTime";
+ args.put("startTime", DateUtil.getCurZero(date));
+ args.put("endTime", DateUtil.getNextZero(date));
+ }
+ hql += " order by updateTime desc limit 20";
+ return this.query(hql, args);
+ }
+
}
--
Gitblit v1.9.3