Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs

lty

2025-03-05 eb60587fd357e7af1b940f9764de336a65175eb4

Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs

 src/main/java/com/zy/asrs/task/autoReportStartHandler.java

@@ -84,8 +84,8 @@
     * @throws IOException
     */
    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute() throws IOException {
        List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("status",1).in("wrk_sts",12,3));
    public synchronized void execute() throws IOException {
        List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("status",1).in("wrk_sts",12,13,3,4));
        if(taskWrks.size()>0){
            for(TaskWrk taskWrk:taskWrks){
                if(Cools.isEmpty(taskWrk.getMarkStart())||taskWrk.getMarkStart()==0){

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -370,7 +370,7 @@
    /**
     * 写入数据
     */
    private boolean write5(CrnCommand command) throws InterruptedException {
    private synchronized boolean write5(CrnCommand command) throws InterruptedException {
        String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();

        if (null == command) {