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/ApiShServiceImpl1312.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
index 4c49d9c..6cf14c2 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1312.java
@@ -1,7 +1,6 @@
package com.ld.igds.sh.service;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.InoutVarietyChange;
import com.ld.igds.models.InteStatusLog;
@@ -11,20 +10,20 @@
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;
import com.ld.igds.util.RedisUtil;
-
import lombok.extern.slf4j.Slf4j;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
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 +54,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1312);
- 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<InoutVarietyChange> dataList = hApiShServiceImpl.listFoodVarietyChange(companyId,
- param.getDepotId(), startTime, param.getEndTime());
+ param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (dataList == null || dataList.isEmpty()) {
@@ -79,7 +81,7 @@
for (InoutVarietyChange variety : dataList) {
dto1312 = new Dto1312();
dto1312.setXzzbdbh(variety.getId());
- dto1312.setHwbm(variety.getDepotId());
+ dto1312.setHwbm(ApiShUtil.getGbDepotId(variety.getDepotId()) + "01");
dto1312.setLssl(String.valueOf(variety.getNumber()));
dto1312.setHzsl(String.valueOf(variety.getChangeNumber()));
dto1312.setBzwh(StringUtils.isEmpty(variety.getApprovalId())?"0":variety.getApprovalId());
--
Gitblit v1.9.3