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

rev;木箱入库修改

Browse Source
This commit is contained in:
zhouz
2024-05-13 09:35:01 +08:00
parent a6b9e54572
commit 6c4170cd59
2 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ public class TwoInBoxTask extends AbstractAcsTask {
.task_type(json.getString("acs_task_type"))
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code"))
.vehicle_code(json.getString("vehicle_code2"))
.priority(json.getString("priority"))
.class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type))
@@ -156,6 +156,7 @@ public class TwoInBoxTask extends AbstractAcsTask {
json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());
json.put("task_type", form.getString("task_type"));
json.put("vehicle_code", form.getString("vehicle_code"));
json.put("vehicle_code2", form.getString("vehicle_code2"));
json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
json.put("point_code1", form.getString("start_device_code"));
json.put("point_code2", form.getString("next_device_code"));

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

@@ -99,6 +99,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
jsonParam.put("box_length", boxDao.getBox_length());
jsonParam.put("box_width", boxDao.getBox_width());
jsonParam.put("box_high", boxDao.getBox_high());
jsonParam.put("vehicle_type", boxDao.getVehicle_type());
JSONObject jsonAttr = getStruct(jsonParam);
@@ -114,6 +115,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
jsonTaskParam.put("start_device_code", whereJson.getString("device_code"));
jsonTaskParam.put("next_device_code", jsonAttr.getString("struct_code"));
jsonTaskParam.put("vehicle_code", whereJson.getString("box_no"));
jsonTaskParam.put("vehicle_code2", whereJson.getString("vehicle_code"));
TwoInBoxTask taskBean = new TwoInBoxTask();
taskBean.createTask(jsonTaskParam);
@@ -240,6 +242,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
/**
* 找一个空仓位（木箱区）
*
* @param jsonParam {
* stor_id：仓库标识
* sect_id：库区标识
@@ -259,8 +262,9 @@ public class InBoxManageServiceImpl implements InBoxManageService {
*/
JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
"AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
"AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '"+jsonParam.getString("stor_id")+"' " +
"AND sect_id = '"+jsonParam.getString("sect_id")+"'").getResultJSONArray(0);
"AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" +
"AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " +
"AND sect_id = '" + jsonParam.getString("sect_id") + "'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(structArray)) {
notInRowList.clear();
@@ -272,11 +276,11 @@ public class InBoxManageServiceImpl implements InBoxManageService {
String block_num = getMinBlock(jsonParam);
// 确定排：查看每排的木箱数量，找到数量最小的那排
jsonParam.put("block_num",block_num);
jsonParam.put("block_num", block_num);
String row_num = getMinRow(jsonParam);
// 确定仓位： 找到仓位
jsonParam.put("row_num",row_num);
jsonParam.put("row_num", row_num);
JSONObject jsonAttr = queryStruct(jsonParam);
// 为空则新找巷道
@@ -300,7 +304,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
json.put("box_high", jsonParam.getString("box_high"));
String row_num_2 = getMinRow(json);
json.put("row_num",row_num_2);
json.put("row_num", row_num_2);
JSONObject jsonAttr_2 = queryStruct(json);
if (ObjectUtil.isNotEmpty(jsonAttr_2)) {
@@ -318,13 +322,14 @@ public class InBoxManageServiceImpl implements InBoxManageService {
/**
* 确定巷道
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* stor_id: 仓库标识
* sect_id: 库区标识
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* @return String 巷道
*/
private String getMinBlock(JSONObject jsonParam) {
@@ -342,7 +347,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
.collect(Collectors.joining("','"));
jsonParam.put("flag", "2");
jsonParam.put("block_in", "('"+block_in+"')");
jsonParam.put("block_in", "('" + block_in + "')");
List<JSONObject> boxAllList = WQL.getWO("BST_INBOX").addParamMap(jsonParam)
.process().getResultJSONArray(0).toJavaList(JSONObject.class);
@@ -376,14 +381,15 @@ public class InBoxManageServiceImpl implements InBoxManageService {
/**
* 确定排
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
* stor_id: 仓库标识
* sect_id: 库区标识
* block_num： 巷道
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* @return String 排
*/
private String getMinRow(JSONObject jsonParam) {
@@ -402,7 +408,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
.collect(Collectors.joining("','"));
jsonParam.put("flag", "2");
jsonParam.put("row_in", "('"+row_in+"')");
jsonParam.put("row_in", "('" + row_in + "')");
List<JSONObject> boxAllList = WQL.getWO("BST_INBOX").addParamMap(jsonParam)
.process().getResultJSONArray(0).toJavaList(JSONObject.class);
@@ -443,15 +449,16 @@ public class InBoxManageServiceImpl implements InBoxManageService {
/**
* 确定仓位
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
* block_num： 巷道
* row_num： 排
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* stor_id: 仓库标识
* sect_id: 库区标识
* block_num： 巷道
* row_num： 排
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* @return JSONObject 仓位对象
*/
private JSONObject queryStruct(JSONObject jsonParam) {
@@ -470,7 +477,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
// 新的一排
String row_num_new = this.getMinRow(jsonParam);
jsonParam.put("row_num",row_num_new);
jsonParam.put("row_num", row_num_new);
jsonAttr = this.getStructOne(jsonParam);
}
@@ -479,15 +486,16 @@ public class InBoxManageServiceImpl implements InBoxManageService {
/**
* 获取一个货位公共方法
*
* @param jsonParam {
* stor_id: 仓库标识
* sect_id: 库区标识
* block_num： 巷道
* row_num： 排
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* stor_id: 仓库标识
* sect_id: 库区标识
* block_num： 巷道
* row_num： 排
* box_length：木箱长度
* box_width：木箱宽度
* box_high：木箱高度
* }
* @return JSONObject 仓位对象
*/
private JSONObject getStructOne(JSONObject jsonParam) {