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

fix:入空木箱高度类型兼容，确认下卷提示ACS内容修改

Browse Source
This commit is contained in:
zhouz
2025-09-19 11:07:20 +08:00
parent 4cade7b1ea
commit 50d0df166e
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -701,18 +701,27 @@ public class InBoxManageServiceImpl implements InBoxManageService {
JSONArray structArray = new JSONArray();
String height = jsonParam.getString("height");
if (height.equals("1")) {
height = "('1','2','3')";
} else if (height.equals("2")) {
height = "('2','3')";
} else {
height = "('3')";
}
if (ObjectUtil.isEmpty(block_num)) {
structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
"AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
"AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" +
"AND height = '" + jsonParam.getString("height") + "'" +
"AND height IN " + height + " " +
"AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " +
"AND sect_id = '" + jsonParam.getString("sect_id") + "'").getResultJSONArray(0);
} else {
structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
"AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
"AND storagevehicle_type = '" + jsonParam.getString("vehicle_type") + "'" +
"AND height = '" + jsonParam.getString("height") + "'" +
"AND height IN " + height + " " +
"AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonParam.getString("stor_id") + "' " +
"AND sect_id = '" + jsonParam.getString("sect_id") + "' AND block_num = '" + block_num + "'").getResultJSONArray(0);
}
@@ -725,6 +734,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
// 确定巷道：查看每个巷道最小木箱数的巷道，获取最小木箱数的巷道
// 不是移库则需要找新巷道
jsonParam.put("height", height);
if (ObjectUtil.isEmpty(block_num)) {
block_num = getMinBlock(jsonParam);
}

15
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql
View File

@@ -17,7 +17,7 @@
输入.stor_id TYPEAS s_string
输入.sect_id TYPEAS s_string
输入.block_num TYPEAS s_string
输入.height TYPEAS s_string
输入.height TYPEAS f_string
输入.row_num TYPEAS s_string
输入.vehicle_type TYPEAS s_string
输入.box_length TYPEAS s_string
@@ -65,7 +65,7 @@
AND attr.stor_id = 输入.stor_id
AND attr.sect_id = 输入.sect_id
AND attr.storagevehicle_type = 输入.vehicle_type
AND attr.height = 输入.height
AND attr.height IN 输入.height
OPTION 输入.not_block <> ""
attr.block_num NOT IN 输入.not_block
@@ -94,10 +94,9 @@
AND attr.is_delete = '0'
AND attr.stor_id = 输入.stor_id
AND attr.sect_id = 输入.sect_id
AND attr.height = 输入.height
AND IFNULL(attr.storagevehicle_code,'') <> ''
AND attr.storagevehicle_type = 输入.vehicle_type
AND attr.height = 输入.height
AND attr.height IN 输入.height
AND box.is_packing = '0'
OPTION 输入.block_in <> ""
@@ -126,7 +125,7 @@
AND attr.stor_id = 输入.stor_id
AND attr.sect_id = 输入.sect_id
AND attr.storagevehicle_type = 输入.vehicle_type
AND attr.height = 输入.height
AND attr.height IN 输入.height
OPTION 输入.block_num <> ""
attr.block_num = 输入.block_num
ENDOPTION
@@ -160,8 +159,8 @@
attr.row_num = 输入.row_num
ENDOPTION
AND attr.storagevehicle_type = 输入.vehicle_type
AND attr.height = 输入.height
order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC
AND attr.height IN 输入.height
order by attr.layer_num ASC,attr.col_num DESC,attr.zdepth DESC
ENDSELECT
ENDQUERY
@@ -193,7 +192,7 @@
attr.row_num = 输入.row_num
ENDOPTION
AND attr.storagevehicle_type = 输入.vehicle_type
AND attr.height = 输入.height
AND attr.height IN 输入.height
ENDSELECT
ENDQUERY

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java
View File

@@ -574,7 +574,7 @@ public class RawFoilServiceImpl implements RawFoilService {
JSONObject result = wmsToAcsService.updateTask(paramArr);
if (!StrUtil.equals(result.getString("status"), "200")) {
throw new BadRequestException("操作失败：" + result.getString("message "));
throw new BadRequestException("操作失败：" + result.getString("errArr"));
}
// 更新工单状态为确认下卷