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

Merge commit '9186ce137f2a67a4d8d7bb1cbfcc40cf69729d22' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-06-18 16:37:40 +08:00
parent 170170d608 9186ce137f
commit ec5279cf93
24 changed files with 260 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java
View File

@@ -43,6 +43,8 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String search = MapUtil.getStr(whereJson, "search");
//只查询木箱
String box = MapUtil.getStr(whereJson, "box");
//物料限制的时候使用，初始化页面
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
@@ -60,6 +62,13 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
}
map.put("search", "%" + search + "%");
}
if (!StrUtil.isEmpty(box)) {
//处理转义字符
if (box.contains("\\")) {
box = box.replace("\\", "\\\\\\");
}
map.put("box", "%" + box + "%");
}
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
View File

@@ -15,6 +15,7 @@
#################################################
输入.flag TYPEAS s_string
输入.search TYPEAS s_string
输入.box TYPEAS s_string
输入.class_code TYPEAS s_string
输入.idssql TYPEAS f_string
输入.classIds TYPEAS f_string
@@ -59,6 +60,11 @@
mb.material_name like 输入.search
)
ENDOPTION
OPTION 输入.box <> ""
(
mb.material_name like 输入.box
)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

5
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -1968,11 +1968,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("applyTwo返回参数：---------------------------------------------" + result.toString());
return result;
}
}catch (Exception ex){
log.info("applyTwo申请任务异常,任务类型为：---------------------------------------------"+type+"异常信息为"+ex.toString());
result.put("status", HttpStatus.BAD_REQUEST.value());
result.put("message","申请任务异常,任务类型为："+type+"异常信息为"+ex.toString());
return result;
}
finally {
if (tryLock) {