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

zjj

2023-11-30 46d5aca49be78fccb2c2e64dc2332236085f67e2

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

@@ -466,11 +466,15 @@

                        //更新指令状态
                        commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//输送线直接完成状态
                        commandInfo.setExecuteTime(now);
                        commandInfo.setCompleteTime(now);
                        commandInfoService.updateById(commandInfo);

                        //更新指令日志
                        commandInfoLog.setDeviceLog("指令下发成功");
                        commandInfoLog.setCommandStatus(CommandStatusType.COMPLETE.id);//输送线直接完成状态
                        commandInfoLog.setExecuteTime(now);
                        commandInfoLog.setCompleteTime(now);
                        commandInfoLogService.insert(commandInfoLog);

                        //更新任务步序