root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-21 17:51:44 +08:00
parent b3226228c8 7e530fb008
commit 867e837726
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -398,10 +398,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 校验木箱长度类型 // 校验木箱长度类型
double box_length = sub_jo.getDoubleValue("box_length"); 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"; 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"; device_code = device_code + "_2";
} else { } else {
device_code = device_code + "_3"; device_code = device_code + "_3";