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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-11-01 16:18:27 +08:00
parent b1dd30e61c
commit e4df9e20af
19 changed files with 556 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/rest/HotPointIvtController.java
View File

@@ -64,4 +64,11 @@ public class HotPointIvtController {
hotpointivtService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/taskDtlQuery")
@Log("查询烘烤任务明细")
@ApiOperation("查询烘烤任务明细")
public ResponseEntity<Object> taskDtlQuery(@RequestParam Map whereJson, Pageable page){
return new ResponseEntity<>(hotpointivtService.taskDtlQuery(whereJson,page),HttpStatus.OK);
}
}

9
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/HotPointIvtService.java
View File

@@ -61,4 +61,13 @@ public interface HotPointIvtService {
* @param ids /
*/
void deleteAll(Long[] ids);
/**
* 任务明细分页查询
* @param whereJson 条件
* @param page 分页参数
* @return Map<String,Object>
*/
Map<String,Object> taskDtlQuery(Map whereJson, Pageable page);
}

23
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.pdm.ivt.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
@@ -137,4 +138,26 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
}
}
@Override
public Map<String, Object> taskDtlQuery(Map whereJson, Pageable page) {
String task_code = MapUtil.getStr(whereJson, "task_code");
String start_point_code = MapUtil.getStr(whereJson, "start_point_code");
String next_point_code = MapUtil.getStr(whereJson, "next_point_code");
JSONObject map = new JSONObject();
map.put("flag","2");
map.put("bill_code", MapUtil.getStr(whereJson,"bill_code"));
map.put("dtl_status", MapUtil.getStr(whereJson,"dtl_status"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
if (ObjectUtil.isNotEmpty(task_code)) map.put("task_code","%"+task_code+"%");
if (ObjectUtil.isNotEmpty(start_point_code)) map.put("start_point_code","%"+start_point_code+"%");
if (ObjectUtil.isNotEmpty(next_point_code)) map.put("next_point_code","%"+next_point_code+"%");
JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
return json;
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java
View File

@@ -156,7 +156,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService {
WQLObject tab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder");
JSONObject json = tab.query("workorder_id = '" + workorder_id + "'").uniqueResult(0);
json.put("status", "2");
json.put("status", "09");
json.put("finish_type", "02");
json.put("realend_time", DateUtil.now());
json.put("update_optid", currentUserId);

75
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
View File

@@ -17,9 +17,14 @@
输入.point_code TYPEAS s_string
输入.point_status TYPEAS s_string
输入.product_area TYPEAS s_string
输入.is_used TYPEAS s_string
输入.is_used TYPEAS s_string
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.bill_code TYPEAS s_string
输入.dtl_status TYPEAS s_string
输入.task_code TYPEAS s_string
输入.start_point_code TYPEAS s_string
输入.next_point_code TYPEAS s_string
[临时表]
@@ -71,4 +76,72 @@
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF
IF 输入.flag = "2"
PAGEQUERY
SELECT
mst.bill_code,
dtl.start_point_code,
dtl.next_point_code,
dtl.temperature,
dtl.oven_time,
dtl.create_name,
dtl.create_time,
dtl.confirm_optname,
dtl.confirm_time,
(
CASE
dtl.dtl_status
WHEN '10' THEN '生成'
WHEN '40' THEN '执行中'
WHEN '50' THEN '确认'
END
) AS dtl_status,
(
CASE
dtl.task_type
WHEN '0' THEN 'AGV任务'
WHEN '1' THEN '桁架任务'
END
) AS task_type,
task.task_code
FROM
ST_IVT_HotRegionIODtl dtl
LEFT JOIN ST_IVT_HotRegionIOMst mst ON mst.iostorinv_id = dtl.iostorinv_id
LEFT JOIN sch_base_task task ON task.task_id = dtl.task_id
WHERE
mst.is_delete = '0'
OPTION 输入.bill_code <> ""
mst.bill_code = 输入.bill_code
ENDOPTION
OPTION 输入.dtl_status <> ""
dtl.dtl_status = 输入.dtl_status
ENDOPTION
OPTION 输入.task_code <> ""
task.task_code like 输入.task_code
ENDOPTION
OPTION 输入.start_point_code <> ""
dtl.start_point_code like 输入.start_point_code
ENDOPTION
OPTION 输入.next_point_code <> ""
dtl.next_point_code like 输入.next_point_code
ENDOPTION
OPTION 输入.begin_time <> ""
dtl.create_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
dtl.create_time <= 输入.end_time
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -72,8 +72,9 @@ public class TaskServiceImpl implements TaskService {
map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%");
}
if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) {
ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type"));
map.put("task_type", task_type.getClass_code());
ClassstandardDto dto = classstandardService.findById(whereJson.getString("task_type"));
String task_type = classstandardService.getChildIdStr(dto.getClass_id().toString());
map.put("task_type", task_type);
}
if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) {
map.put("finishTypeList", whereJson.getString("finishTypeList"));

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql
View File

@@ -16,9 +16,9 @@
输入.flag TYPEAS s_string
输入.task_status TYPEAS s_string
输入.finished_type TYPEAS s_string
输入.task_type TYPEAS s_string
输入.point_code1 TYPEAS s_string
输入.point_code2 TYPEAS s_string
输入.task_type TYPEAS f_string
输入.point_code1 TYPEAS s_string
输入.point_code2 TYPEAS s_string
输入.task_code TYPEAS s_string
输入.vehicle_code TYPEAS s_string
输入.begin_time TYPEAS s_string
@@ -60,7 +60,7 @@
WHERE
task.is_delete = '0'
OPTION 输入.task_type <> ""
task.task_type = 输入.task_type
md.class_id in 输入.task_type
ENDOPTION
OPTION 输入.finished_type <> ""
task.finished_type = 输入.finished_type
@@ -83,7 +83,7 @@
OPTION 输入.task_code <> ""
(task.task_code like 输入.task_code)
ENDOPTION
OPTION 输入.point_code <> ""
OPTION 输入.point_code1 <> ""
(task.point_code1 like 输入.point_code1)
ENDOPTION
OPTION 输入.begin_time <> ""