From a927fbfc1db3d64ef1bcc726ed47035741e945b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98chaoosc=E2=80=99?= <‘chaoosc@gmail.com’> Date: Thu, 19 Oct 2023 15:10:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=AD=A5=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/factory/receiver/DealWithDataHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index b8477a163..d1f9b4289 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -43,7 +43,7 @@ public class DealWithDataHandler { String status = orderStatusDTO.getStatus(); String unitNo = orderStatusDTO.getUnitNo(); String operationTime = orderStatusDTO.getOperationTime(); - if ("4".equals(status)||"到货".equals(status)) { + if ("4".equals(status)) { //继续判断是否到达目的仓 String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id //查询destinationWarehouse logiBillNo plantId数据 From 7feeb8fe2055b89c78e4177c3a49f64d8284f712 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 19 Oct 2023 19:15:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AEbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml | 3 +-- .../com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml index 297d02a7f..67fc679f2 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml @@ -11,8 +11,7 @@ `ht_order_count` `i` INNER JOIN `ht_order` `order` ON `order`.`selfnumber` = `i`.`orderSelfNum` WHERE - `i`.`history_type` = 0 - AND `i`.`status` <> 11 + `i`.`status` <> 11 AND `i`.`delete_time` = '0' AND ( ( `i`.`in_num` + `i`.`delives_num` ) > 0 ) AND `i`.`goods_type` = '1' diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index d52e02fd1..3b736387a 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -1061,7 +1061,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { if(!b){ log.error("################saveTrayTypeInfo: 包件打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId); - throw new CustomerException(403,"包件打托失败"); +// throw new CustomerException(403,"包件打托失败"); } } }