From c0c9c95e268faccc66c64661300b876502ac59f4 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期日, 29 一月 2023 11:15:33 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++-- src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 9077584..fc84fbf 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -119,7 +119,7 @@ String barcode = barcodeThread.getBarcode(); //9998閫�鍥烇紝9996绌烘澘 if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) { - News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode); + log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { staProtocol.setWorkNo((short) 9998); staProtocol.setStaNo((short) 14); @@ -380,7 +380,7 @@ String barcode = barcodeThread.getBarcode(); if (!Cools.isEmpty(barcode) && (staProtocol.getWorkNo() != 9998 || staProtocol.getWorkNo() != 9996)) { - News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode); + log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode); if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) { staProtocol.setWorkNo((short) 9998); staProtocol.setStaNo((short) 14); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a4fbc01..d40273c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,8 +8,8 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs - url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs + url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs +# url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs username: sa password: sa@123 mvc: -- Gitblit v1.9.1