From 0d164f40d878c50dc799b0c80fae950816507d80 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 03 六月 2024 17:01:05 +0800
Subject: [PATCH] #xgm辅料库初始化
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 17 ++++++++++++++---
src/main/java/com/zy/asrs/controller/BasDevpController.java | 15 +++++++++++++--
src/main/webapp/static/js/common.js | 2 +-
pom.xml | 3 ++-
src/main/resources/application.yml | 4 ++--
5 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 39b2e35..e7e14e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,11 +111,12 @@
</dependencies>
<build>
- <finalName>wms</finalName>
+ <finalName>xgmFlwms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.1.3.RELEASE</version>
</plugin>
</plugins>
</build>
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 5182bc4..0eee83e 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.param.BasDevpInitParam;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
@@ -14,6 +15,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,11 +28,15 @@
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private SqlSessionFactory sqlSessionFactory;
@RequestMapping(value = "/basDevp/init/auth")
@ManagerAuth(memo = "鍒濆鍖栫珯鐐�")
public R init(BasDevpInitParam param) {
List<BasDevp> list = new ArrayList<>();
+ SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+ BasDevpMapper sessionMapper = sqlSession.getMapper(BasDevpMapper.class);
for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
BasDevp basDevp = basDevpService.selectById(devNo);
if (Cools.isEmpty(basDevp)){
@@ -42,10 +50,13 @@
basDevp1.setCanouting("Y");
basDevp1.setModiUser(getUserId());
basDevp1.setModiTime(new Date());
- list.add(basDevp1);
+ sessionMapper.insert(basDevp1);
+// list.add(basDevp1);
}
}
- basDevpService.insertBatch(list);
+ sqlSession.commit();
+ sqlSession.close();
+// basDevpService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index e6030da..bf01105 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.param.StaDescInitParam;
+import com.zy.asrs.mapper.StaDescMapper;
import com.zy.asrs.service.StaDescService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
@@ -14,6 +15,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +28,8 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private SqlSessionFactory sqlSessionFactory;
@RequestMapping(value = "/staDesc/init/auth")
@ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�")
@@ -35,6 +41,8 @@
String[] startStaList = param.getStartStaList().split(";");
String[] endStaList = param.getEndStaList().split(";");
List<StaDesc> staDescList = new ArrayList<>();
+ SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+ StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);
for (String startSta : startStaList){
for (String endSta : endStaList){
for (Integer type:param.getType()){
@@ -55,13 +63,16 @@
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
staDesc.setAppeTime(new Date());
- staDescList.add(staDesc);
+ sqlSessionMapper.insert(staDesc);
+// staDescList.add(staDesc);
}
}
}
- staDescService.insertBatch(staDescList);
+ sqlSession.commit();
+ sqlSession.close();
+// staDescService.insertBatch(staDescList);
}catch (Exception e){
- return R.error();
+ return R.error(e.getMessage());
}
return R.ok("ok1").add("ok2");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fbb0adb..b511fd5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=xgmFlasrs
username: sa
password: sa@123
mvc:
@@ -32,7 +32,7 @@
path: /stock/out/@pom.build.finalName@/logs
super:
- pwd: asrs2023
+ pwd: xltys1995
swagger:
enable: false
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 054399e..4d71a14 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/wms";
+var baseUrl = "/xgmFlwms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1