From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片:fixbug:大理片出片逻辑修改,钢化版图是否到齐:sql逻辑问题,包含人工出片任务,造成钢化版图是否到齐需要获取已出片的玻璃,造成已出笼的玻璃会重复计算并准备生成钢化任务,但获取的玻璃信息为空,造成插入钢化表异常。且排除已出笼的钢化版图较复杂(暂不关联钢化小片表),目前解决方案:把所有到齐的钢化版图数据查出来,排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/UnLoadGlassApplication.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/UnLoadGlassApplication.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/UnLoadGlassApplication.java
index b909d67..fba11e1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/UnLoadGlassApplication.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/UnLoadGlassApplication.java
@@ -1,28 +1,28 @@
 package com.mes;
 
-import com.mes.tools.WebSocketServer;
+import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 /**
  * @Author : zhoush
- * @Date: 2024/4/7 14:36
+ * @Date: 2024/4/7 14:36RRRR
  * @Description:
  */
+@Slf4j
 @SpringBootApplication
+@EnableSwagger2
 @EnableDiscoveryClient
 @MapperScan(basePackages = "com.mes.*.mapper")
+@EnableScheduling
 public class UnLoadGlassApplication {
 
-
-
     public static void main(String[] args) {
-        SpringApplication springApplication = new SpringApplication(UnLoadGlassApplication.class);
-        ConfigurableApplicationContext applicationContext = springApplication.run(args);
-        WebSocketServer.setApplicationContext(applicationContext);
+        SpringApplication.run(UnLoadGlassApplication.class, args);
     }
 
 }

--
Gitblit v1.8.0