From cf94ec501adf48741fbe7969e7d36f4a1c43dcbe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 19 八月 2020 14:52:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 8 ++++----
src/main/resources/application.yml | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 832ade5..bc81b4e 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -55,5 +52,8 @@
@Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
int saveWrkDetlLog(Integer workNo);
+ // update 鍏ュ簱閫氱煡妗�
+ @Update("update cust_wait_pakin set status='Y' where barcode = #{barcode}")
+ int updateWaitPakInStep1(String barcode);
}
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 6b2276e..f39eebe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -133,6 +133,10 @@
if (!locMastService.updateById(locMast)){
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
+ // 灏嗗叆搴撻�氱煡妗ｄ慨鏀逛负宸插惎鍔�
+ if (wrkMastMapper.updateWaitPakInStep1(barcode) == 0) {
+ throw new CoolException("淇敼鍏ュ簱閫氱煡妗ｇ姸鎬佷负宸插惎鍔�");
+ }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fa30c1c..0645bad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
datasource:
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.6.101:1433;databasename=jsasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1