From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java
index c3638ca..8959659 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1303.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.CheckType;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.CheckItem;
@@ -14,6 +13,7 @@
import com.ld.igds.sh.param.BaseParam;
import com.ld.igds.sh.service.impl.HApiShServiceImpl;
import com.ld.igds.sh.util.ApiShConst;
+import com.ld.igds.sh.util.ApiShUtil;
import com.ld.igds.sh.util.RespCodeEnum;
import com.ld.igds.sh.util.RespUtil;
import com.ld.igds.util.ContextUtil;
@@ -24,7 +24,10 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 绮鍏ュ簱妫�楠屼俊鎭暟鎹帴鍙�
@@ -55,16 +58,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1303);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -30);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鍏ュ簱鏁版嵁
List<InoutRecord> inoutRecords = hApiShServiceImpl.listInoutRecord(companyId,
- param.getDepotId(), startTime, param.getEndTime(), InoutConstant.TYPE_IN);
+ param.getDepotId(), param.getStartTime(), param.getEndTime(), InoutConstant.TYPE_IN);
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (inoutRecords == null || inoutRecords.isEmpty()) {
@@ -79,7 +85,7 @@
for (InoutRecord inoutRecord : inoutRecords) {
dto = new Dto1303();
dto.setQydbh("14" + inoutRecord.getCheckId().substring(2));
- dto.setHwbm(inoutRecord.getDepotId());
+ dto.setHwbm(ApiShUtil.getGbDepotId(inoutRecord.getDepotId()) + "01");
dto.setYpbm("14" + inoutRecord.getCheckId().substring(2));
dto.setQysj(DateFormatUtils.format(inoutRecord.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss"));
dto.setQyrxm(StringUtils.isEmpty(inoutRecord.getCheckUser())?"0":inoutRecord.getCheckUser());
--
Gitblit v1.9.3