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

货位更新

Browse Source
This commit is contained in:
loujf
2022-08-16 17:10:49 +08:00
parent 005ec3b919
commit 28eee4fa99
4 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
View File

@@ -13,6 +13,7 @@ import org.nl.acs.device.service.dto.StorageCellDto;
import org.nl.exception.BadRequestException;
import org.nl.utils.FileUtil;
import org.nl.utils.SecurityUtils;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.ResultBean;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
@@ -22,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @author wangs
@@ -39,9 +37,13 @@ public class StorageCellServiceImpl implements StorageCellService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "", "update_time desc");
final JSONObject json = rb.pageResult();
HashMap map = new HashMap<>(16);
map.put("flag","6");
if (whereJson.get("blurry") != null) {
map.put("blurry", "%" + whereJson.get("blurry") + "%");
}
JSONObject json = WQL.getWO("Qdevice_query_002").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page),"update_time desc");
return json;
}

19
acs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/Qdevice_query_002.wql
View File

@@ -138,4 +138,21 @@
address.methods_id = 输入.methods_id
ENDOPTION
ENDSELECT
ENDIF
ENDIF
IF 输入.flag = "6"
PAGEQUERY
SELECT
*
FROM
acs_storage_cell as storage_cell
WHERE
1=1
OPTION 输入.blurry <> ""
(storage_cell.storage_code like 输入.blurry
or storage_cell.parent_storage_code like 输入.blurry
or storage_cell.address like 输入.blurry )
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF