From 8d1150c5be8ba6d4ec7e04de3a95e86a748b9cf5 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 02 五月 2024 10:29:32 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    5 +++++
 src/main/resources/application.yml                          |    4 ++--
 2 files changed, 7 insertions(+), 2 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 8c4c471..64a91c4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -194,6 +194,11 @@
                     }
                     //鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱   璁惧鏆備笉鏀寔101銆�104绔欑洏鐐�/鎷f枡鍏ュ簱
                     WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
+                    if(!Cools.isEmpty(wrkMast1)){
+                        if (wrkMast1.getIoType()!=1){
+                            continue;
+                        }
+                    }
                     if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                         log.error("101鎴�104鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
                         continue;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 283e5d2..b341690 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=phpsasrs
+    url: jdbc:sqlserver://10.10.10.235:1433;databasename=phpsasrs
 #    url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
     username: sa
     password: sa@123
@@ -73,7 +73,7 @@
     crnInStn[2]:
       devpPlcId: ${wcs-slave.devp[2].id}
       staNo: 310
-      row: 3
+      row: 2
       bay: 1
       lev: 3
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�1

--
Gitblit v1.9.1