From 8cc5a358b49e56379988f3718e097e7b5d89a07c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 19 Feb 2024 10:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89PAL=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81=E6=8E=A8=E9=80=81=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PanFactoryDataServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index 438c1f6c6..ce958ce0f 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -226,11 +226,11 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { public R handleStatusData(OrderStatusDTO orderStatusDTO) throws CustomerException { //先保存原始请求数据 - OrderStatusLog panOrderStatusLog = new OrderStatusLog(); - panOrderStatusLog.setArgs(JSONObject.toJSONString(orderStatusDTO)); - panOrderStatusLog.setStatus(1); - panOrderStatusLog.setType(2); - panOrderStatusLogService.save(panOrderStatusLog); +// OrderStatusLog panOrderStatusLog = new OrderStatusLog(); +// panOrderStatusLog.setArgs(JSONObject.toJSONString(orderStatusDTO)); +// panOrderStatusLog.setStatus(1); +// panOrderStatusLog.setType(2); +// panOrderStatusLogService.save(panOrderStatusLog); String status = orderStatusDTO.getStatus(); if ("1".equals(status) || "2".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { @@ -455,11 +455,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setCompleteSet(0); } logger.info("############basicdataWarehouseEntity {}", basicdataWarehouseEntity); - if (!Objects.isNull(basicdataWarehouseEntity)) { - distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment()); - } + distributionStockArticleEntity.setCreateDept(basicdataWarehouseEntity.getDepartment()); - WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderSelfNum); + WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderSelfNum); if(Objects.isNull(wayBillEntity)){