From 52805a2308f901610e3c2e26ad2212138bca8070 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 14:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzwms2' into phyzwms2
---
src/main/java/com/zy/system/entity/PdaResource.java | 131 +++
src/main/webapp/static/js/pdaResource/pdaResource.js | 252 +++++++
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 5
src/main/java/com/zy/common/web/BaseController.java | 8
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 25
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 19
src/main/java/com/zy/system/service/RolePdaResourceService.java | 8
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 1
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2
src/main/java/com/zy/system/controller/RolePdaResourceController.java | 125 +++
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 1
src/main/java/com/zy/common/web/AuthController.java | 196 ++++-
src/main/resources/mapper/RolePdaResourceMapper.xml | 13
src/main/webapp/static/image/logo1.png | 0
src/main/resources/mapper/PdaResourceMapper.xml | 18
src/main/webapp/views/index.html | 2
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 10
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 31
src/main/java/com/zy/asrs/controller/OrderController.java | 29
src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java | 12
src/main/java/com/zy/system/mapper/PdaResourceMapper.java | 12
src/main/webapp/static/js/rolePdaResource/rolePdaResource.js | 247 +++++++
src/main/webapp/views/rolePdaResource/rolePdaResource.html | 116 +++
src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java | 12
src/main/webapp/static/js/role/role.js | 1
src/main/java/com/zy/common/CodeBuilder.java | 6
src/main/java/com/zy/system/controller/PdaResourceController.java | 143 ++++
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 3
src/main/java/com/zy/asrs/controller/AgvLocMastController.java | 40
src/main/java/com/zy/common/service/AgvCommonService.java | 5
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 97 ++
src/main/java/com/zy/system/service/PdaResourceService.java | 8
src/main/webapp/views/pdaResource/pdaResource.html | 318 +++++++++
src/main/webapp/static/js/order/order.js | 6
src/main/webapp/static/js/role/rolePower.js | 13
src/main/java/com/zy/system/entity/RolePdaResource.java | 77 ++
src/main/java/com/zy/system/service/impl/PdaResourceServiceImpl.java | 12
src/main/webapp/views/login.html | 4
38 files changed, 1,932 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index fb407d4..8b9dfd1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -82,25 +82,27 @@
return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
}
int br = 0;
- switch (locMast.getBarcode().substring(0,2)) {
- case "10":
- br = 1;
- break;
- case "20":
- br = 2;
- break;
- case "21":
- br = 4;
- break;
- case "30":
- br = 3;
- break;
- case "40":
- br = 5;
- break;
- }
- if (oldLocMast.getLocType1() != br) {
- return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ if (locMast.getLocSts() == "O" || locMast.getLocSts() == "X"){
+ switch (locMast.getBarcode().substring(0,2)) {
+ case "10":
+ br = 1;
+ break;
+ case "20":
+ br = 2;
+ break;
+ case "21":
+ br = 4;
+ break;
+ case "30":
+ br = 3;
+ break;
+ case "40":
+ br = 5;
+ break;
+ }
+ if (oldLocMast.getLocType1() != br) {
+ return R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+ }
}
Date now = new Date();
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 6f5929e..771ae87 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -227,6 +227,47 @@
/*
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
+ @PostMapping("/query/locDetl/v3")
+ public R queryAgvLocDetl3(@RequestBody HashMap<String,String> params){
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+ String floor = params.get("floor");
+
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
+
+
+// wrapper.eq("orderNo",orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+
+ if (threeCode.substring(0,2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
+ }
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ List<AgvLocDetl> locDetls = new ArrayList<>();
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ }
+
+ if (Cools.isEmpty(agvLocMast)) continue;
+ agvLocDetl.setLocSts(agvLocMast.getLocSts());
+ agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
+ locDetls.add(agvLocDetl);
+ }
+
+
+ return R.ok(locDetls);
+ }
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
@PostMapping("/query/locDetl/v2")
public R queryAgvLocDetl2(@RequestBody HashMap<String,String> params){
@@ -514,9 +555,61 @@
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
// 鏇存柊璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
+ }
+ }
+ // 鏇存柊婧愬簱浣�
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ locMast.setLocSts("R");
+ agvLocMastService.updateById(locMast);
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/agv/v3/locMove")
+ @Transactional
+ @ManagerAuth(memo = "鍥炶皟鍗曚换鍔′笅鍙�")
+ @Synchronized
+ public R agvLocMove3(@RequestBody HashMap<String,Object> params){
+ Date now = new Date();
+ List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
+ for (HashMap<String, String> map : dbList) {
+ String locNo = map.get("locNo");
+ String barcode = map.get("suppCode");
+ AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
+ if (!Cools.isEmpty(source_loc_no)) {
+ throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
+ }
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
+ if (Cools.isEmpty(locMastS)) {
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
+ }
+ AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30,1);
+ // 鍚屾璋冩嫧鍗�
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvWrkDetl wrkDetl = new AgvWrkDetl();
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.sync(agvLocDetl);
+ wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeUser(getUserId());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(getUserId());
+ wrkDetl.setModiTime(now);
+ if (!agvWrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ // 鏇存柊璁㈠崟
+ // 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
+
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
}
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4ff89c0..771adbb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -215,6 +215,32 @@
}
return R.ok(page);
}
+ @RequestMapping(value = "/order/backStocks/detls/pakin/page/auth")
+ @ManagerAuth
+ public R backStocksOrderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "100")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+// return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 36) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source",docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeback(record.getMatnr(), record.getThreeCode(),1);
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ }
+ return R.ok(page);
+ }
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
@@ -485,6 +511,7 @@
list.add(dto);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setSource(param.getDocType().intValue());
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(getUserId());
@@ -898,6 +925,7 @@
orderDetl2.setDeadTime(isocode);
orderDetl2.setStatus(1);
orderDetl2.setQty(0.0D);
+ orderDetl2.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl2)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
@@ -975,6 +1003,7 @@
orderDetl3.setDeadTime(isocode);
orderDetl3.setStatus(1);
orderDetl3.setQty(0.0D);
+ orderDetl3.setProcessSts(proSts);
if (!orderDetlService.insert(orderDetl3)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index 5349c93..52d314a 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -34,6 +34,9 @@
@Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor = #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
Double selectSumAnfmeByMatnr2(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);
+ @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor != #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
+ Double getSumAnfmeback(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);
+
@Select("SELECT SUM(anfme) FROM agv_loc_detl")
Integer sum();
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index b6debfe..3d4a3a3 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -28,6 +28,8 @@
Double getSumAnfmeDb(String matnr, String threeCode, Integer floor);
+ Double getSumAnfmeback(String matnr, String threeCode, Integer floor);
+
Integer sum();
List<AgvLocDetl> getStockStatisExcel();
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f0208a0..90923a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -142,6 +142,11 @@
return this.baseMapper.selectSumAnfmeByMatnr2(matnr, threeCode, floor);
}
+ @Override
+ public Double getSumAnfmeback(String matnr, String threeCode,Integer floor) {
+ return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
+ }
+
/*
鑾峰彇搴撳瓨鎬绘暟
*/
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 76adcd3..e66cebf 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -459,6 +459,11 @@
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast agvLocMast = new AgvLocMast();
+ //鏌ヨ搴撳瓨
+ AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
+ if (!Cools.isEmpty(locMast)) {
+ throw new CoolException("褰撳墠璐ф灦宸插湪搴撳瓨涓紝鏃犳硶杩涜鍏ュ簱");
+ }
//鏌ヨ鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
@@ -493,6 +498,11 @@
//鏇存柊婧愮珯鐐圭姸鎬�
updateAgvBasDevp(agvBasDevp,"R",containerType);
}else {
+ //鏌ヨ宸ヤ綔妗�
+ AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
+ if (!Cools.isEmpty(agvWrkMast1)) {
+ throw new CoolException("褰撳墠璐ф灦宸叉湁鍏ュ簱浠诲姟锛屾棤娉曡繘琛屽叆搴�");
+ }
agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
// 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index bdc3096..ce05dd6 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -225,7 +225,6 @@
switch (agvWrkMast.getIoType()) {
case 108:
case 12:
- case 57:
agvTaskCreateParam.setTaskTyp("F06");
break;
case 109:
@@ -236,13 +235,27 @@
}
break;
case 1:
+ case 57:
// 鍏ュ簱浠诲姟鏄彧鏈� 鎺ラ┏浣� -- > 搴撲綅
AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
if ("02".equals(locSub)) {
- agvTaskCreateParam.setTaskTyp("F06");
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F01");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F06");
+ }
+
} else {
- agvTaskCreateParam.setTaskTyp("F01");
+ // 鐩爣妤煎眰浣�1妤� 浣嗘簮搴撲綅锛堟帴椹充綅锛夊湪鍚稿浜屾ゼ
+ if (agvBasDevp.getFloor() == 4) {
+ agvTaskCreateParam.setTaskTyp("F06");
+ } else {
+ agvTaskCreateParam.setTaskTyp("F01");
+ }
+
+
}
break;
default:
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 7ac722b..f4ce7b2 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -59,6 +59,7 @@
.or().eq("io_type",111)
.or().eq("io_type",112)
.or().eq("io_type",113)
+ .or().eq("io_type",114)
.or().eq("io_type",121)
);
if(!Cools.isEmpty(agvWrkMastList)){
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 5c9af68..0275339 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -56,8 +56,8 @@
* ioType 108.鑷姩璋冩嫧
* crnNo :2鐩爣妤煎眰
*/
- @Scheduled(cron = "0/2 * * * * ? ")
- private void execute2(){
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private synchronized void execute2(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
@@ -126,6 +126,27 @@
}
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void execute4(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 22)
+ .andNew().eq("io_type",114)
+ .orderBy("io_pri",false)
+ .orderBy("appe_time",true)
+ );
+ if (agvWrkMastList.isEmpty()) {
+ return;
+ }
+ for (AgvWrkMast agvWrkMast : agvWrkMastList) {
+ try{
+ autoMoveHandler.start4(agvWrkMast);
+ } catch (Exception e){
+ log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
+ }
+
+ }
+
// // 绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐�
// //@Scheduled(cron = "0/2 * * * * ? ")
// private void autoEmptyBack(){
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index d423ccb..93e8c90 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -142,6 +142,7 @@
agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
break;
case 108:
+ case 114:
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
//鏇存柊搴撳瓨鏄庣粏
agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index f2c29bc..0207985 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -55,6 +55,12 @@
doHandMove2(agvWrkMast);
return SUCCESS;
}
+
+ public ReturnT<String> start4(AgvWrkMast agvWrkMast) {
+ // locType 1. 鑷姩锛� 2. 鎵嬪姩
+ doAutoMove3(agvWrkMast);
+ return SUCCESS;
+ }
//鏍规嵁搴撲綅鐨刲octype鍊煎彂閫佷换鍔�--寮冪敤
private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
Date now = new Date();
@@ -187,6 +193,28 @@
if (Cools.isEmpty(locMast)) {
throw new CoolException("鏆傛棤搴撲綅");
}
+ AgvWrkMast workingMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locMast.getLocNo()));
+ if (!Cools.isEmpty(workingMast)) {
+ throw new CoolException("褰撳墠搴撲綅姝ｅ湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
+ }
+ agvWrkMast.setWrkSts(201L);
+ agvWrkMast.setLocNo(locMast.getLocNo());
+ agvWrkMastService.updateById(agvWrkMast);
+ //鏇存柊鐩爣搴撲綅鐘舵��
+ updateAgvLocMast(locMast,"S");
+ AgvLocMast locMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locMast.getLocNo()));
+ log.info("鑷姩璋冩嫧浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{},搴撲綅鐘舵�亄}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo(),locMast1.getLocSts());
+
+ return SUCCESS;
+ }
+
+ private ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
+ Date now = new Date();
+ //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+ AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false);
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("鏆傛棤搴撲綅");
+ }
agvWrkMast.setWrkSts(201L);
agvWrkMast.setLocNo(locMast.getLocNo());
agvWrkMast.setLogErrMemo("start2-doAutoMove2");
@@ -196,6 +224,7 @@
return SUCCESS;
}
+
private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
String lev1 = agvWrkMast.getSourceLocNo().substring(agvWrkMast.getSourceLocNo().length() - 4).substring(0, 2);
@@ -203,7 +232,7 @@
if ("01".equals(lev1)) {
devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
} else {
- devpNo = agvCommonService.getDevpNo(3, 5, "Y", "Y");
+ devpNo = agvCommonService.getDevpNo(3, 4, "Y", "Y");
}
if (Cools.isEmpty(devpNo)) {
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 6d26ba3..80569dd 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,11 +17,11 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.15:1433;databasename=phyzasrs";
+ generator.url="127.0.0.1:1433;databasename=phyzasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="agv_wrk_mast_execute_log";
- generator.packagePath="com.zy.asrs";
+ generator.table="sys_role_pda_resource";
+ generator.packagePath="com.zy.system";
generator.sql = false;
generator.build();
}
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index f87765f..e7aded0 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -238,7 +238,10 @@
Boolean orderBy = false;
int levCount = 0;
int times = 1;
- if (floor == 1) {
+ if (floor == 1 || floor >= 4) {
+ if (floor >= 4 ) {
+ floor = 1;
+ }
orderBy = true;
levCount = 2;
} else {
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index a54e094..7f178c1 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2019-07-30
@@ -43,11 +44,15 @@
@Autowired
private ResourceService resourceService;
@Autowired
+ private PdaResourceService pdaResourceService;
+ @Autowired
private RoleResourceService roleResourceService;
@Autowired
private PermissionService permissionService;
@Autowired
private RolePermissionService rolePermissionService;
+ @Autowired
+ private RolePdaResourceService rolePdaResourceService;
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
@@ -229,18 +234,44 @@
// 鍔熻兘妯″潡
Map<String, Object> functions = new HashMap<>();
- functions.put("title", "鎸囧畾鍔熻兘");
+ functions.put("title", "pda鍔熻兘");
functions.put("id", "function");
functions.put("spread", true);
List<Map> funcs = new ArrayList<>();
functions.put("children", funcs);
- List<Permission> permissions = permissionService.selectList(new EntityWrapper<Permission>().eq("status", 1));
- for (Permission permission : permissions) {
- Map<String, Object> func = new HashMap<>();
- func.put("title", permission.getName());
- func.put("id", permission.getAction());
- func.put("spread", true);
- funcs.add(func);
+ List<PdaResource> oneLevs = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("level", 1).eq("status", 1).orderBy("sort"));
+ // 涓�绾�
+ for (PdaResource oneLev : oneLevs) {
+ List<Map> twoLevelsList = new ArrayList<>();
+ Map<String, Object> oneLevelMap = new HashMap<>();
+ oneLevelMap.put("title", oneLev.getName());
+ oneLevelMap.put("id", oneLev.getId());
+ oneLevelMap.put("spread", true);
+ oneLevelMap.put("checked", false);
+ oneLevelMap.put("children", twoLevelsList);
+
+ List<PdaResource> twoLevels = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", oneLev.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
+ // 浜岀骇
+ for (PdaResource twoLevel : twoLevels){
+ Map<String, Object> twoLevelMap = new HashMap<>();
+ twoLevelMap.put("title", twoLevel.getName());
+ twoLevelMap.put("id", twoLevel.getId());
+ twoLevelMap.put("spread", false);
+ twoLevelMap.put("checked", false);
+ List<Map> threeLevelsList = new ArrayList<>();
+ twoLevelMap.put("children", threeLevelsList);
+ // 涓夌骇
+ List<PdaResource> threeLevels = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
+ for (PdaResource threeLevel : threeLevels){
+ Map<String, Object> threeLevelMap = new HashMap<>();
+ threeLevelMap.put("title", threeLevel.getName());
+ threeLevelMap.put("id", threeLevel.getId());
+ threeLevelMap.put("checked", false);
+ threeLevelsList.add(threeLevelMap);
+ }
+ twoLevelsList.add(twoLevelMap);
+ }
+ funcs.add(oneLevelMap);
}
result.add(functions);
@@ -269,6 +300,25 @@
result.add(permission.getAction());
}
}
+ // pda鏉冮檺
+ List<RolePdaResource> rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
+ for (RolePdaResource rolePdaResource : rolePdaResources) {
+ PdaResource pdaResource = pdaResourceService.selectById(rolePdaResource.getResourceId());
+ if (!Cools.isEmpty(pdaResource)) {
+ if (pdaResource.getLevel() == 1){
+ List<PdaResource> pdaResources = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", pdaResource.getId()));
+ if (Cools.isEmpty(pdaResources)) {
+ result.add(pdaResource.getId());
+ }
+ }
+ if (pdaResource.getLevel() == 2){
+ List<PdaResource> pdaResources = pdaResourceService.selectList(new EntityWrapper<PdaResource>().eq("resource_id", pdaResource.getId()));
+ if (Cools.isEmpty(pdaResources)) {
+ result.add(pdaResource.getId());
+ }
+ }
+ }
+ }
return R.ok(result);
}
@@ -280,46 +330,86 @@
Long leaderId = role.getLeader();
roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
+ rolePdaResourceService.delete(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
if (!Cools.isEmpty(powers)){
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
- Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
- if (!Cools.isEmpty(resource)) {
- // 鏍￠獙涓婄骇鏉冮檺
- if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
- if (null == roleResource) {
- throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
- }
- }
- RoleResource roleResource = new RoleResource();
- roleResource.setRoleId(roleId);
- roleResource.setResourceId(resource.getId());
- roleResourceService.insert(roleResource);
- } else {
- Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
- if (!Cools.isEmpty(permission)){
- RolePermission rolePermission = new RolePermission();
- rolePermission.setRoleId(roleId);
- rolePermission.setPermissionId(permission.getId());
- rolePermissionService.insert(rolePermission);
- }
- }
- for (String three : dto.getThree()){
- Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
- if (!Cools.isEmpty(resource1)) {
+ if (isNumber(dto.getTwo())) {
+ Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
+ if (!Cools.isEmpty(resource)) {
// 鏍￠獙涓婄骇鏉冮檺
if (leaderId != null) {
- RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+ RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
if (null == roleResource) {
- throw new CoolException(resource.getName().concat("鐨�").concat(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName())));
+ throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
}
}
RoleResource roleResource = new RoleResource();
roleResource.setRoleId(roleId);
- roleResource.setResourceId(resource1.getId());
+ roleResource.setResourceId(resource.getId());
roleResourceService.insert(roleResource);
}
+
+ } else {
+ if (dto.getTwo().substring(0,1).contains("-")) {
+ PdaResource pdaResource = pdaResourceService.selectOne(new EntityWrapper<PdaResource>().eq("id", dto.getTwo()).eq("level", 1));
+ if (!Cools.isEmpty(pdaResource)) {
+ // 鏍￠獙涓婄骇鏉冮檺
+ if (leaderId != null) {
+ RolePdaResource rolePdaResource = rolePdaResourceService.selectOne(new EntityWrapper<RolePdaResource>().eq("role_id", leaderId).eq("resource_id", pdaResource.getId()));
+ if (null == rolePdaResource) {
+ throw new CoolException(pdaResource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+ }
+ }
+ RolePdaResource rolePdaResource = new RolePdaResource();
+ rolePdaResource.setRoleId(roleId);
+ rolePdaResource.setResourceId(pdaResource.getId());
+ rolePdaResourceService.insert(rolePdaResource);
+ }
+ } else {
+ Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
+ if (!Cools.isEmpty(permission)){
+ RolePermission rolePermission = new RolePermission();
+ rolePermission.setRoleId(roleId);
+ rolePermission.setPermissionId(permission.getId());
+ rolePermissionService.insert(rolePermission);
+ }
+ }
+
+ }
+ for (String three : dto.getThree()){
+ if (three.substring(0,1).contains("-")) {
+ PdaResource pdaResource = pdaResourceService.selectOne(new EntityWrapper<PdaResource>().eq("id", three).eq("level", 2));
+ if (!Cools.isEmpty(pdaResource)) {
+ // 鏍￠獙涓婄骇鏉冮檺
+ if (leaderId != null) {
+ RolePdaResource rolePdaResource = rolePdaResourceService.selectOne(new EntityWrapper<RolePdaResource>().eq("role_id", leaderId).eq("resource_id", pdaResource.getId()));
+ if (null == rolePdaResource) {
+ throw new CoolException(pdaResource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+ }
+ }
+ RolePdaResource rolePdaResource = new RolePdaResource();
+ rolePdaResource.setRoleId(roleId);
+ rolePdaResource.setResourceId(pdaResource.getId());
+ rolePdaResourceService.insert(rolePdaResource);
+ }
+ } else {
+ Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
+ if (!Cools.isEmpty(resource1)) {
+ // 鏍￠獙涓婄骇鏉冮檺
+ if (leaderId != null) {
+ RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource1.getId()));
+ if (null == roleResource) {
+ throw new CoolException(resource1.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+ }
+ }
+ RoleResource roleResource = new RoleResource();
+ roleResource.setRoleId(roleId);
+ roleResource.setResourceId(resource1.getId());
+ roleResourceService.insert(roleResource);
+ }
+ }
+
}
}
}
@@ -385,4 +475,38 @@
return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime));
}
+ @RequestMapping("/menu/pda/auth")
+ @ManagerAuth
+ public R menuPda(@RequestBody HashMap<String,String> params){
+ Long userId = getUserId();
+ String level = params.get("level");
+ Long id = Long.valueOf(params.get("id"));
+ List<RolePdaResource> rolePdaResources;
+ if (userId == 9527L) {
+ rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<>());
+ } else {
+ Long roleId = getUser().getRoleId();
+ rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
+ }
+ if (Cools.isEmpty(rolePdaResources)) {
+ return R.ok();
+ }
+ List<Long> collect = rolePdaResources.stream().map(RolePdaResource::getResourceId).distinct().collect(Collectors.toList());
+ List<PdaResource> pdaResources = pdaResourceService.selectBatchIds(collect);
+ List<PdaResource> results = new ArrayList<>();
+
+ for (PdaResource pdaResource : pdaResources) {
+ if (Integer.parseInt(level) == 1) {
+ if (pdaResource.getLevel().equals(Short.valueOf(level))) {
+ results.add(pdaResource);
+ }
+ } else {
+ if (pdaResource.getLevel().equals(Short.valueOf(level)) && pdaResource.getResourceId().equals(id)) {
+ results.add(pdaResource);
+ }
+ }
+ }
+ return R.ok().add(results);
+ }
+
}
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index e7bcbd5..0309a4a 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -205,4 +205,12 @@
}
}
+ public static boolean isNumber(String str){
+ for (int i = str.length();--i>=0;){
+ if (!Character.isDigit(str.charAt(i))){
+ return false;
+ }
+ }
+ return true;
+ }
}
diff --git a/src/main/java/com/zy/system/controller/PdaResourceController.java b/src/main/java/com/zy/system/controller/PdaResourceController.java
new file mode 100644
index 0000000..25fee84
--- /dev/null
+++ b/src/main/java/com/zy/system/controller/PdaResourceController.java
@@ -0,0 +1,143 @@
+package com.zy.system.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.system.entity.PdaResource;
+import com.zy.system.entity.Resource;
+import com.zy.system.service.PdaResourceService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class PdaResourceController extends BaseController {
+
+ @Autowired
+ private PdaResourceService pdaResourceService;
+
+ @RequestMapping(value = "/pdaResource/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(pdaResourceService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/pdaResource/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<PdaResource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(PdaResource.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(pdaResourceService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/pdaResource/add/auth")
+ @ManagerAuth(memo = "鑿滃崟娣诲姞")
+ public R add(PdaResource pdaResource) {
+ pdaResourceService.insert(pdaResource);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pdaResource/update/auth")
+ @ManagerAuth
+ public R update(PdaResource pdaResource){
+ if (Cools.isEmpty(pdaResource) || null==pdaResource.getId()){
+ return R.error();
+ }
+ pdaResourceService.updateById(pdaResource);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pdaResource/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ pdaResourceService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pdaResource/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<PdaResource> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("pdaResource"));
+ convert(map, wrapper);
+ List<PdaResource> list = pdaResourceService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/pdaResourceQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<PdaResource> wrapper = new EntityWrapper<>();
+ wrapper.like("name", condition);
+ Page<PdaResource> page = pdaResourceService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (PdaResource pdaResource : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", pdaResource.getId());
+ map.put("value", pdaResource.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/pdaResource/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<PdaResource> wrapper = new EntityWrapper<PdaResource>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != pdaResourceService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(PdaResource.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pdaResource/tree/auth")
+ @ManagerAuth
+ public R tree(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<PdaResource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("sort");
+ }
+ return R.parse("0-鎿嶄綔鎴愬姛").add(pdaResourceService.selectList(wrapper));
+ }
+
+}
diff --git a/src/main/java/com/zy/system/controller/RolePdaResourceController.java b/src/main/java/com/zy/system/controller/RolePdaResourceController.java
new file mode 100644
index 0000000..2280911
--- /dev/null
+++ b/src/main/java/com/zy/system/controller/RolePdaResourceController.java
@@ -0,0 +1,125 @@
+package com.zy.system.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.system.entity.RolePdaResource;
+import com.zy.system.service.RolePdaResourceService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class RolePdaResourceController extends BaseController {
+
+ @Autowired
+ private RolePdaResourceService rolePdaResourceService;
+
+ @RequestMapping(value = "/rolePdaResource/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(rolePdaResourceService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/rolePdaResource/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<RolePdaResource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(RolePdaResource.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(rolePdaResourceService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/rolePdaResource/add/auth")
+ @ManagerAuth
+ public R add(RolePdaResource rolePdaResource) {
+ rolePdaResourceService.insert(rolePdaResource);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rolePdaResource/update/auth")
+ @ManagerAuth
+ public R update(RolePdaResource rolePdaResource){
+ if (Cools.isEmpty(rolePdaResource) || null==rolePdaResource.getId()){
+ return R.error();
+ }
+ rolePdaResourceService.updateById(rolePdaResource);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rolePdaResource/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ rolePdaResourceService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/rolePdaResource/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<RolePdaResource> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("rolePdaResource"));
+ convert(map, wrapper);
+ List<RolePdaResource> list = rolePdaResourceService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/rolePdaResourceQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<RolePdaResource> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<RolePdaResource> page = rolePdaResourceService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (RolePdaResource rolePdaResource : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", rolePdaResource.getId());
+ map.put("value", rolePdaResource.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/rolePdaResource/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<RolePdaResource> wrapper = new EntityWrapper<RolePdaResource>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != rolePdaResourceService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(RolePdaResource.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/system/entity/PdaResource.java b/src/main/java/com/zy/system/entity/PdaResource.java
new file mode 100644
index 0000000..117c210
--- /dev/null
+++ b/src/main/java/com/zy/system/entity/PdaResource.java
@@ -0,0 +1,131 @@
+package com.zy.system.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.system.service.ResourceService;
+import com.zy.system.entity.Resource;
+import com.baomidou.mybatisplus.annotations.TableField;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("sys_pda_resource")
+public class PdaResource implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鑿滃崟缂栫爜
+ */
+ @ApiModelProperty(value= "鑿滃崟缂栫爜")
+ private String code;
+
+ /**
+ * 鑿滃崟鍚嶇О
+ */
+ @ApiModelProperty(value= "鑿滃崟鍚嶇О")
+ private String name;
+
+ /**
+ * 鑿滃崟鏍囬
+ */
+ @ApiModelProperty(value= "鑿滃崟鏍囬")
+ private String title;
+
+ /**
+ * 鐖剁骇鑿滃崟
+ */
+ @ApiModelProperty(value= "鐖剁骇鑿滃崟")
+ @TableField("resource_id")
+ private Long resourceId;
+
+ /**
+ * 鑿滃崟绛夌骇 1: 涓�绾ц彍鍗� 2: 浜岀骇鑿滃崟
+ */
+ @ApiModelProperty(value= "鑿滃崟绛夌骇 1: 涓�绾ц彍鍗� 2: 浜岀骇鑿滃崟 ")
+ private Short level;
+
+ /**
+ * 鎺掑簭
+ */
+ @ApiModelProperty(value= "鎺掑簭")
+ private Integer sort;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Short status;
+
+ public PdaResource() {}
+
+ public PdaResource(String code,String name,String title,Long resourceId,Short level,Integer sort,Short status) {
+ this.code = code;
+ this.name = name;
+ this.title = title;
+ this.resourceId = resourceId;
+ this.level = level;
+ this.sort = sort;
+ this.status = status;
+ }
+
+// PdaResource pdaResource = new PdaResource(
+// null, // 鑿滃崟缂栫爜[闈炵┖]
+// null, // 鑿滃崟鍚嶇О[闈炵┖]
+// null, // 鑿滃崟鏍囬[闈炵┖]
+// null, // 鐖剁骇鑿滃崟
+// null, // 鑿滃崟绛夌骇[闈炵┖]
+// null, // 鎺掑簭
+// null // 鐘舵�乕闈炵┖]
+// );
+
+ public String getResourceId$(){
+ ResourceService service = SpringUtils.getBean(ResourceService.class);
+ Resource resource = service.selectById(this.resourceId);
+ if (!Cools.isEmpty(resource)){
+ return String.valueOf(resource.getName());
+ }
+ return null;
+ }
+
+ public String getLevel$(){
+ if (null == this.level){ return null; }
+ switch (this.level){
+ case 1:
+ return "涓�绾ц彍鍗�";
+ case 2:
+ return "浜岀骇鑿滃崟";
+ default:
+ return String.valueOf(this.level);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public Short getLevel() {
+ return level;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/system/entity/RolePdaResource.java b/src/main/java/com/zy/system/entity/RolePdaResource.java
new file mode 100644
index 0000000..28e3949
--- /dev/null
+++ b/src/main/java/com/zy/system/entity/RolePdaResource.java
@@ -0,0 +1,77 @@
+package com.zy.system.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.system.service.RoleService;
+import com.zy.system.entity.Role;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.service.PdaResourceService;
+import com.zy.system.entity.PdaResource;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("sys_role_pda_resource")
+public class RolePdaResource implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 瑙掕壊
+ */
+ @ApiModelProperty(value= "瑙掕壊")
+ @TableField("role_id")
+ private Long roleId;
+
+ /**
+ * pda鏉冮檺
+ */
+ @ApiModelProperty(value= "pda鏉冮檺")
+ @TableField("resource_id")
+ private Long resourceId;
+
+ public RolePdaResource() {}
+
+ public RolePdaResource(Long id,Long roleId,Long resourceId) {
+ this.roleId = roleId;
+ this.resourceId = resourceId;
+ }
+
+// RolePdaResource rolePdaResource = new RolePdaResource(
+// null, // 缂栧彿[闈炵┖]
+// null, // 瑙掕壊[闈炵┖]
+// null // pda鏉冮檺[闈炵┖]
+// );
+
+ public String getRoleId$(){
+ RoleService service = SpringUtils.getBean(RoleService.class);
+ Role role = service.selectById(this.roleId);
+ if (!Cools.isEmpty(role)){
+ return String.valueOf(role.getName());
+ }
+ return null;
+ }
+
+ public String getResourceId$(){
+ PdaResourceService service = SpringUtils.getBean(PdaResourceService.class);
+ PdaResource pdaResource = service.selectById(this.resourceId);
+ if (!Cools.isEmpty(pdaResource)){
+ return String.valueOf(pdaResource.getTitle());
+ }
+ return null;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/system/mapper/PdaResourceMapper.java b/src/main/java/com/zy/system/mapper/PdaResourceMapper.java
new file mode 100644
index 0000000..175bd36
--- /dev/null
+++ b/src/main/java/com/zy/system/mapper/PdaResourceMapper.java
@@ -0,0 +1,12 @@
+package com.zy.system.mapper;
+
+import com.zy.system.entity.PdaResource;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface PdaResourceMapper extends BaseMapper<PdaResource> {
+
+}
diff --git a/src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java b/src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java
new file mode 100644
index 0000000..16c993c
--- /dev/null
+++ b/src/main/java/com/zy/system/mapper/RolePdaResourceMapper.java
@@ -0,0 +1,12 @@
+package com.zy.system.mapper;
+
+import com.zy.system.entity.RolePdaResource;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface RolePdaResourceMapper extends BaseMapper<RolePdaResource> {
+
+}
diff --git a/src/main/java/com/zy/system/service/PdaResourceService.java b/src/main/java/com/zy/system/service/PdaResourceService.java
new file mode 100644
index 0000000..3ade2ee
--- /dev/null
+++ b/src/main/java/com/zy/system/service/PdaResourceService.java
@@ -0,0 +1,8 @@
+package com.zy.system.service;
+
+import com.zy.system.entity.PdaResource;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface PdaResourceService extends IService<PdaResource> {
+
+}
diff --git a/src/main/java/com/zy/system/service/RolePdaResourceService.java b/src/main/java/com/zy/system/service/RolePdaResourceService.java
new file mode 100644
index 0000000..8f4e984
--- /dev/null
+++ b/src/main/java/com/zy/system/service/RolePdaResourceService.java
@@ -0,0 +1,8 @@
+package com.zy.system.service;
+
+import com.zy.system.entity.RolePdaResource;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface RolePdaResourceService extends IService<RolePdaResource> {
+
+}
diff --git a/src/main/java/com/zy/system/service/impl/PdaResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/PdaResourceServiceImpl.java
new file mode 100644
index 0000000..bfda87e
--- /dev/null
+++ b/src/main/java/com/zy/system/service/impl/PdaResourceServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.system.service.impl;
+
+import com.zy.system.mapper.PdaResourceMapper;
+import com.zy.system.entity.PdaResource;
+import com.zy.system.service.PdaResourceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("pdaResourceService")
+public class PdaResourceServiceImpl extends ServiceImpl<PdaResourceMapper, PdaResource> implements PdaResourceService {
+
+}
diff --git a/src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java b/src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java
new file mode 100644
index 0000000..6651afd
--- /dev/null
+++ b/src/main/java/com/zy/system/service/impl/RolePdaResourceServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.system.service.impl;
+
+import com.zy.system.mapper.RolePdaResourceMapper;
+import com.zy.system.entity.RolePdaResource;
+import com.zy.system.service.RolePdaResourceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("rolePdaResourceService")
+public class RolePdaResourceServiceImpl extends ServiceImpl<RolePdaResourceMapper, RolePdaResource> implements RolePdaResourceService {
+
+}
diff --git a/src/main/resources/mapper/PdaResourceMapper.xml b/src/main/resources/mapper/PdaResourceMapper.xml
new file mode 100644
index 0000000..139aab8
--- /dev/null
+++ b/src/main/resources/mapper/PdaResourceMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.system.mapper.PdaResourceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.system.entity.PdaResource">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ <result column="title" property="title" />
+ <result column="resource_id" property="resourceId" />
+ <result column="level" property="level" />
+ <result column="sort" property="sort" />
+ <result column="status" property="status" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/RolePdaResourceMapper.xml b/src/main/resources/mapper/RolePdaResourceMapper.xml
new file mode 100644
index 0000000..08e5d14
--- /dev/null
+++ b/src/main/resources/mapper/RolePdaResourceMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.system.mapper.RolePdaResourceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.system.entity.RolePdaResource">
+ <result column="id" property="id" />
+ <result column="role_id" property="roleId" />
+ <result column="resource_id" property="resourceId" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/image/logo1.png b/src/main/webapp/static/image/logo1.png
new file mode 100644
index 0000000..71dd632
--- /dev/null
+++ b/src/main/webapp/static/image/logo1.png
Binary files differ
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 771480f..cd04891 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,6 +44,9 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
+ {field: 'defNumber', align: 'center', title: '鎿嶄綔绯荤粺鍙�', hide: false, width: 120},
+ {field: '鎿嶄綔鍗曟嵁', align: 'center', title: '鎿嶄綔鍗曟嵁', hide: true},
+ {field: '鎿嶄綔绫诲瀷', align: 'center', title: '鎿嶄綔绫诲瀷', hide: true},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
//{field: 'itemName', align: 'center', title: '鏍哥畻涓讳綋'},
{field: 'docType$', align: 'center', title: '鍗曟嵁绫诲瀷'},
@@ -51,6 +54,7 @@
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿'},
+ {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', hide: true},
@@ -58,7 +62,7 @@
{field: 'tel', align: 'center',title: '浠撳簱', hide: true},
{field: 'operMemb', align: 'center',title: '鍑哄叆搴撶被鍒�', hide: true},
{field: 'salesman', align: 'center',title: '閮ㄩ棬', hide: true},
- {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: true},
+
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
diff --git a/src/main/webapp/static/js/pdaResource/pdaResource.js b/src/main/webapp/static/js/pdaResource/pdaResource.js
new file mode 100644
index 0000000..023dc6d
--- /dev/null
+++ b/src/main/webapp/static/js/pdaResource/pdaResource.js
@@ -0,0 +1,252 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#pdaResource',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/pdaResource/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{field: 'code', align: 'center',title: '鑿滃崟缂栫爜'}
+ ,{field: 'name', align: 'center',title: '鑿滃崟鍚嶇О'}
+ ,{field: 'title', align: 'center',title: '鑿滃崟鏍囬'}
+ ,{field: 'resourceId$', align: 'center',title: '鐖剁骇鑿滃崟'}
+ ,{field: 'level$', align: 'center',title: '鑿滃崟绛夌骇'}
+ ,{field: 'sort', align: 'center',title: '鎺掑簭'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(pdaResource)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(pdaResource)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'pdaResource': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/pdaResource/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(pdaResource)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/pdaResource/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/pdaResource/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/role/role.js b/src/main/webapp/static/js/role/role.js
index 3bdce29..f117ca0 100644
--- a/src/main/webapp/static/js/role/role.js
+++ b/src/main/webapp/static/js/role/role.js
@@ -7,6 +7,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
+ console.log(res)
if (res.code === 200){
powerTreeData = res.data;
} else if (res.code === 403){
diff --git a/src/main/webapp/static/js/role/rolePower.js b/src/main/webapp/static/js/role/rolePower.js
index 212e2ba..bf7cd8d 100644
--- a/src/main/webapp/static/js/role/rolePower.js
+++ b/src/main/webapp/static/js/role/rolePower.js
@@ -12,7 +12,7 @@
data: parent.powerTreeData,
isJump: true
});
-
+ console.log(parent.powerTreeData)
loadPower();
function loadPower(){
$.ajax({
@@ -39,13 +39,16 @@
form.on('submit(save)', function () {
var param = [];
var checkData = tree.getChecked('powerTree');
+ console.log(checkData)
checkData.map(function (obj) {
obj.children.map(function (resource) {
-
+ //console.log(resource)
var childrens = [];
- resource.children.map(function (resource) {
- childrens.push(resource.id);
- });
+ if (resource.children) {
+ resource.children.map(function (resource) {
+ childrens.push(resource.id);
+ });
+ }
var one = {
'two': resource.id,
'three': childrens
diff --git a/src/main/webapp/static/js/rolePdaResource/rolePdaResource.js b/src/main/webapp/static/js/rolePdaResource/rolePdaResource.js
new file mode 100644
index 0000000..4ecd9d5
--- /dev/null
+++ b/src/main/webapp/static/js/rolePdaResource/rolePdaResource.js
@@ -0,0 +1,247 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#rolePdaResource',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/rolePdaResource/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '缂栧彿'}
+ ,{field: 'roleId$', align: 'center',title: '瑙掕壊'}
+ ,{field: 'resourceId$', align: 'center',title: 'pda鏉冮檺'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(rolePdaResource)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(rolePdaResource)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'rolePdaResource': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/rolePdaResource/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(rolePdaResource)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/rolePdaResource/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/rolePdaResource/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 872d1aa..e8e681d 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -25,7 +25,7 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
- <img src="../static/image/logo.png" style="display: inline-block; width: 60%;height: auto">
+ <img src="../static/image/logo1.png" style="display: inline-block; width: 60%;height: auto">
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
<!-- <img src="../static/image/logo.svg"/>-->
<!-- <cite>涓壃 - Zoneyung</cite>-->
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 295f9c6..b2d5d1b 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -52,7 +52,7 @@
z-index: 100;
top: 22px;
left: 20px;">
- <img src="../static/image/logo.png" alt="" style="width: 20%">
+ <img src="../static/image/logo2.png" alt="" style="width: 20%">
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
@@ -66,7 +66,7 @@
<div id="sidebar">
<div class="login-contain">
<div class="login-box">
- <img src="../static/image/logo.png" alt="" style="width: 80%">
+ <img src="../static/image/logo1.png" alt="" style="width: 80%">
<!-- <span class="login100-form-title p-t-20 p-b-45">涓壃绔嬪簱</span>-->
<!-- <span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>-->
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
diff --git a/src/main/webapp/views/pdaResource/pdaResource.html b/src/main/webapp/views/pdaResource/pdaResource.html
new file mode 100644
index 0000000..bcff1ed
--- /dev/null
+++ b/src/main/webapp/views/pdaResource/pdaResource.html
@@ -0,0 +1,318 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ #detail {
+ padding: 25px 30px 0 0;
+ }
+ .ew-tree-table-box {
+ height: 100%;
+ }
+ </style>
+</head>
+<body>
+
+
+<!-- 姝ｆ枃寮�濮� -->
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <!-- 鏁版嵁琛ㄦ牸 -->
+ <table id="resource"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-del" lay-event="del">鍒犻櫎</a>
+</script>
+
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form" style="margin: 0">
+ <input name="id" type="hidden">
+ <input name="uuid" type="hidden">
+ <input name="level" type="hidden">
+ <div class="layui-row">
+
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓婄骇鑿滃崟</label>
+ <div class="layui-input-block">
+ <div id="resourceParentSel" class="ew-xmselect-tree"></div>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鑿滃崟缂栫爜</label>
+ <div class="layui-input-block">
+ <input name="code" placeholder="璇疯緭鍏ヨ彍鍗曠紪鐮�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="level" lay-vertype="tips" lay-verify="required" required="">
+ <option value="">璇烽�夋嫨绫诲瀷</option>
+ <option value="1">涓�绾ц彍鍗�</option>
+ <option value="2">浜岀骇鑿滃崟</option>
+ <option value="3">鎸夐挳</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鐘舵��</label>
+ <div class="layui-input-block">
+ <select name="status" lay-vertype="tips" lay-verify="required" required="">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="layui-col-md6">
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鑿滃崟鏍囬</label>
+ <div class="layui-input-block">
+ <input name="title" placeholder="璇疯緭鍏ヨ彍鍗曟爣棰�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鑿滃崟鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="name" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎺掑簭</label>
+ <div class="layui-input-block">
+ <input name="sort" placeholder="璇疯緭鍏ユ帓搴�" class="layui-input" lay-verify="number">
+ </div>
+ </div>
+
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+<script type="text/html" id="typeTpl">
+ {{# if( d.level === 1 ){ }}
+ <span name="level" class="layui-badge layui-badge-green">鑿滃崟</span>
+ {{# } else if(d.level === 2){ }}
+ <span name="level" class="layui-badge layui-badge-green">鑿滃崟</span>
+ {{# } else if(d.level === 3){ }}
+ <span name="level" class="layui-badge layui-badge-gray">鎸夐挳</span>
+ {{# } }}
+</script>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+
+<script>
+ layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+ }).use(['form','treeTable', 'admin', 'xmSelect'], function() {
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+ var admin = layui.admin;
+ var treeTable = layui.treeTable;
+ var xmSelect = layui.xmSelect;
+ var tbDataList = [];
+
+ var insTb = treeTable.render({
+ elem: '#resource',
+ url: baseUrl+'/pdaResource/tree/auth',
+ headers: {token: localStorage.getItem('token')},
+ height: 'full-200',
+ toolbar: ['<p>',
+ '<button lay-event="add" class="layui-btn layui-btn-sm icon-btn"><i class="layui-icon"></i>娣诲姞</button> ',
+ '<button lay-event="del" class="layui-btn layui-btn-sm layui-btn-danger icon-btn"><i class="layui-icon"></i>鍒犻櫎</button>',
+ '</p>'].join(''),
+ tree: {
+ iconIndex: 2, // 鎶樺彔鍥炬爣鏄剧ず鍦ㄧ鍑犲垪
+ isPidData: true, // 鏄惁鏄痠d銆乸id褰㈠紡鏁版嵁
+ idName: 'id', // id瀛楁鍚嶇О
+ pidName: 'resourceId' // pid瀛楁鍚嶇О
+ },
+ cols: [[
+ {type: 'checkbox', fixed: 'left'}
+ ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80, hide: true}
+ ,{field: 'name', align: 'left',title: '鑿滃崟鍚嶇О'}
+ ,{field: 'title', align: 'left',title: '鑿滃崟鏍囬'}
+ ,{field: 'code', align: 'center',title: '鑿滃崟缂栫爜'}
+ // ,{field: 'resourceName', align: 'center',title: '鐖剁骇鑿滃崟'}
+ // ,{field: 'level$', align: 'center',title: '鑿滃崟绛夌骇'}
+ ,{field: 'type', align: 'center',title: '绫诲瀷', templet: '#typeTpl', width: 120}
+ ,{field: 'sort', align: 'center',title: '鎺掑簭'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ done: function (data) {
+ $('.ew-tree-table-box').css('height', '100%');
+ // insTb.expandAll();
+ tbDataList = data;
+ limit();
+ }
+ });
+
+ /* 琛ㄦ牸澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
+ treeTable.on('toolbar(resource)', function (obj) {
+ if (obj.event === 'add') { // 娣诲姞
+ showEditModel();
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ var checkRows = insTb.checkStatus();
+ if (checkRows.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkRows.map(function (d) {
+ if (!d.LAY_INDETERMINATE) {
+ return d.id;
+ } else {
+ return null;
+ }
+ });
+ doDel({ids: ids});
+ }
+ });
+
+ /* 琛ㄦ牸鎿嶄綔鍒楃偣鍑讳簨浠� */
+ treeTable.on('tool(resource)', function (obj) {
+ if (obj.event === 'edit') { // 淇敼
+ showEditModel(obj.data);
+ } else if (obj.event === 'del') { // 鍒犻櫎
+ doDel(obj);
+ }
+ });
+
+ /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '鑿滃崟',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('detail', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editSubmit)', function (data) {
+ data.field.resourceId = insXmSel.getValue('valueStr');
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/pdaResource/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ setTimeout(function () {
+ insTb.expand(data.field.resourceId);
+ }, 200)
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+
+ // 娓叉煋涓嬫媺鏍�
+ var insXmSel = xmSelect.render({
+ el: '#resourceParentSel',
+ height: '250px',
+ data: insTb.options.data,
+ initValue: mData&&mData.resourceId!=null ? [mData.resourceId] : [],
+ model: {label: {type: 'text'}},
+ prop: {
+ name: 'name',
+ value: 'id'
+ },
+ radio: true,
+ clickClose: true,
+ tree: {
+ show: true,
+ indent: 15,
+ strict: false,
+ expandedKeys: false
+ }
+ });
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function doDel(obj) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ var ids;
+ if (obj.data) {
+ ids = [];
+ ids[0] = obj.data.id;
+ } else {
+ ids = obj.ids;
+ }
+ $.ajax({
+ url: baseUrl+"/pdaResource/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ insTb.refresh();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ });
+</script>
+</body>
+</html>
+
diff --git a/src/main/webapp/views/rolePdaResource/rolePdaResource.html b/src/main/webapp/views/rolePdaResource/rolePdaResource.html
new file mode 100644
index 0000000..3f15c36
--- /dev/null
+++ b/src/main/webapp/views/rolePdaResource/rolePdaResource.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="rolePdaResource" lay-filter="rolePdaResource"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/rolePdaResource/rolePdaResource.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="id" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瑙掕壊: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="roleId" placeholder="璇疯緭鍏ヨ鑹�" lay-vertype="tips" lay-verify="required" style="display: none">
+ <input id="roleId$" name="roleId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鑹�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="roleQueryByroleId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="roleQueryByroleIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">pda鏉冮檺: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="resourceId" placeholder="璇疯緭鍏da鏉冮檺" lay-vertype="tips" lay-verify="required" style="display: none">
+ <input id="resourceId$" name="resourceId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏da鏉冮檺" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="pdaResourceQueryByresourceId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="pdaResourceQueryByresourceIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1