From 2f63acadcd111fe47b2feedf13adb9cffcd64b2c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 25 十月 2024 13:28:50 +0800
Subject: [PATCH] mes调用立即出库修改
---
src/main/java/com/zy/asrs/controller/BasDevpController.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 297dc68..fe6324e 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
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;
@@ -13,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.*;
@@ -23,6 +28,44 @@
@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 = null;
+ try {
+ sqlSession = sqlSessionFactory.openSession(ExecutorType.SIMPLE,false);
+ BasDevpMapper sessionMapper = sqlSession.getMapper(BasDevpMapper.class);
+ for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
+ BasDevp basDevp = basDevpService.selectById(devNo);
+ if (Cools.isEmpty(basDevp)){
+ BasDevp basDevp1 = new BasDevp();
+ basDevp1.setDevNo(devNo);
+ basDevp1.setInEnable("Y");
+ basDevp1.setOutEnable("Y");
+ basDevp1.setAutoing("Y");
+ basDevp1.setLoading("Y");
+ basDevp1.setCanining("Y");
+ basDevp1.setCanouting("Y");
+ basDevp1.setModiUser(getUserId());
+ basDevp1.setModiTime(new Date());
+ sessionMapper.insert(basDevp1);
+// list.add(basDevp1);
+ }
+ }
+ sqlSession.commit();
+ sqlSession.clearCache();
+ }catch (Exception e) {
+ return R.error(e.getMessage());
+ }finally {
+ sqlSession.close();
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }
+
+ }
@RequestMapping(value = "/basDevp/{id}/auth")
@ManagerAuth
@@ -44,20 +87,21 @@
return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/basDevp/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣娣诲姞")
public R add(BasDevp basDevp) {
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
@@ -68,7 +112,7 @@
}
@RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣淇敼")
public R update(BasDevp basDevp){
if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
return R.error();
@@ -76,11 +120,11 @@
basDevp.setModiUser(getUserId());
basDevp.setModiTime(new Date());
basDevpService.updateById(basDevp);
- return R.ok();
+ return R.ok("淇敼瀹屾垚");
}
@RequestMapping(value = "/basDevp/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣鍒犻櫎")
public R delete(@RequestParam String param){
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
if (Cools.isEmpty(list)){
@@ -93,7 +137,7 @@
}
@RequestMapping(value = "/basDevp/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1