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-12-12 17:38:27 +08:00
parent 44efdbc329
commit 5b66c8f275
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@ import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.AcsTaskDto; import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.PointService;
@@ -259,7 +261,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
json.put("acs_task_type", "1"); json.put("acs_task_type", "1");
tab.insert(json); tab.insert(json);
this.immediateNotifyAcs(); this.immediateNotifyAcs(null);
return json.getString("task_id"); return json.getString("task_id");
} }
@@ -275,5 +277,4 @@ public class CallEmpReelTask extends AbstractAcsTask {
public void cancel(String task_id) { public void cancel(String task_id) {
} }
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
View File

@@ -176,7 +176,7 @@ public class OutHotTask extends AbstractAcsTask {
json.put("priority", "1"); json.put("priority", "1");
json.put("acs_task_type", "1"); json.put("acs_task_type", "1");
tab.insert(json); tab.insert(json);
immediateNotifyAcs(); immediateNotifyAcs(null);
return json.getString("task_id"); return json.getString("task_id");
} }