From 7e530fb008eb854f67e75e9908744098fc31baca Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 21 Feb 2023 15:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 1be84a52b..ce89853e2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -398,10 +398,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 校验木箱长度类型 double box_length = sub_jo.getDoubleValue("box_length"); + String length_down_1 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("box_length_down_1").getValue(); + String length_up_1 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("box_length_up_1").getValue(); + String length_down_2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("box_length_down_2").getValue(); + String length_up_2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("box_length_up_2").getValue(); - if (522 <= box_length && box_length <= 614) { + Double box_length_down_1 = Double.valueOf(length_down_1); + Double box_length_up_1 = Double.valueOf(length_up_1); + Double box_length_down_2 = Double.valueOf(length_down_2); + Double box_length_up_2 = Double.valueOf(length_up_2); + + + if (box_length_down_1 <= box_length && box_length <= box_length_up_1) { device_code = device_code + "_1"; - } else if (672 <= box_length && box_length <= 814) { + } else if (box_length_down_2 <= box_length && box_length <= box_length_up_2) { device_code = device_code + "_2"; } else { device_code = device_code + "_3";