From ddbb7c7814bdb9cd57eba8f6e5b032c9be9cd276 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 26 Jun 2024 11:18:02 +0800 Subject: [PATCH 01/19] =?UTF-8?q?1.=E8=80=81=E7=B3=BB=E7=BB=9F=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BD=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/oldproject/mapper/AdvanceDetailMapper.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index 6336a87c1..6ec6e34e2 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -122,9 +122,6 @@ @@ -171,9 +165,6 @@ SELECT 3 AS type, - count( 1 ) + count( 1 ) AS totalNum FROM logpm_distrilbution_bill_lading @@ -246,7 +246,7 @@ AND is_deleted = 0 AND delivery_type = #{type} - AND warehouse IN + AND warehouse_id IN #{item} @@ -268,7 +268,7 @@ AND ldrp.packet_bar_status != 2 AND ldr.delivery_type = #{type} - AND ldr.warehouse IN + AND ldr.warehouse_id IN #{item} @@ -289,7 +289,7 @@ AND ldrp.packet_bar_status != 2 AND ldr.delivery_type = #{type} - AND ldr.warehouse IN + AND ldr.warehouse_id IN #{item} @@ -311,7 +311,7 @@ AND ldl.is_deleted = 0 AND ldr.delivery_type = #{type} - AND ldr.warehouse IN + AND ldr.warehouse_id IN #{item} @@ -329,7 +329,7 @@ AND ldbp.is_deleted = 0 AND ldbl.is_deleted = 0 - AND ldbl.warehouse IN + AND ldbl.warehouse_id IN #{item} @@ -348,7 +348,7 @@ AND ldbp.is_deleted = 0 AND ldbl.is_deleted = 0 - AND ldbl.warehouse IN + AND ldbl.warehouse_id IN #{item} @@ -367,7 +367,7 @@ AND ldbp.is_deleted = 0 AND ldbl.is_deleted = 0 - AND ldbl.warehouse IN + AND ldbl.warehouse_id IN #{item} @@ -454,5 +454,214 @@ + + + + + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java index 1cc196c31..572692c59 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/IWarehouseIndexService.java @@ -3,6 +3,7 @@ package com.logpm.report.service; import com.logpm.report.dto.IndexDTO; import com.logpm.report.vo.*; import com.logpm.report.vo.indexCount.IndexDeliveryDataVO; +import com.logpm.report.vo.indexCount.IndexSignforDataVO; import java.util.List; @@ -27,4 +28,11 @@ public interface IWarehouseIndexService { * @return */ List deliveryData(IndexDTO indexDTO); + + /** + * 查询当前签收率 + * @param indexDTO + * @return + */ + List signforData(IndexDTO indexDTO); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index f6e772f41..f0f63b4e0 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -6,6 +6,7 @@ import com.logpm.report.mapper.WarehouseIndexMapper; import com.logpm.report.service.IWarehouseIndexService; import com.logpm.report.vo.*; import com.logpm.report.vo.indexCount.IndexDeliveryDataVO; +import com.logpm.report.vo.indexCount.IndexSignforDataVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DistributionTypeConstant; @@ -14,6 +15,7 @@ import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; @Slf4j @@ -278,18 +280,61 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { //查询外协信息 IndexDeliveryDataVO indexTripartiteDeliveryDataVO = warehouseIndexMapper.findTripartiteTotal(indexDTO); if (Func.isNotEmpty(indexTripartiteDeliveryDataVO)) { - //查询自提总件数 + //查询外协总件数 Integer tripartiteTotalNum = warehouseIndexMapper.findTripartiteTotalNum(indexDTO); - indexDeliveryDataVO.setTotalDeliveryNum(tripartiteTotalNum); - //查询总重量 + indexTripartiteDeliveryDataVO.setTotalDeliveryNum(tripartiteTotalNum); + //查询外协总重量 BigDecimal tripartiteTotalWeight = warehouseIndexMapper.findTripartiteTotalWeight(indexDTO); - indexDeliveryDataVO.setTotalWeight(tripartiteTotalWeight); - //查询总包件体积 + indexTripartiteDeliveryDataVO.setTotalWeight(tripartiteTotalWeight); + //查询外协总包件体积 BigDecimal tripartiteTotalVolume = warehouseIndexMapper.findTripartiteTotalVolume(indexDTO); - indexDeliveryDataVO.setTotalVolume(tripartiteTotalVolume); - indexDeliveryDataVOList.add(indexDeliveryDataVO); + indexTripartiteDeliveryDataVO.setTotalVolume(tripartiteTotalVolume); + indexDeliveryDataVOList.add(indexTripartiteDeliveryDataVO); } - return indexDeliveryDataVOList; } + + @Override + public List signforData(IndexDTO indexDTO) { + List list = new ArrayList<>(); + Date date = new Date(); + SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd"); + String day = dayFormat.format(date); + indexDTO.setDayStr(day); + IndexSignforDataVO indexSignforDayDataVO = new IndexSignforDataVO(); + indexSignforDayDataVO.setType(1); + //查询当天签收数据 + Integer daySignforNum = warehouseIndexMapper.findSignforDataByDay(indexDTO); + indexSignforDayDataVO.setSignNum(daySignforNum); + //查询当天未签收件数 + Integer dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO); + indexSignforDayDataVO.setUnSignNum(dayUnSignforNum); + //计算签收率 + Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100); + indexSignforDayDataVO.setSignScale(daySignforScale); + //查询当天文员复核数 + Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO); + //查询当天计划数 + Integer planByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); + //计算文员签收率 + + + indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); + list.add(indexSignforDayDataVO); + IndexSignforDataVO indexSignforMonthDataVO = new IndexSignforDataVO(); + indexSignforMonthDataVO.setType(2); + //查询当月签收数据 + Integer monthSignforNum = warehouseIndexMapper.findSignforDataByMonth(indexDTO); + indexSignforMonthDataVO.setSignNum(monthSignforNum); + //查询当月未签收数据 + Integer monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO); + indexSignforMonthDataVO.setUnSignNum(monthUnSignforNum); + //计算签收率 + Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum) * 100); + indexSignforMonthDataVO.setSignScale(monthSignforScale); + //查询当月文员复核数 + Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO); + indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum); + return list; + } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java index 5cf163b59..e061fc72a 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexDeliveryDataVO.java @@ -11,8 +11,8 @@ public class IndexDeliveryDataVO implements Serializable { private String type ; private Integer totalNum = 0; private Integer totalDeliveryNum = 0; - private BigDecimal totalWeight ; - private BigDecimal totalVolume ; + private BigDecimal totalWeight = BigDecimal.ZERO; + private BigDecimal totalVolume = BigDecimal.ZERO; private Integer totalRoadNum = 0; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java new file mode 100644 index 000000000..824d123b0 --- /dev/null +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java @@ -0,0 +1,27 @@ +package com.logpm.report.vo.indexCount; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class IndexSignforDataVO implements Serializable { + + + private Integer type; + + private Integer signNum; + + private Integer UnSignNum; + + + private Double signScale; + + private Integer clerkSignNum; + + + + + +} From a5fec39a5621a5f39de915d985fd5152b38d24a1 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 26 Jun 2024 16:56:46 +0800 Subject: [PATCH 12/19] =?UTF-8?q?1.=E5=BA=93=E5=86=85bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TrayScanDesServiceImpl.java | 3 ++- .../trunkline/mapper/TrunklineCarsLoadMapper.xml | 15 +++++++++------ .../mapper/TrunklineCarsLoadScanMapper.xml | 3 +-- .../service/impl/CarsLoadAsyncServiceImpl.java | 2 +- .../feign/WarehouseWaybillDetailClient.java | 2 +- .../service/IWarehouseWayBillDetailService.java | 7 ++----- .../impl/WarehouseTrayTypeServiceImpl.java | 2 +- .../impl/WarehouseUpdownTypeServiceImpl.java | 2 +- .../impl/WarehouseWayBillDetailServiceImpl.java | 12 ++---------- 9 files changed, 20 insertions(+), 28 deletions(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java index b93d58c11..fa23d777f 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/TrayScanDesServiceImpl.java @@ -53,7 +53,8 @@ public class TrayScanDesServiceImpl implements ITrayScanDesService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("now_warehouse_id",oldWarehouseId) .eq("type",1) - .eq("tray_id",trayId); + .eq("tray_id",trayId) + .eq("delete_time",0); return trayScanDesMapper.selectList(queryWrapper); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index bb33832da..e6cccdb71 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -494,15 +494,18 @@ select ltco.id carsOrderId, ltco.waybill_no waybillNo, ltco.order_code orderCode, + lww.create_time createTime, + lww.destination destination, + lww.destination_warehouse_name destinationWarehouseName, + lww.shipper shipper, + lww.consignee consignee, + lww.goods_name goodsName, ltco.plan_num planNum, ltco.real_num realNum, ltco.type type, - ldsa.mall_name consignee, - ldsa.consignee_person consigneeName, - ldsa.consignee_mobile consigneeMobile, - ldsa.consignee_address consigneeAddress, - lww.departure_warehouse_name departureWarehouseName, - lww.destination_warehouse_name destinationWarehouseName + lww.total_freight freight, + lww.remark remark, + lww.total_freight/lww.total_count*ltco.real_num price from logpm_trunkline_cars_order ltco left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code left join logpm_warehouse_waybill lww on lww.waybill_no = ltco.waybill_no diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index add4f0cc9..66ee70422 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -398,7 +398,6 @@ left join logpm_warehouse_waybill lww on ltcls.waybill_no = lww.waybill_no where ltcls.load_id = #{loadId} and ltcls.warehouse_id = #{warehouseId} - and ltcls.warehouse_id != ltcls.unload_node_id group by ltcls.order_code, ltcls.waybill_no, ltcls.type, @@ -706,7 +705,7 @@ + + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index f0f63b4e0..2d541253f 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -251,10 +251,10 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { Integer deLiveryTotalNum = warehouseIndexMapper.findDeLiveryTotalNum(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalDeliveryNum(deLiveryTotalNum); //查询总重量 - BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO,indexDeliveryDataVO.getType()); + BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalWeight(totalWeight); //查询总包件体积 - BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO,indexDeliveryDataVO.getType()); + BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalVolume(totalVolume); //查询在途件数 Integer totalRoadNum = warehouseIndexMapper.findDeLiveryTotalRoadNum(indexDTO, indexDeliveryDataVO.getType()); @@ -314,9 +314,15 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { indexSignforDayDataVO.setSignScale(daySignforScale); //查询当天文员复核数 Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO); + indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); //查询当天计划数 - Integer planByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); + Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); //计算文员签收率 + Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum)); + indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale); + //文员超时复核数 + Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO); +// indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum); indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); @@ -335,6 +341,15 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { //查询当月文员复核数 Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO); indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum); + Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO); + Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum)); + indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale); + //查询当月文员复核 + Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO); + indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum); + Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday); + indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale); + list.add(indexSignforMonthDataVO); return list; } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java index 824d123b0..0b606fd4b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java @@ -8,16 +8,23 @@ import java.math.BigDecimal; @Data public class IndexSignforDataVO implements Serializable { - + //类型 private Integer type; - + //签收数 private Integer signNum; - + //未签收数 private Integer UnSignNum; + //文员超时为复核数 + private Integer clerkOverTimeSignfoNum; + //文员超时为复核数 + private Double clerkOverTimeScale; + //签收率 private Double signScale; - + //复核率 + private Double ClerkSignforScale; + //复核数 private Integer clerkSignNum; From ed0579f1afa35f4d849095bb60c21e23d1a9379a Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 26 Jun 2024 17:53:06 +0800 Subject: [PATCH 16/19] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factory/jobhandler/MengTianPushDataJob.java | 2 +- .../java/com/logpm/factory/mt/mapper/MtPushDataMapper.java | 2 ++ .../java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java index b1de43b3b..24fd8ea54 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java @@ -102,7 +102,7 @@ public class MengTianPushDataJob { map.put("messageData", entries); log.info("梦天手动回推签收扫描数据：{}", JSONUtil.toJsonStr(map)); rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map); - mtPushDataMapper.customPushNodeDataSended(js.getStr("sendTaskId"), 1); + mtPushDataMapper.customPushNodeDataSendedScan(js.getStr("unitNo"), 1); return ReturnT.SUCCESS; } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java index 9db326954..9dc90ce0a 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java @@ -16,4 +16,6 @@ public interface MtPushDataMapper extends BaseMapper { List customPushNodeDataImage(String sendTaskId); void customPushNodeDataSended(@Param("sendTaskId") String sendTaskId, @Param("pushType") int pushType); + + void customPushNodeDataSendedScan(@Param("unitNo") String unitNo, @Param("pushType") int pushType); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml index cf85318da..55ffafb3c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml @@ -43,4 +43,10 @@ set sendStatus = 1 where sendTaskId = #{sendTaskId} and push_type = #{pushType} + + + update mt_custom_push_data_package + set sendStatus = 1 + where unitNo = #{unitNo} and push_type = #{pushType} + From cbf2712138c9118252659c1bd5ced59f9b0c6d89 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 26 Jun 2024 18:01:54 +0800 Subject: [PATCH 17/19] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/factory/jobhandler/MengTianPushDataJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java index 24fd8ea54..a81d7bfe6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java @@ -99,7 +99,7 @@ public class MengTianPushDataJob { entries.set("distributionContactId", js.getStr("sendTaskId")); entries.set("destinationWarehouse", js.getStr("warehouse")); Map map = new HashMap<>(); - map.put("messageData", entries); + map.put("messageData", JSONUtil.toJsonStr(map)); log.info("梦天手动回推签收扫描数据：{}", JSONUtil.toJsonStr(map)); rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map); mtPushDataMapper.customPushNodeDataSendedScan(js.getStr("unitNo"), 1); From 0f5af12c13567594030cdd9a4b06a97cef1a9813 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 26 Jun 2024 18:12:05 +0800 Subject: [PATCH 18/19] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=A2=A6?= =?UTF-8?q?=E5=A4=A9=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8F=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/factory/jobhandler/MengTianPushDataJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java index a81d7bfe6..2a70d26cb 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java @@ -99,7 +99,7 @@ public class MengTianPushDataJob { entries.set("distributionContactId", js.getStr("sendTaskId")); entries.set("destinationWarehouse", js.getStr("warehouse")); Map map = new HashMap<>(); - map.put("messageData", JSONUtil.toJsonStr(map)); + map.put("messageData", JSONUtil.toJsonStr(entries)); log.info("梦天手动回推签收扫描数据：{}", JSONUtil.toJsonStr(map)); rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map); mtPushDataMapper.customPushNodeDataSendedScan(js.getStr("unitNo"), 1); From 13572bca5666516acd7cfc45033eabe623b33c57 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 26 Jun 2024 18:17:32 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/mapper/WarehouseIndexMapper.xml | 68 +++---------------- .../impl/WarehouseIndexServiceImpl.java | 46 ++++++++++--- 2 files changed, 43 insertions(+), 71 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml index 78495c4e1..5590e8953 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml @@ -493,7 +493,7 @@