Browse Source

fix 新增任务

master
张江玮 2 years ago
parent
commit
c2435763bd
  1. 6
      acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
  2. 2
      acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
  3. 2
      acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java

6
acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@ -136,9 +136,9 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
} }
if (ikey != 0) { if (ikey != 0) {
inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); inst = instructionService.findByCodeFromCache(String.valueOf(ikey));
if (ObjectUtil.isEmpty(inst)) { // if (ObjectUtil.isEmpty(inst)) {
inst = instructionService.findByCode(String.valueOf(ikey)); // inst = instructionService.findByCode(String.valueOf(ikey));
} // }
} }
if (!ObjectUtil.isEmpty(link_inst)) { if (!ObjectUtil.isEmpty(link_inst)) {
link_flag = true; link_flag = true;

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@ -465,7 +465,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String route_plan_code = request.getRoute_plan_code(); String route_plan_code = request.getRoute_plan_code();
String task_type = request.getTASKTYPE(); String task_type = request.getTASKTYPE();
String storage_task_type = request.getDtl_type(); String storage_task_type = request.getDtl_type();
String agv_system_type = request.getAgv_system_type(); String agv_system_type = "1";
String remark = request.getRemark(); String remark = request.getRemark();
double oven_time = 0.00d; double oven_time = 0.00d;
if (StrUtil.isNotEmpty(request.getOven_time())) { if (StrUtil.isNotEmpty(request.getOven_time())) {

2
acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java

@ -278,7 +278,7 @@ public class TaskDto implements Serializable {
/** /**
* AGV系统类型 * AGV系统类型
*/ */
private String agv_system_type; private String agv_system_type = "1";
/** /**

Loading…
Cancel
Save