@ -115,7 +115,7 @@ public class AMHandServiceImpl implements AMHandService {
allow_update = "1" ;
allow_update = "1" ;
} else if ( device_driver . getDeviceDriver ( ) instanceof StandardInspectSiteDeviceDriver ) {
} else if ( device_driver . getDeviceDriver ( ) instanceof StandardInspectSiteDeviceDriver ) {
standardInspectSiteDeviceDriver = ( StandardInspectSiteDeviceDriver ) device_driver . getDeviceDriver ( ) ;
standardInspectSiteDeviceDriver = ( StandardInspectSiteDeviceDriver ) device_driver . getDeviceDriver ( ) ;
int move = standardInspectSiteDeviceDriver . getMove ( ) ;
// int move = standardInspectSiteDeviceDriver.getMove();
TaskDto taskDto = taskService . findByStartAndNextCode ( device_code ) ;
TaskDto taskDto = taskService . findByStartAndNextCode ( device_code ) ;
if ( ObjectUtil . isNotEmpty ( taskDto ) ) {
if ( ObjectUtil . isNotEmpty ( taskDto ) ) {
status = "2" ;
status = "2" ;
@ -594,6 +594,7 @@ public class AMHandServiceImpl implements AMHandService {
instdto . setStart_device_code ( taskjo . getString ( "start_device_code" ) ) ;
instdto . setStart_device_code ( taskjo . getString ( "start_device_code" ) ) ;
instdto . setNext_device_code ( taskjo . getString ( "next_device_code" ) ) ;
instdto . setNext_device_code ( taskjo . getString ( "next_device_code" ) ) ;
instdto . setInstruction_status ( "0" ) ;
instdto . setInstruction_status ( "0" ) ;
instdto . setAgv_inst_type ( "1" ) ;
InstructionService instructionService = SpringContextHolder . getBean ( "instructionServiceImpl" ) ;
InstructionService instructionService = SpringContextHolder . getBean ( "instructionServiceImpl" ) ;
WQLObject instwo = WQLObject . getWQLObject ( "acs_instruction" ) ;
WQLObject instwo = WQLObject . getWQLObject ( "acs_instruction" ) ;
JSONObject instcheckjson = instwo . query ( " instruction_status < 2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'" ) . uniqueResult ( 0 ) ;
JSONObject instcheckjson = instwo . query ( " instruction_status < 2 and next_point_code= '" + next_point_code + "'" + " and start_point_code = '" + start_point_code + "'" + " and task_id = '" + task_id + "'" ) . uniqueResult ( 0 ) ;