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

fix: 修改惠氏任务创建页面中选择终点不准确的问题

Browse Source
This commit is contained in:
yanps
2023-12-13 11:25:30 +08:00
parent 4960be53d0
commit 24acbe1295
6 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hd/nladmin-system/src/main/java/org/nl/acs/device/rest/DeviceController.java
View File

@@ -443,9 +443,9 @@ public class DeviceController {
@Log("惠氏任务生成选择终点") @Log("惠氏任务生成选择终点")
@ApiOperation("惠氏任务生成选择终点") @ApiOperation("惠氏任务生成选择终点")
@GetMapping(value = "/endPoint") @PostMapping(value = "/endPoint")
public ResponseEntity<Object> selectEndPoint(String start_code) throws Exception { public ResponseEntity<Object> selectEndPoint(@RequestBody Map<String,String> map) throws Exception {
List<String> endPoints = deviceService.selectEndPoint(start_code); List<String> endPoints = deviceService.selectEndPoint(map.get("start_code"));
return new ResponseEntity<>(endPoints, HttpStatus.OK); return new ResponseEntity<>(endPoints, HttpStatus.OK);
} }

2
hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -2063,7 +2063,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
if(StrUtil.isEmpty(start_code)){ if(StrUtil.isEmpty(start_code)){
throw new RuntimeException("起点设备为空"); throw new RuntimeException("起点设备为空");
} }
List<RouteLineDto> normal = routeLineService.getShortPathLinesByCode(start_code, "normal"); List<RouteLineDto> normal = routeLineService.getLinesByCode_seqnum(start_code, "normal");
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (RouteLineDto routeLineDto : normal) { for (RouteLineDto routeLineDto : normal) {
list.add(routeLineDto.getNext_device_code()); list.add(routeLineDto.getNext_device_code());

3
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
View File

@@ -108,9 +108,6 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
hasGoods = this.getDevice().getHas_goods(); hasGoods = this.getDevice().getHas_goods();
batch = this.getDevice().getBatch(); batch = this.getDevice().getBatch();
devicecode = this.getDeviceCode(); devicecode = this.getDeviceCode();
if("WLFZW05".equals(devicecode)){
hasGoods = 1;
}
switch (branchProtocol) { switch (branchProtocol) {
case 1: case 1:
break; break;

1
hd/nladmin-system/src/main/java/org/nl/acs/route/service/RouteLineService.java
View File

@@ -192,5 +192,4 @@ public interface RouteLineService {
public List<RouteLineDto> getPathLinesByCode(String device_code, String plan_code); public List<RouteLineDto> getPathLinesByCode(String device_code, String plan_code);
public List<RouteLineDto> getSuperiorShortPathLinesByCode(String device_code, String plan_code); public List<RouteLineDto> getSuperiorShortPathLinesByCode(String device_code, String plan_code);
} }

4
hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -690,9 +690,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
next_device_code = routeLineDto.getNext_device_code(); next_device_code = routeLineDto.getNext_device_code();
//包材接驳位策略 //包材接驳位策略
//包材取货位放到物料放置位的策略 //包材取货位放到物料放置位的策略
String prefix = "BCQHW"; if (StrUtil.isNotEmpty(next_code) && isFirst) {
boolean result = StrUtil.startWithIgnoreCase(device_code, prefix);
if (result && StrUtil.isNotEmpty(next_code) && isFirst) {
next_device_code = next_code; next_device_code = next_code;
} }
//物料放置位货物放到成品放置位策略 //物料放置位货物放到成品放置位策略

2
hd/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -8,7 +8,7 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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} username: ${DB_USER:root}
password: ${DB_PWD:123456} password: ${DB_PWD:123456}
# 初始连接数 # 初始连接数