From c09ce992101f0c9eaae165389a7638566ac566a9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 19 六月 2023 22:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 e5e34a6..66ea5e9 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
@@ -18,6 +18,7 @@
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.models.Depot;
+import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.util.RedisUtil;
@@ -194,6 +195,7 @@
@Override
public String updateDataByHandle(InoutData data) {
data.setUpdateTime(new Date());
+
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -786,4 +788,14 @@
return null;
}
+ @Override
+ public List<InoutPrice> getPrice(InoutCheckParam param) {
+ if(null == param.getStart()){
+ param.setStart(new Date());
+ }
+ if(null == param.getEnd()){
+ param.setEnd(new Date());
+ }
+ return inoutCheckMapper.getPrice(param);
+ }
}
--
Gitblit v1.9.3