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-05-11 16:08:57 +08:00
parent 9505647cee 22bcfc1e54
commit ea360c0acd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.sch.tasks;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
@@ -13,6 +14,8 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -51,7 +54,10 @@ public class SendOutTask extends AbstractAcsTask {
if (StrUtil.equals(jsonPoint.getString("layer_num"), "2")) {
JSONObject jsonSub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + json.getString("vehicle_code") + "'").uniqueResult(0);
next_high = jsonSub.getString("box_high");
String box_high_ext = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("box_high_ext").getValue();
double box_high = NumberUtil.add(jsonSub.getDoubleValue("box_high"), Double.parseDouble(box_high_ext));
next_high = String.valueOf(NumberUtil.round(box_high, 0));
} else {
next_high = "0";
}