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

fix:设备查询sql

Browse Source
This commit is contained in:
zhangzhiqiang
2023-03-23 19:49:28 +08:00
parent 5a347568e8
commit 8cc8dde800
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
View File

@@ -42,31 +42,24 @@
########################################## ##########################################
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY PAGEQUERY
SELECT SELECT
* *
FROM FROM
PDM_BI_Device device PDM_BI_Device device
WHERE WHERE
1 = 1 1 = 1
OPTION 输入.search <> "" OPTION 输入.search <> ""
(device.device_code like "%" 输入.search "%" or (device.device_code like "%" 输入.search "%" or
device.device_name like "%" 输入.search "%") device.device_name like "%" 输入.search "%")
ENDOPTION ENDOPTION
OPTION 输入.workprocedure_id <> "" OPTION 输入.workprocedure_id <> ""
(device.workprocedure_id = 输入.workprocedure_id) (device.workprocedure_id = 输入.workprocedure_id)
ENDOPTION ENDOPTION
OPTION 输入.product_area <> "" OPTION 输入.product_area <> ""
device.product_area = 输入.product_area device.product_area = 输入.product_area
ENDOPTION ENDOPTION
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF
IF 输入.flag = "2"
PAGEQUERY
UPDATE pdm_bi_device
SET deviceoutstor_qty = deviceoutstor_qty
ENDSELECT
ENDPAGEQUERY
ENDIF

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/TaskScheduleService.java
View File

@@ -46,6 +46,7 @@ public class TaskScheduleService {
WQLObject taskTable = WQLObject.getWQLObject("sch_base_task"); WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
JSONArray all = taskTable.query("task_type < '" + StatusEnum.TASK_PUBLISH + "'").getResultJSONArray(0); JSONArray all = taskTable.query("task_type < '" + StatusEnum.TASK_PUBLISH + "'").getResultJSONArray(0);
//分区域：不同区域调用不同acs接口 //分区域：不同区域调用不同acs接口
log.info("TaskScheduleService#taskPublish all_task:{}",all.size());
Map<String, List<Object>> areaCollent = all.stream().collect(Collectors.groupingBy(o -> ((JSONObject) o).getString("product_area"))); Map<String, List<Object>> areaCollent = all.stream().collect(Collectors.groupingBy(o -> ((JSONObject) o).getString("product_area")));
for (String area : areaCollent.keySet()) { for (String area : areaCollent.keySet()) {
List<Object> array = areaCollent.get(area); List<Object> array = areaCollent.get(area);