diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java index b052ab501..5fa8ea7d6 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/CarsLoadAllOrderVO.java @@ -13,6 +13,8 @@ public class CarsLoadAllOrderVO implements Serializable { private String orderCode;//订单号 private Long waybillId;//运单id private String waybillNo;//运单号 + private Long nodeId;//计划仓库id + private String nodeName;//计划仓库 private Date createTime;//创建时间 private String destination;//到站 private String departureWarehouseName;//目的仓 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java index bdff57ce6..df28b8af0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.feign; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -40,9 +41,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * 配送在库订单 Feign实现类 @@ -338,11 +337,17 @@ public class DistributionStockArticleClient implements IDistributionStockArticle @Override public List findListByOrderCodesAndWarehouseId(FindParamterDTO findParamterDTO) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("order_code",findParamterDTO.getOrderCodeSet()) - .eq("warehouse_id",findParamterDTO.getWarehouseId()); + Set orderCodeSet = findParamterDTO.getOrderCodeSet(); + log.info("###################findListByOrderCodesAndWarehouseId: 当前处理的数据为 {}",orderCodeSet); + if(CollUtil.isEmpty(orderCodeSet)){ + return Collections.emptyList(); + }else{ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("order_code",orderCodeSet) + .eq("warehouse_id",findParamterDTO.getWarehouseId()); - return distributionStockArticleService.list(queryWrapper); + return distributionStockArticleService.list(queryWrapper); + } } @Override diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml index f8e8ffe2d..d68f2c95a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml @@ -41,7 +41,7 @@ lww.consignee_address consigneeAddress, lww.remark remark, lww.total_count-lww.billlading_num totalPlanNum, - ltbw.plan_num planNum, + lww.total_count-lww.billlading_num planNum, ltbw.real_num realNum, ltbw.billlading_fee billladingFee, lww.collect_pay collectPay, 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 115e43d43..d20c0095a 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 @@ -313,6 +313,8 @@ ltco.order_code orderCode, ltco.waybill_id waybillId, ltco.waybill_no waybillNo, + ltco.node_id nodeId, + ltco.node_name nodeName, lww.create_time createTime, lww.destination destination, lww.destination_warehouse_name destinationWarehouseName, @@ -334,13 +336,12 @@ where ltco.load_id = #{param.loadId} and ltco.final_node_id = #{param.finalNodeId} and ldpl.is_deleted = 0 - - and ldpl.warehouse_id = #{param.warehouseId} - group by ltco.id, ltco.order_code, ltco.waybill_id, ltco.waybill_no, + ltco.node_id, + ltco.node_name, lww.create_time, lww.destination, lww.destination_warehouse_name, diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index dbd52e69a..dd001f79a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -228,7 +228,7 @@ public class InComingServiceImpl implements IInComingService { return Resp.scanFail(405, "包件无数据", "包件无数据"); } - if(incomingType == 1 && incomingType == 2){ + if(incomingType == 1 || incomingType == 2){ for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : advanceDetailEntityList) { Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId(); if(!warehouseId1.equals(warehouseId)){ 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 ff3bb5579..1942aaa66 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 @@ -6694,6 +6694,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl