From 3631219246be48aec1e745e94e5b28ff4e8799c8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 20 十月 2023 19:35:54 +0800
Subject: [PATCH] 调整上海原版接口
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 1498368..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;
@@ -20,7 +21,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.xmlbeans.impl.tool.Extension;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@@ -316,6 +316,9 @@
}
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
+ }
+ if (null == data.getFullWeightTime()) {
+ data.setFullWeightTime(new Date());
}
//璋冩暣鏃堕棿宸�
@@ -660,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);
@@ -727,4 +730,20 @@
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