From 17d2aeaa271ff87f9c22982d1ec3d5953e86addb Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 16 Jun 2022 11:24:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/thread/DlBasicService.java | 16 +++++++++++----- .../com/glxp/api/admin/thread/HeartService.java | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java index 61bff828..6f0602d0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java @@ -445,10 +445,8 @@ public class DlBasicService { orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setReceiveStatus(0); orderEntity.setErpFk(null); - String value = systemParamConfigService.selectValueByParamKey("syns_out_change"); - if (value.equals("1")) { - orderEntity.setOutChangeEnable(true); - } else +// String value = systemParamConfigService.selectValueByParamKey("syns_out_change"); + if (!orderEntity.isSyncOutChange()) orderEntity.setOutChangeEnable(false); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); OrderEntity temp = orderService.findById(orderEntity.getId()); @@ -471,7 +469,15 @@ public class DlBasicService { } batchSession.commit(); - remark.append("单据：").append(syncDataResponse.getOrderEntities().size()).append("条\n"); + + String logs = ""; + if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) + logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) + logs = logs + "单据详情：" + syncDataResponse.getOrderDetailEntityList().size() + "条\n"; + if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) + logs = logs + "UDI码信息：" + syncDataResponse.getWarehouseEntityList().size() + "条\n"; + remark.append(logs); } catch (Exception e) { } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java index 40a6904c..abf41c87 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java @@ -85,7 +85,7 @@ public class HeartService { if (CollUtil.isNotEmpty(spsSyncOrderResponse.getOrderDetailEntityList())) logs = logs + "单据详情：" + spsSyncOrderResponse.getOrderDetailEntityList().size() + "条\n"; if (CollUtil.isNotEmpty(spsSyncOrderResponse.getWarehouseEntityList())) - logs = logs + "条码信息：" + spsSyncOrderResponse.getWarehouseEntityList().size() + "条\n"; + logs = logs + "UDI码信息：" + spsSyncOrderResponse.getWarehouseEntityList().size() + "条\n"; basicExportStatusEntity1.setRemark(logs); basicExportStatusEntity1.setUpdateTime(new Date()); basicExportService.updateExportStatus(basicExportStatusEntity1);