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

fix:日志

Browse Source
This commit is contained in:
gengby
2025-10-24 10:55:06 +08:00
parent 1dfc984b83
commit 28db4ead2c
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
View File

@@ -1011,13 +1011,13 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
requireSucess = false;
return true;
}
//判断有没有第二段出库输送指令，有的话则不生成入库指令
Instruction byStarCodeAndExcute = instructionService.findByStarCodeAndExcute(next_device_code);
if (ObjectUtil.isNotEmpty(byStarCodeAndExcute)) {
this.message = "有DDJ对接位出入库的指令";
requireSucess = false;
return true;
}
//TODO 判断有没有第二段出库输送指令，有的话则不生成入库指令
// Instruction byStarCodeAndExcute = instructionService.findByStarCodeAndExcute(next_device_code);
// if (ObjectUtil.isNotEmpty(byStarCodeAndExcute)) {
// this.message = "有DDJ对接位出入库的指令";
// requireSucess = false;
// return true;
// }
//关联站点判断
Device nextDevice = deviceAppService.findDeviceByCode(next_device_code);
BeltConveyorDeviceDriver beltConveyorDeviceDriver;
@@ -1037,7 +1037,6 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
return true;
}
}
}
}
TaskDto dto = taskserver.findByCodeAndExcute(taskdto.getNext_device_code(), taskdto.getStart_device_code());

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java
View File

@@ -45,7 +45,7 @@ public @interface Log {
*
* @return
*/
boolean isAddLogTable() default true;
boolean isAddLogTable() default false;
/**
* 是否接口日志

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java
View File

@@ -101,7 +101,6 @@ public class LogAspect {
log.error("track_id:{},error:{}", trackId, ex.getMessage());
SysLog log = new SysLog("ERROR", System.currentTimeMillis() - startTime);
log.setException_detail(ThrowableUtil.getStackTrace(ex).getBytes());
logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
throw ex;
}
return result;