From 8362727b6801e911782c8778c018bb2aba96aa16 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 30 Jul 2024 10:18:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ReportDeliverServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index f89cb9d44..68975e322 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -332,8 +332,13 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public void exportDetails(HttpServletResponse response, ReportDetailVO vo, DevilerDetailsQuery query) { // 添加时间校验 - if (ReportUtil.areAllPropertiesEmpty(vo)) { - ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期"); + if(ReportUtil.areAllPropertiesEmpty(vo)){ + if (ObjectUtil.isNotEmpty(query.getStartTaskTime()) && ObjectUtil.isNotEmpty(query.getEndTaskTime())) { + ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期"); + } + if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){ + ReportUtil.dateIsWithinOneMonth(null, query.getStartTaskTime(), query.getEndTaskTime(), "签收日期"); + } } QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); detailsCustomQuery(query, queryWrapper); From 9071d150b0916ae61902d552ea1bcb00c5b95c3f Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Tue, 30 Jul 2024 10:28:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/report/service/impl/ReportDeliverServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index 68975e322..aeb28c923 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -255,7 +255,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期"); } if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){ - ReportUtil.dateIsWithinOneMonth(null, query.getStartTaskTime(), query.getEndTaskTime(), "签收日期"); + ReportUtil.dateIsWithinOneMonth(null, query.getStartSjsigningTime(), query.getEndSjsigningTime(), "签收日期"); } } Integer current = query.getCurrent(); @@ -337,7 +337,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { ReportUtil.dateIsWithinOneMonth(vo.getTaskTime(), query.getStartTaskTime(), query.getEndTaskTime(), "配送日期"); } if(ObjectUtil.isNotEmpty(query.getStartSjsigningTime()) && ObjectUtil.isNotEmpty(query.getEndSjsigningTime())){ - ReportUtil.dateIsWithinOneMonth(null, query.getStartTaskTime(), query.getEndTaskTime(), "签收日期"); + ReportUtil.dateIsWithinOneMonth(null, query.getStartSjsigningTime(), query.getEndSjsigningTime(), "签收日期"); } } QueryWrapper queryWrapper = QueryUtil.buildQueryWrapper(vo, ReportDetailVO.class); From 3ec282b8b0f8dbccc17176d64148dd0ea8dc86d4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Tue, 30 Jul 2024 11:07:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=95=86=E5=9C=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/warehouse/service/impl/TaskQuestServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index d27b7d03a..e683751f0 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -2988,10 +2988,12 @@ public class TaskQuestServiceImpl extends BaseServiceImpl extracted(Long questId, QuestDetailEntity questDetail) { - List taskQuestChildVOS = bladeRedis.get(RedisKeyConstant.TASK_QUEST_CHILD_KEY); + List taskQuestChildVOS = bladeRedis.get(RedisKeyConstant.TASK_QUEST_CHILD_KEY+questId); if (taskQuestChildVOS == null) { taskQuestChildVOS = taskQuestChildService.selectlistByMasterId(questId); - bladeRedis.setEx(RedisKeyConstant.TASK_QUEST_CHILD_KEY, taskQuestChildVOS, 1000L); + if(taskQuestChildVOS!=null){ + bladeRedis.setEx(RedisKeyConstant.TASK_QUEST_CHILD_KEY+questId, taskQuestChildVOS, 1000L); + } } From d487f3e2425305ec146f4baf0fdc1a768088f0f0 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 30 Jul 2024 11:23:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/logpm/oldproject/feign/SignPushClient.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java index d48ab6818..8dccde415 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/SignPushClient.java @@ -45,6 +45,10 @@ public class SignPushClient implements IOldSignPushClient { JSONObject res = JSON.parseObject(body); if ("200".equals(res.getString("code"))) { result= true; + }else { + String msg = res.getString("msg"); + log.info(">>>> pushOldSystemSignInfo response msg:{}",msg); + log.info(">>>> pushOldSystemSignInfo 推送配送ID signPushDataDTO ID:{}",signPushDataDTO.getId()); } } log.info(">>>> pushOldSystemSignInfo response url:{} body:{}",url,body); From bc244039b6a0f0134369a899ad4d2cc7c45c3a6b Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 30 Jul 2024 11:33:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/trunkline/vo/OrderDetailInfoVO.java | 1 + .../java/com/logpm/trunkline/dto/OrderDetailsDTO.java | 3 +++ .../trunkline/mapper/TrunklineAdvanceDetailMapper.xml | 9 ++++++++- .../service/impl/TrunklineCarsLoadServiceImpl.java | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java index 152d0eaed..d7188c86e 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/OrderDetailInfoVO.java @@ -41,5 +41,6 @@ public class OrderDetailInfoVO implements Serializable { private String importWarehouseName; private String createUserName; private Date createTime; + private Date incomingTime; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java index e3c7b15f8..66ff84b04 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderDetailsDTO.java @@ -40,4 +40,7 @@ public class OrderDetailsDTO implements Serializable { private String createTimeEndStr;//创建时间 private Date createTimeEnd;//创建时间 + private Date incomingTimeStart;//入库时间开始 + private Date incomingTimeEnd;//入库时间结束 + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index fe03d5247..c61955c18 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -254,7 +254,8 @@ ldl.signing_time deliverySignTime, ltad.warehouse_name importWarehouseName, lta.create_user_name createUserName, - lta.create_time createTime + lta.create_time createTime, + ltad.incoming_time incomingTime from logpm_trunkline_advance_detail ltad left join logpm_trunkline_advance lta on lta.id = ltad.advance_id left join logpm_distribution_parcel_list ldpl on ldpl.order_package_code = ltad.order_package_code and ldpl.warehouse_id = ltad.now_warehouse_id @@ -322,6 +323,12 @@ and ltad.create_time <= #{param.createTimeEnd} + + and ltad.incoming_time >= #{param.incomingTimeStart} + + + and ltad.incoming_time <= #{param.incomingTimeEnd} + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index ae0461c3f..57822b175 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -76,6 +76,8 @@ import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; +import static cn.hutool.poi.excel.sax.AttributeName.s; + @Slf4j @Service @AllArgsConstructor @@ -1749,7 +1751,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl