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

fix：任务查询时间带上时分秒

Browse Source
This commit is contained in:
zhouz
2025-12-23 10:29:56 +08:00
parent 57268fdbae
commit 4baeae1df6
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
View File

@@ -16,6 +16,7 @@ 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.basedata.st.service.StructattrService;
import org.nl.wms.basedata.st.service.dto.StructattrDto;
import org.nl.wms.sch.AcsTaskDto;
@@ -71,7 +72,6 @@ public class TwoOutTask extends AbstractAcsTask {
List<JSONObject> taskArr = new ArrayList<>();
// 用于判断下发几个任务组
int flag = 2;
// 判断当前正在执行或者下发的任务有几种规格：根据任务组进行判断，同一任务组代表同一木箱规格
List<JSONObject> likeAllArr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status IN ('05','06') and is_delete = '0' " )
@@ -80,9 +80,11 @@ public class TwoOutTask extends AbstractAcsTask {
Map<String, List<JSONObject>> likeArr = likeAllArr.stream()
.collect(Collectors.groupingBy(row -> row.getString("task_group_id")));
int flag = Integer.parseInt(SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("out_queue_num").getValue());
// 判断长度
if (likeArr.size() >= 2) {
log.warn("twoOutTasklikeArr>2");
if (likeArr.size() >= flag) {
log.warn("twoOutTasklikeArr>out_queue_num");
return null;
}

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

@@ -93,10 +93,10 @@ public class TaskServiceImpl implements TaskService {
map.put("finishTypeList", whereJson.getString("finishTypeList"));
}
if (StrUtil.isNotEmpty(whereJson.getString("begin_time"))) {
map.put("begin_time", whereJson.getString("begin_time").substring(0, 10)+" 00:00:00");
map.put("begin_time", whereJson.getString("begin_time"));
}
if (StrUtil.isNotEmpty(whereJson.getString("end_time"))) {
map.put("end_time", whereJson.getString("end_time").substring(0, 10)+" 99:99:99");
map.put("end_time", whereJson.getString("end_time"));
}
if (StrUtil.isNotEmpty(whereJson.getString("is_delete"))) {
map.put("is_delete", whereJson.getString("is_delete"));