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

opt:空木箱入库增加层数

Browse Source
This commit is contained in:
baoge
2024-05-12 15:26:32 +08:00
parent a296a4845d
commit a6b9e54572
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask {
json.put("create_name", SecurityUtils.getCurrentUsername()); json.put("create_name", SecurityUtils.getCurrentUsername());
json.put("create_time", DateUtil.now()); json.put("create_time", DateUtil.now());
json.put("priority", "1"); json.put("priority", "1");
json.put("acs_task_type", "7"); json.put("acs_task_type", "6");
json.put("request_param", form.getString("request_param")); json.put("request_param", form.getString("request_param"));
WQLObject.getWQLObject("SCH_BASE_Task").insert(json); WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
return json.getString("task_id"); return json.getString("task_id");

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

@@ -155,24 +155,22 @@ public class InBoxManageServiceImpl implements InBoxManageService {
new QueryWrapper<BstIvtBoxinfo>().lambda() new QueryWrapper<BstIvtBoxinfo>().lambda()
.eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no")) .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no"))
); );
if (boxDao == null) {
throw new BadRequestException("木箱不存在!");
}
JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'") JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'")
.uniqueResult(0); .uniqueResult(0);
// if (ObjectUtil.isEmpty(jsonVehicle)) {
if (ObjectUtil.isEmpty(jsonVehicle)) { // throw new BadRequestException("载具不存在!");
throw new BadRequestException("载具不存在!"); // }
} // JSONObject jsonVeExt = new JSONObject();
// jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId());
JSONObject jsonVeExt = new JSONObject(); // jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id"));
jsonVeExt.put("storagevehicleext_id", IdUtil.getLongId()); // jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code"));
jsonVeExt.put("storagevehicle_id", jsonVehicle.getLongValue("storagevehicle_id")); // jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type"));
jsonVeExt.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code")); // jsonVeExt.put("pcsn", whereJson.getString("box_no"));
jsonVeExt.put("storagevehicle_type", jsonVehicle.getString("storagevehicle_type")); // jsonVeExt.put("device_uuid", IdUtil.getLongId());
jsonVeExt.put("pcsn", whereJson.getString("box_no")); // veExtTab.insert(jsonVeExt);
jsonVeExt.put("device_uuid", IdUtil.getLongId());
veExtTab.insert(jsonVeExt);
// 下发桁架任务 // 下发桁架任务
JSONObject taskParam = new JSONObject(); JSONObject taskParam = new JSONObject();
taskParam.put("task_type", "010713"); taskParam.put("task_type", "010713");
@@ -181,10 +179,10 @@ public class InBoxManageServiceImpl implements InBoxManageService {
taskParam.put("vehicle_code", whereJson.getString("vehicle_code")); taskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
taskParam.put("vehicle_code2", whereJson.getString("vehicle_code")); taskParam.put("vehicle_code2", whereJson.getString("vehicle_code"));
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("layer",whereJson.getString("layer")); param.put("layer", whereJson.getString("layer"));
param.put("box_length",boxDao.getBox_length()); param.put("box_length", boxDao.getBox_length());
param.put("box_width",boxDao.getBox_width()); param.put("box_width", boxDao.getBox_width());
param.put("box_high",boxDao.getBox_high()); param.put("box_high", boxDao.getBox_high());
param.put("vehicle_type", boxDao.getVehicle_type()); param.put("vehicle_type", boxDao.getVehicle_type());
param.put("box_no", whereJson.getString("box_no")); param.put("box_no", whereJson.getString("box_no"));
taskParam.put("request_param", param.toString()); taskParam.put("request_param", param.toString());