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/ApiShServiceImpl1301.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
index c9b9a31..d45f4c0 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1301.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.FoodVariety;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.models.Building;
import com.ld.igds.models.InoutNoticeOut;
@@ -13,6 +12,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;
@@ -23,7 +23,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;
/**
* 绮鍑哄簱閫氱煡鍗曟暟鎹帴鍙�
@@ -54,15 +57,18 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1301);
- 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<InoutNoticeOut> noticeOutList = hApiShServiceImpl.listNoticeOut(companyId, param.getDepotId(), startTime, param.getEndTime());
+ List<InoutNoticeOut> noticeOutList = hApiShServiceImpl.listNoticeOut(companyId, param.getDepotId(), param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if (noticeOutList == null || noticeOutList.isEmpty()) {
@@ -77,16 +83,16 @@
//灏佽鏁版嵁淇℃伅
for (InoutNoticeOut noticeOut : noticeOutList) {
dto = new Dto1301();
- dto.setZznm(noticeOut.getDepotId().substring(0, 21));
+ dto.setZznm(ApiShUtil.getGbDepotId(noticeOut.getDepotId()).substring(0, 21));
dto.setTzdbh(noticeOut.getId());
dto.setTzdnm(noticeOut.getId());
dto.setKhmc(StringUtils.isEmpty(noticeOut.getCustomerName())?"0":noticeOut.getCustomerName());
dto.setKhnm(StringUtils.isEmpty(noticeOut.getCustomerId())?"0":noticeOut.getCustomerId());
dto.setWlnm(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
- dto.setWlmc(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":FoodVariety.getMsg(noticeOut.getFoodVariety()));
+ dto.setWlmc(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0": FoodVariety.getMsg(noticeOut.getFoodVariety()));
dto.setWlbh(StringUtils.isEmpty(noticeOut.getFoodVariety())?"0":noticeOut.getFoodVariety());
- // dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel()); TODO
- building = hApiShServiceImpl.getBuilding(companyId, noticeOut.getDepotId().substring(0, 25));
+// dto.setWldjnm(StringUtils.isEmpty(noticeOut.getFoodLevel())?"0":noticeOut.getFoodLevel());
+ building = hApiShServiceImpl.getBuilding(companyId, noticeOut.getDepotId());
if (null != building) {
dto.setCfbh(building.getId());
dto.setCfnm(building.getId());
@@ -94,8 +100,8 @@
dto.setCfbh("0");
dto.setCfnm("0");
}
- dto.setHwbh(noticeOut.getDepotId());
- dto.setHwnm(noticeOut.getDepotId());
+ dto.setHwbh(ApiShUtil.getGbDepotId(noticeOut.getDepotId()) + "01");
+ dto.setHwnm(ApiShUtil.getGbDepotId(noticeOut.getDepotId()) + "01");
dto.setTzdsl(String.valueOf(noticeOut.getTargetNumber()));
dto.setYwrq(DateFormatUtils.format(noticeOut.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
if("NONE".equals(noticeOut.getCompleteStatus())){
--
Gitblit v1.9.3