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

rev：可配置入库不入某一个巷道

Browse Source
This commit is contained in:
liuxy
2024-08-20 22:46:42 +08:00
parent 93d3565e62
commit 88aafd4a58
6 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.ext.acs.service.AcsToWmsService;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.ext.mes.service.LmsToMesService;
@@ -449,6 +450,12 @@ public class InBoxManageServiceImpl implements InBoxManageService {
// 需要返回的仓位
JSONObject result = new JSONObject();
// 获取系统参数不入哪个巷道
String not_in_block_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("not_in_block_num").getValue();
if (!not_in_block_num.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
jsonParam.put("not_in_block_num", not_in_block_num);
}
// 1.匹配相同木箱规格的排（row_num）
jsonParam.put("flag", "6");
List<JSONObject> rowList = WQL.getWO("BST_INBOX").addParamMap(jsonParam)
@@ -627,6 +634,12 @@ public class InBoxManageServiceImpl implements InBoxManageService {
private String getMinBlock(JSONObject jsonParam) {
jsonParam.put("flag", "1");
// 获取系统参数不入哪个巷道
String not_in_block_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("not_in_block_num").getValue();
if (!not_in_block_num.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
jsonParam.put("not_in_block_num", not_in_block_num);
}
// 获取仓库、库区有空位的巷道
List<JSONObject> blockList = WQL.getWO("BST_INBOX").addParamMap(jsonParam)
.process().getResultJSONArray(0).toJavaList(JSONObject.class);

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

@@ -23,6 +23,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBussMana
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -117,6 +119,7 @@ public class InBussManageServiceImpl implements InBussManageService {
String block_num = jsonObject.getString("move_block_num");
JSONArray attrArry = new JSONArray();
if (ObjectUtil.isEmpty(block_num)) {
attrArry = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
"AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
@@ -415,6 +418,12 @@ public class InBussManageServiceImpl implements InBussManageService {
* @return String ： 巷道
*/
private String getMinBlock(JSONObject jsonSub) {
// 获取系统参数不入哪个巷道
String not_in_block_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("not_in_block_num").getValue();
if (!not_in_block_num.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
jsonSub.put("not_in_block_num", not_in_block_num);
}
jsonSub.put("flag", "1");
// 获取仓库、库区有空位的巷道

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

@@ -13,6 +13,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InVehicleM
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -251,6 +253,12 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
*/
private String getMinBlock(JSONObject jsonParam) {
// 获取系统参数不入哪个巷道
String not_in_block_num = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("not_in_block_num").getValue();
if (!not_in_block_num.equals(IOSEnum.IS_NOTANDYES.code("否"))) {
jsonParam.put("not_in_block_num", not_in_block_num);
}
jsonParam.put("flag", "1");
// 获取仓库、库区有空位的巷道

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

@@ -23,6 +23,7 @@
输入.box_length TYPEAS s_string
输入.box_width TYPEAS s_string
输入.box_high TYPEAS s_string
输入.not_in_block_num TYPEAS s_string
输入.block_in TYPEAS f_string
输入.row_in TYPEAS f_string
输入.not_row_in TYPEAS f_string
@@ -65,10 +66,15 @@
AND attr.sect_id = 输入.sect_id
AND attr.storagevehicle_type = 输入.vehicle_type
AND attr.height = 输入.height
OPTION 输入.not_block <> ""
attr.block_num NOT IN 输入.not_block
ENDOPTION
OPTION 输入.not_in_block_num <> ""
attr.block_num <> 输入.not_in_block_num
ENDOPTION
group by attr.block_num
order by attr.block_num
@@ -217,6 +223,10 @@
box.box_high = 输入.box_high
ENDOPTION
OPTION 输入.not_in_block_num <> ""
attr.block_num <> 输入.not_in_block_num
ENDOPTION
GROUP BY attr.row_num
ENDOPTION

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

@@ -32,6 +32,7 @@
输入.not_block TYPEAS f_string
输入.product_name TYPEAS s_string
输入.product_name TYPEAS s_string
输入.not_in_block_num TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -75,6 +76,10 @@
attr.block_num NOT IN 输入.not_block
ENDOPTION
OPTION 输入.not_in_block_num <> ""
attr.block_num <> 输入.not_in_block_num
ENDOPTION
group by attr.block_num
order by attr.block_num

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

@@ -18,6 +18,7 @@
输入.sect_id TYPEAS s_string
输入.block_num TYPEAS s_string
输入.row_num TYPEAS s_string
输入.not_in_block_num TYPEAS s_string
输入.block_in TYPEAS f_string
输入.row_in TYPEAS f_string
输入.not_row_in TYPEAS f_string
@@ -65,6 +66,10 @@
attr.block_num NOT IN 输入.not_block
ENDOPTION
OPTION 输入.not_in_block_num <> ""
attr.block_num <> 输入.not_in_block_num
ENDOPTION
OPTION 输入.vehicle_type <> ""
attr.storagevehicle_type = 输入.vehicle_type
ENDOPTION