From e49f97a2e906fb3fdb2df56d2156d3a42311a433 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期一, 09 九月 2024 13:10:16 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++++- pom.xml | 2 +- src/main/resources/application.yml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 06a10cf..f1cff03 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index c6fff83..b78245d 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -434,6 +434,10 @@ .eq("crn_no", locMast.getCrnNo()); StaDesc staDesc = staDescService.selectOne(wrapper); Integer sourceStaNo = staDesc.getCrnStn(); + WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo())); + if (!Cools.isEmpty(mast)) { + throw new CoolException(locNo+"宸叉湁鍑哄簱浠诲姟锛�"); + } if (Cools.isEmpty(sourceStaNo)) { throw new CoolException("妫�绱㈡簮绔欏け璐�"); } @@ -444,7 +448,7 @@ wrkMast.setIoTime(now); wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱 - wrkMast.setIoPri(10D); + wrkMast.setIoPri(13D); wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯 wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔� wrkMast.setCrnNo(locMast.getCrnNo()); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6bc75ce..5f3d9e9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs - url: jdbc:sqlserver://10.10.10.235:1433;databasename=phpsasrs + url: jdbc:sqlserver://127.0.0.1:1433;databasename=phpsasrs username: sa password: sa@123 mvc: -- Gitblit v1.9.1