diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java index c6b909d3a..28474dd13 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklinePackageTrackLogClient.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -16,6 +17,6 @@ public interface ITrunklinePackageTrackLogClient { String API_PREFIX = "trunklinePackageTrackLog/client"; @PostMapping(API_PREFIX+"/addBatchPackageTrackLog") - void addPackageTrackLog(@RequestParam List addPackageTrackLogList, @RequestParam List orderPackageCodes, @RequestParam Integer workNode); + void addPackageTrackLog(@RequestBody List addPackageTrackLogList); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 2b0bba50b..3661ec226 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -49,11 +49,11 @@ import com.logpm.distribution.vo.app.DistributionAppParcelListVO; import com.logpm.distribution.vo.app.DistributionAppReservationVO; import com.logpm.distribution.vo.print.PrintPreviewVO; import com.logpm.distribution.wrapper.*; -import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.factorydata.enums.BrandEnums; import com.logpm.factorydata.util.FactoryDataMessageSender; import com.logpm.factorydata.vo.NodePushMsg; import com.logpm.factorydata.vo.PushData; +import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.*; @@ -85,7 +85,6 @@ import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.exception.CustomerException; import org.springblade.common.serviceConstant.ServiceConstant; -import org.springblade.common.utils.CommonUtil; import org.springblade.common.utils.QRCodeUtil; import org.springblade.common.utils.StringSplitUtil; import org.springblade.common.utils.TemplateUtil; @@ -1054,7 +1053,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl>>>> 签收异常报错", e); @@ -3452,7 +3452,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl addPackageTrackLogList, List orderPackageCodes, Integer workNode) { + public void addPackageTrackLog(List addPackageTrackLogList) { List ls = new ArrayList<>(); + List orderPackageCodes = new ArrayList<>(); + final Integer[] workNode = {null}; + addPackageTrackLogList.forEach(jsonObject -> { WarehousePackageTrackLogEntity warehousePackageTrackLogEntity = jsonObject.toJavaObject(WarehousePackageTrackLogEntity.class); + orderPackageCodes.add(warehousePackageTrackLogEntity.getOrderPackageCode()); + if (Objects.isNull(workNode[0])){ + workNode[0] = warehousePackageTrackLogEntity.getWorkNode(); + } ls.add(warehousePackageTrackLogEntity); }); - packageTrackLogAsyncService.addBatchPackageTrackLog(ls, orderPackageCodes, workNode); + packageTrackLogAsyncService.addBatchPackageTrackLog(ls, orderPackageCodes, workNode[0]); } } 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 c4181984a..5d4cd0ad3 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 @@ -34,6 +34,7 @@ import com.logpm.factorydata.vo.PushData; import com.logpm.trunkline.bean.Resp; import com.logpm.trunkline.dto.*; import com.logpm.trunkline.entity.*; +import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient; import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; import com.logpm.trunkline.service.*; import com.logpm.trunkline.vo.*; @@ -112,9 +113,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadCarsPageList(LoadCarsDTO loadCarsDTO) { + IPage page = new Page<>(); page.setCurrent(loadCarsDTO.getPageNum()); page.setSize(loadCarsDTO.getPageSize());