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

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<Object> selectEndPoint(String start_code) throws Exception {
-        List<String> endPoints  = deviceService.selectEndPoint(start_code);
+    @PostMapping(value = "/endPoint")
+    public ResponseEntity<Object> selectEndPoint(@RequestBody Map<String,String> map) throws Exception {
+        List<String> endPoints  = deviceService.selectEndPoint(map.get("start_code"));
         return new ResponseEntity<>(endPoints, HttpStatus.OK);
     }
 

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<RouteLineDto> normal = routeLineService.getShortPathLinesByCode(start_code, "normal");
+        List<RouteLineDto> normal = routeLineService.getLinesByCode_seqnum(start_code, "normal");
         List<String> list = new ArrayList<>();
         for (RouteLineDto routeLineDto : normal) {
             list.add(routeLineDto.getNext_device_code());

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;

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

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

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;
                 }
                 //物料放置位货物放到成品放置位策略

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}
       # 初始连接数