From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 117 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 62 insertions(+), 55 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..0b3adf1 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
@@ -4,10 +4,12 @@
import java.util.HashMap;
import java.util.Map;
import javax.transaction.Transactional;
+
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.models.InoutLossOver;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -18,7 +20,6 @@
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
@@ -27,9 +28,9 @@
@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,12 +72,18 @@
}
@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());
+
+ InoutParam param = new InoutParam();
+ param.setCompanyId(ContextUtil.getCompanyId());
+ param.setDepotId(data.getDepotId());
+ param.setProgress(InoutConstant.PROGRESS_RECORD);
+
+ InoutData inoutData = inoutService.getLastRecord(param);
if (null != inoutData && null != inoutData.getCompleteTime() &&
data.getSubmitTime().before(inoutData.getCompleteTime())) {
@@ -94,9 +101,9 @@
//鑾峰彇鎻愪氦鏃堕棿鏃ユ湡鐨�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);
}
@@ -116,45 +123,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 +173,19 @@
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);
+ }
}
--
Gitblit v1.9.3