From 3f171b12e535f9043786d8fc0f6003f745d2ed64 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 13 Mar 2024 23:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factory/mt/feign/IMtOrderMainClinet.java | 9 ++++++++- .../factory/mt/controller/MtFactoryDataController.java | 1 - .../com/logpm/factory/receiver/OpenOrderHandler.java | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java index ad6eac0ad..d477546da 100644 --- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java +++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/feign/IMtOrderMainClinet.java @@ -27,8 +27,15 @@ public interface IMtOrderMainClinet { /** - * 司机签收扫描 + * + * @param orderPackageCode 包条码 + * @param operationTime 作业时间 + * @param distributionContactId 签收任务 + * @param distributionContactCode 签收合同号 + * @param destinationWarehouse 目地仓 * @return + * @throws NoSuchAlgorithmException + * @throws JsonProcessingException */ @GetMapping(TOP) R sendOrderPackageScan(@RequestParam String orderPackageCode, diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java index 69213d222..b980ce4c6 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java @@ -72,7 +72,6 @@ public class MtFactoryDataController extends BladeController { orderStatusLog.setType(3); orderStatusLog.setBrand("梦天"); orderStatusLogService.save(orderStatusLog); - try{ //数据存入数据库 R r = mtFactoryDataService.dealWithData(mtFactoryDataDTO); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java index 9fdddf4ab..18ff5d09f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/OpenOrderHandler.java @@ -50,7 +50,8 @@ public class OpenOrderHandler { String msg = new String(message.getBody()); log.info("##################openOrderStatusHandler: 处理开单数据"); OrderInfoDTO orderInfoDTO = (OrderInfoDTO) map.get("messageData"); - String orderNoStr = orderInfoDTO.getOrderNo();//订单自编号 + //订单自编号 + String orderNoStr = orderInfoDTO.getOrderNo(); String[] split = orderNoStr.split(","); for (String orderNo:split){ if(StringUtil.isBlank(orderNo)){ @@ -66,7 +67,8 @@ public class OpenOrderHandler { return; } for (AdvanceEntity advanceEntity : advanceEntitys) { - String type = advanceEntity.getType();//品牌 + //品牌 + String type = advanceEntity.getType(); orderInfoDTO.setOrderNo(orderNo); orderInfoDTO.setDeliveryNumber(advanceEntity.getMctsTruckNo());