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

fix:下发任务给高度类型

Browse Source
This commit is contained in:
zhouz
2024-05-24 13:50:13 +08:00
parent 28b990e002
commit dc785a42eb
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -285,6 +285,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
JSONObject jsonAttr; JSONObject jsonAttr;
// 是否自动分配货位 // 是否自动分配货位
Boolean checked = jsonObject.getBoolean("checked"); Boolean checked = jsonObject.getBoolean("checked");
String height = "";
if (ObjectUtil.isNotEmpty(checked) && checked) { if (ObjectUtil.isNotEmpty(checked) && checked) {
// 自动分配: 根据仓库、库区匹配一个合适的仓位 // 自动分配: 根据仓库、库区匹配一个合适的仓位
JSONObject attrParam = new JSONObject(); JSONObject attrParam = new JSONObject();
@@ -300,7 +301,6 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
jsonObject.put("vehicle_type",boxDao.getVehicle_type()); jsonObject.put("vehicle_type",boxDao.getVehicle_type());
attrParam.put("vehicle_type", boxDao.getVehicle_type()); attrParam.put("vehicle_type", boxDao.getVehicle_type());
//根据木箱高度，判断入库仓位的高度 //根据木箱高度，判断入库仓位的高度
String height = "";
String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue(); String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue(); String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
String box_high = boxDao.getBox_high(); String box_high = boxDao.getBox_high();
@@ -395,6 +395,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
jsonSend.put("vehicle_code2", jsonObject.getString("vehicle_code")); jsonSend.put("vehicle_code2", jsonObject.getString("vehicle_code"));
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("containerType", jsonObject.getString("vehicle_type")); param.put("containerType", jsonObject.getString("vehicle_type"));
param.put("heightLevel", height);
jsonSend.put("request_param", param.toString()); jsonSend.put("request_param", param.toString());
String task_id1 = this.setPoint(jsonSend); String task_id1 = this.setPoint(jsonSend);
// 下发任务 // 下发任务

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

@@ -347,6 +347,20 @@ public class InBoxManageServiceImpl implements InBoxManageService {
param.put("height", boxDao.getBox_high()); param.put("height", boxDao.getBox_high());
param.put("containerType", boxDao.getVehicle_type()); param.put("containerType", boxDao.getVehicle_type());
param.put("barcode", whereJson.getString("box_no")); param.put("barcode", whereJson.getString("box_no"));
//根据木箱高度，判断入库仓位的高度
String height = "";
String heightLevel1 = iSysParamService.findByCode("height_level_1").getValue();
String heightLevel2 = iSysParamService.findByCode("height_level_2").getValue();
String box_high = boxDao.getBox_high();
if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) {
height = "1";
} else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) {
height = "2";
} else {
height = "3";
}
param.put("heightLevel", height);
taskParam.put("request_param", param.toString()); taskParam.put("request_param", param.toString());
TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask();
taskBean.createTask(taskParam); taskBean.createTask(taskParam);