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

Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

Browse Source
This commit is contained in:
zhouz
2024-05-13 09:35:08 +08:00
parent 6c4170cd59 6831a82a5a
commit 30ad6db6ac
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,12 +52,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask {
.class_type(json.getString("task_type")) .class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type)) .dtl_type(String.valueOf(dtl_type))
.interaction_json(json.getJSONObject("request_param")) .interaction_json(json.getJSONObject("request_param"))
.remark(json.getString("remark")) .remark(json.getString("rem ark"))
// .layer(params.getString("layer"))
// .barcode(params.getString("box_no"))
// .height(params.getString("height"))
// .width(params.getString("width"))
// .length(params.getString("length"))
.build(); .build();
resultList.add(dto); resultList.add(dto);
} }

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

@@ -182,11 +182,11 @@ public class InBoxManageServiceImpl implements InBoxManageService {
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("length", boxDao.getBox_length());
param.put("box_width", boxDao.getBox_width()); param.put("width", boxDao.getBox_width());
param.put("box_high", boxDao.getBox_high()); param.put("height", boxDao.getBox_high());
param.put("vehicle_type", boxDao.getVehicle_type()); param.put("containerType", boxDao.getVehicle_type());
param.put("box_no", whereJson.getString("box_no")); param.put("barcode", whereJson.getString("box_no"));
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);