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

Merge remote-tracking branch 'origin/b_lms' into b_lms

Browse Source
This commit is contained in:
gongbaoxiong
2024-06-17 13:12:36 +08:00
parent d3f33a12d1 8d1b82e3f9
commit 019022a5a8
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
View File

@@ -23,6 +23,7 @@
point.is_used = '1'
AND point.is_delete = '0'
AND point.region_code = 'BKZ01'
ORDER BY out_empty_seq
</select>
<select id="queryLikeOrderRow" resultType="com.alibaba.fastjson.JSONObject">

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
View File

@@ -155,7 +155,7 @@ public class TwoInEmpTask extends AbstractAcsTask {
throw new BadRequestException("托盘号不能为空!");
}
if (StrUtil.isBlank(form.getString("vehicle_type"))) {
if (StrUtil.isBlank(form.getString("containerType"))) {
throw new BadRequestException("托盘类型不能为空!");
}

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
View File

@@ -89,7 +89,7 @@ public class TwoLashTask extends AbstractAcsTask {
interaction_json.put("length",dao.get(0).getBox_length());
interaction_json.put("weight",dao.get(0).getBox_width());
interaction_json.put("height",dao.get(0).getBox_high());
interaction_json.put("template","4");
interaction_json.put("template",dao.get(0).getLash_num());
//第二次捆扎次数
interaction_json.put("bindingTimes","3");
interaction_json.put("isBinding", IOSEnum.IS_SEND.code("是"));

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
View File

@@ -170,7 +170,7 @@ public class TwoOutTask extends AbstractAcsTask {
JSONObject jsonParam = new JSONObject();
jsonParam.put("device_code",jsonTask.getString("point_code2"));
jsonParam.put("vehicle_code",jsonTask.getString("vehicle_code"));
jsonParam.put("vehicle_type",jsonTask.getString("vehicle_type"));
jsonParam.put("vehicle_type",jsonTask.getJSONObject("request_param").getString("containerType"));
LashManageServiceImpl bean1 = SpringContextHolder.getBean(LashManageServiceImpl.class);
bean1.createHeapTask(jsonParam);

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -400,9 +400,9 @@ public class SlitterServiceImpl implements SlitterService {
if (currentUpPlan != null && currentDownPlan != null) {
// 双轴任务 下双
taskParam.put("point_code1", device.getUp_point_code());
taskParam.put("point_code2", emptyPoint.getTruss_point_code2());
taskParam.put("point_code2", emptyPoint.getTruss_point_code1());
taskParam.put("point_code3", device.getDown_point_code());
taskParam.put("point_code4", emptyPoint.getTruss_point_code1());
taskParam.put("point_code4", emptyPoint.getTruss_point_code2());
taskParam.put("truss_type", "1");
taskParam.put("empty_site", "0");
} else {

2
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -216,7 +216,7 @@ public class LashManageServiceImpl implements LashManageService {
// 创建任务并下发
JSONObject jsonTaskParam = new JSONObject();
jsonTaskParam.put("task_type", "010720");
jsonTaskParam.put("containerType", whereJson.getString("vehicle_type"));
whereJson.put("containerType", whereJson.getString("vehicle_type"));
jsonTaskParam.put("point_code1", whereJson.getString("device_code"));
jsonTaskParam.put("point_code2", next_device_code);
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));