diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java b/hd/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java index 2b5452b..d481f3c 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java @@ -443,9 +443,9 @@ public class DeviceController { @Log("惠氏任务生成选择终点") @ApiOperation("惠氏任务生成选择终点") - @GetMapping(value = "/endPoint") - public ResponseEntity selectEndPoint(String start_code) throws Exception { - List endPoints = deviceService.selectEndPoint(start_code); + @PostMapping(value = "/endPoint") + public ResponseEntity selectEndPoint(@RequestBody Map map) throws Exception { + List endPoints = deviceService.selectEndPoint(map.get("start_code")); return new ResponseEntity<>(endPoints, HttpStatus.OK); } diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index cd0c443..d2533fb 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -2063,7 +2063,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial if(StrUtil.isEmpty(start_code)){ throw new RuntimeException("起点设备为空"); } - List normal = routeLineService.getShortPathLinesByCode(start_code, "normal"); + List normal = routeLineService.getLinesByCode_seqnum(start_code, "normal"); List list = new ArrayList<>(); for (RouteLineDto routeLineDto : normal) { list.add(routeLineDto.getNext_device_code()); diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index f12164a..df318e3 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -108,9 +108,6 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple hasGoods = this.getDevice().getHas_goods(); batch = this.getDevice().getBatch(); devicecode = this.getDeviceCode(); - if("WLFZW05".equals(devicecode)){ - hasGoods = 1; - } switch (branchProtocol) { case 1: break; diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/route/service/RouteLineService.java b/hd/nladmin-system/src/main/java/org/nl/acs/route/service/RouteLineService.java index 55f39c6..35a49bf 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/route/service/RouteLineService.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/route/service/RouteLineService.java @@ -192,5 +192,4 @@ public interface RouteLineService { public List getPathLinesByCode(String device_code, String plan_code); public List getSuperiorShortPathLinesByCode(String device_code, String plan_code); - } diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 66cdcbf..240e2bc 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -690,9 +690,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { next_device_code = routeLineDto.getNext_device_code(); //包材接驳位策略 //包材取货位放到物料放置位的策略 - String prefix = "BCQHW"; - boolean result = StrUtil.startWithIgnoreCase(device_code, prefix); - if (result && StrUtil.isNotEmpty(next_code) && isFirst) { + if (StrUtil.isNotEmpty(next_code) && isFirst) { next_device_code = next_code; } //物料放置位货物放到成品放置位策略 diff --git a/hd/nladmin-system/src/main/resources/config/application-prod.yml b/hd/nladmin-system/src/main/resources/config/application-prod.yml index 9cc5214..86ac6a2 100644 --- a/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -8,7 +8,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:tg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hs_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数