Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
This commit is contained in:
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user