day01-init 18 часов назад
Родитель
Сommit
750f3bbc27

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
api.http


+ 1 - 1
src/main/java/com/jeesite/modules/mes/service/MesProductRecordService.java

@@ -554,7 +554,7 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 		fu.setBizKey(mesProductRecord1.getId());
 		fu.setBizType("mesProductRecord_image");
 		List<FileUpload> finfo = fileUploadService.findList(fu);
-		if (finfo==null){
+		if (finfo.isEmpty()){
 			return false;
 		}
 		return true;

+ 1 - 1
src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -3738,7 +3738,7 @@ public class MesProductRecordController extends BaseController {
 				if (StringUtils.isEmpty(oprno)) {
 					return CommonUitl.getXml("NG;工位号不能为空;");
 				}
-				Boolean checkOP500Photo = mesProductRecordService.checkOP500Photo(sn, lineSn);
+				boolean checkOP500Photo = mesProductRecordService.checkOP500Photo(sn, lineSn);
 
 				if (!checkOP500Photo){
 					return CommonUitl.getXml("OP500未拍照或未加工");

+ 2 - 2
src/main/resources/config/application.yml

@@ -54,8 +54,8 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   username: mescloud
   password: 8neywEN86NLam3ts