From 08000305684ec0c758090fbb5cbd85132218fcef Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 0b5efca..2ece18d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -13,6 +13,7 @@
import com.ld.igds.inout.mapper.InoutCheckMapper;
import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.InoutLossOver;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
@@ -205,9 +206,11 @@
}
inoutMapper.updateDataByHandle(newData);
+ InoutParam param = new InoutParam();
+ param.setId(newData.getId());
//鏇存柊缂撳瓨
- updateInoutCache(newData);
+ updateInoutCache(inoutMapper.inoutQueryById(param));
return null;
}
@@ -292,7 +295,7 @@
}
// 娓呴櫎缂撳瓨
- this.delFromCache(param.getDeptId(), param.getType(), param.getId());
+// this.delFromCache(param.getDeptId(), param.getType(), param.getId());
inoutMapper.toComplete(param);
@@ -313,6 +316,9 @@
}
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
+ }
+ if (null == data.getFullWeightTime()) {
+ data.setFullWeightTime(new Date());
}
//璋冩暣鏃堕棿宸�
@@ -657,7 +663,7 @@
data.setCompanyId(ContextUtil.getCompanyId());
}
if (StringUtils.isEmpty(data.getDeptId())) {
- data.setCompanyId(ContextUtil.subDeptId(null));
+ data.setDeptId(ContextUtil.subDeptId(null));
}
inoutCheckMapper.updateSampleData(data);
@@ -712,4 +718,32 @@
}
return inoutCheckMapper.getPrice(param);
}
+
+ @Override
+ public InoutCheckData inoutDataByCheckId(InoutCheckParam param) throws Exception {
+ List<InoutCheckData> list = inoutCheckMapper.inoutDataByCheckId(param);
+ if (null == list || list.size() == 0)
+ return null;
+ if (list.size() == 1) {
+ return list.get(0);
+ } else {
+ throw new Exception("褰撳墠鏉′欢涓嬪瓨鍦ㄥ涓弧瓒虫潯浠剁殑鏁版嵁锛岃鏍告煡锛侊紒");
+ }
+ }
+
+ @Override
+ public List<InoutLossOver> listLossOver(InoutParam param) {
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ List<InoutLossOver> list = inoutMapper.listLossOver(param);
+
+ return list;
+ }
+
+ @Override
+ public double sumLossOverWeight(InoutParam param) {
+ CommonData result = inoutMapper.sumLossOverWeight(param);
+ return result.getNumValue1();
+ }
}
--
Gitblit v1.9.3