From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
index c67efc9..ac24ecc 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java
@@ -2,21 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
+import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.models.InteStatusLog;
-import com.ld.igds.models.MPlan;
-import com.ld.igds.models.MPlanDetail;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1502;
import com.ld.igds.sh.param.ApiRequest;
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.NumberUtil;
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -24,7 +25,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,24 +59,27 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1502);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// 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<MPlan> planList = hApiShServiceImpl.listPlan(companyId,
- InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
+ List<InoutPlan> planList = hApiShServiceImpl.listPlan(companyId,
+ InoutManageUtil.PLAN_TYPE_3, param.getStartTime(), param.getEndTime());
if (planList == null || planList.isEmpty()) {
return RespUtil.error(RespCodeEnum.CODE_2000.getCode(), request);
}
//鏌ヨ杞崲鏄庣粏璁″垝淇℃伅
- List<MPlanDetail> list0 = new ArrayList<>();
- List<MPlanDetail> dataList;
- for (MPlan plan : planList) {
+ List<InoutPlanDetail> list0 = new ArrayList<>();
+ List<InoutPlanDetail> dataList;
+ for (InoutPlan plan : planList) {
dataList = hApiShServiceImpl.getPlanDetail(plan.getId());
if(null != dataList){
list0.addAll(dataList);
@@ -90,7 +97,7 @@
//鏌ヨ搴撳尯淇℃伅
List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
DefaultDept dept = deptList.get(0);
- for (MPlanDetail planDetail : list0) {
+ for (InoutPlanDetail planDetail : list0) {
dto1502 = new Dto1502();
dto1502.setJhmxbm(planDetail.getId());
@@ -99,15 +106,15 @@
dto1502.setDjbm(StringUtils.isEmpty(planDetail.getFoodLevel())?"0":planDetail.getFoodLevel());
dto1502.setLsxzbm(StringUtils.isEmpty(planDetail.getFoodType())?"0":planDetail.getFoodType());
dto1502.setShnd(StringUtils.isEmpty(planDetail.getYear())?"0":planDetail.getYear());
- dto1502.setLhhwdm(StringUtils.isEmpty(planDetail.getDepotId())?"0":planDetail.getDepotId());
- dto1502.setLhsl(planDetail.getPlanNum()==null?"0.0":planDetail.getPlanNum()+"");
+ dto1502.setLhhwdm(StringUtils.isEmpty(ApiShUtil.getGbDepotId(planDetail.getDepotId()))?"0":ApiShUtil.getGbDepotId(planDetail.getDepotId()));
+ dto1502.setLhsl(planDetail.getPlanNum()==null?"0.0": NumberUtil.keepPrecision(planDetail.getPlanNum(),1)+"");
dto1502.setLhlx(StringUtils.isEmpty(planDetail.getType())?"0":planDetail.getType());
dto1502.setJhkq(dept.getCode());
if("1".equals(planDetail.getType())){
- dto1502.setLcsl(planDetail.getPlanNum() + "");
+ dto1502.setLcsl(NumberUtil.keepPrecision(planDetail.getPlanNum(),1) + "");
}
if("2".equals(planDetail.getType())){
- dto1502.setLrsl(planDetail.getPlanNum() + "");
+ dto1502.setLrsl(NumberUtil.keepPrecision(planDetail.getPlanNum(),1) + "");
}
dto1502.setZznm(dept.getCode());
--
Gitblit v1.9.3