From fef3b0760b7394847f143151e8bdce238290e1dc Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 12:36:32 +0800
Subject: [PATCH] Revert "#"
---
src/main/webapp/views/locMast/locMast.html | 34 ++++++-
src/main/java/com/zy/asrs/controller/LocMastController.java | 46 +++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ---
src/main/java/com/zy/asrs/controller/MobileController.java | 9 --
src/main/webapp/static/js/locMast/locMast.js | 56 +++++++++++++
src/main/java/com/zy/asrs/entity/LocMast.java | 18 +++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 ++
src/main/java/com/zy/asrs/service/MobileService.java | 2
8 files changed, 152 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index a5aea8f..4b17fd5 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -204,4 +204,50 @@
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
+ @RequestMapping(value = "/locMast/disableALL/auth")
+ @ManagerAuth(memo = "绂佺敤鎸囧畾璁惧鍙峰簱浣�")
+ public R disableALL(@RequestParam String param){
+ return updateAll(param,"O");
+ }
+ @RequestMapping(value = "/locMast/openAll/auth")
+ @ManagerAuth(memo = "鎵撳紑鎸囧畾璁惧鍙峰簱浣�")
+ public R openAll(@RequestParam String param){
+ return updateAll(param,"X");
+ }
+
+ private R updateAll(String param,String locSts){
+ List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ int locType2=99;
+ for (LocMast locMast : list){
+ if (!locMast.getLocSts().equals(locSts)){
+ if (locSts.equals("O")){
+ return R.error("姝よ澶囦笅鏈夊簱浣嶉潪绌�,搴撲綅鍙凤細"+locMast.getLocNo()+"\t璇锋煡鐪嬪簱浣�");
+ }else if (locSts.equals("X")){
+ return R.error("姝よ澶囦笅鏈夊簱浣嶉潪绂佺敤鐘舵��,搴撲綅鍙凤細"+locMast.getLocNo()+"\t璇锋煡鐪嬪簱浣�");
+ }
+ }else if (locType2==99){
+ locType2 = locMast.getLocType2();
+ }else if(locType2 != locMast.getLocType2()){
+ return R.error("璇烽�夋嫨鍚屼竴璁惧鍙蜂笅鐨勫簱浣�");
+ }
+ }
+ if (locSts.equals("O")){
+ locSts="X";
+ }else if (locSts.equals("X")){
+ locSts="O";
+ }
+ for (LocMast locMast : list){
+ if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
+ return R.error("搴撲綅鍙蜂负绌猴細"+locMast);
+ }
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(new Date());
+ locMast.setLocSts(locSts);
+ locMastService.updateById(locMast);
+ }
+ return R.ok();
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ab34b49..08ee0f9 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -338,15 +338,6 @@
mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
return R.ok();
}
- @PostMapping("/test/transplant/auth")
- @ManagerAuth(memo = "绉诲簱纭")
- public synchronized R transplant(@RequestBody Review review) {
- if (Cools.isEmpty(review)) {
- return R.parse(BaseRes.PARAM);
- }
- mobileService.transplant(review); //绉诲簱纭
- return R.ok();
- }
@PostMapping("/test/suspend/auth")
// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
public synchronized R suspendTestPACK() {
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 28c709e..1f3c032 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -230,9 +230,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "娴嬭瘯搴撲綅";
case 2:
- return "楂樺簱浣�";
+ return "闈欑疆搴撲綅";
default:
return String.valueOf(this.locType1);
}
@@ -242,11 +242,19 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 0:
- return "鏈煡";
+ return "鏃犺澶�";
case 1:
- return "绐勫簱浣�";
+ return "1鍙疯澶�";
case 2:
- return "瀹藉簱浣�";
+ return "2鍙疯澶�";
+ case 3:
+ return "3鍙疯澶�";
+ case 4:
+ return "4鍙疯澶�";
+ case 5:
+ return "5鍙疯澶�";
+ case 6:
+ return "6鍙疯澶�";
default:
return String.valueOf(this.locType2);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 4b2b107..37b340e 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -40,7 +40,5 @@
void startUpTestPACK(TestMast testMast);
//鏆傚仠娴嬭瘯
void suspendTestPACK();
- //绉诲簱纭
- void transplant(Review review);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 7ef3992..f9bc14d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -729,19 +729,5 @@
}
return SUCCESS;
}
- @Transactional
- public void transplant(Review review){
- //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
- LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1",2)
- .eq("loc_sts","O")
- .eq("fire_status", 0)
- .eq("pack_status",0));
- if (targetLocNo != null){
- workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
- }else {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- }
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 17c3248..b2d00ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -678,7 +678,17 @@
} else {
throw new CoolException("鐘舵�佸紓甯�");
}
-
+ //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
+ LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1",2)
+ .eq("loc_sts","O")
+ .eq("fire_status", 0)
+ .eq("pack_status",0));
+ if (targetLocNo != null){
+ workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
+ }else {
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
return success;
}
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 1f3d18e..a823f63 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -25,12 +25,14 @@
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', hide:false}
,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', hide:false}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'locType2$', align: 'center',title: '娴嬭瘯璁惧鍙�'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ // ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
,{field: 'lev1', align: 'center',title: '灞�', sort:true}
@@ -231,6 +233,58 @@
})
});
break;
+ case 'disableALL':
+ var data = checkStatus.data;
+ if (data.length !=8 ){
+ layer.msg('璇烽�夋嫨姝よ澶囨墍鏈夋暟鎹啀杩涜绂佺敤鎿嶄綔');
+ } else {
+ layer.confirm('纭畾绂佺敤'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/locMast/disableALL/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'openAll':
+ var data = checkStatus.data;
+ if (data.length !=8 ){
+ layer.msg('璇烽�夋嫨姝よ澶囨墍鏈夋暟鎹啀杩涜鍚敤鎿嶄綔');
+ } else {
+ layer.confirm('纭畾鍚敤'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/locMast/openAll/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
}
});
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 6f4b17d..4ed082d 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -17,7 +17,6 @@
position: relative;
overflow: visible !important;
}
-
</style>
</head>
<body>
@@ -60,6 +59,21 @@
<input class="layui-input" type="text" name="lev1" placeholder="灞�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="loc_type2" id="loc_type2" class="layui-input" type="text" placeholder="璁惧鍙�" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value="">璁惧鍙�</option>
+ <option value="0">闈欑疆搴撲綅</option>
+ <option value="1">1鍙疯澶�</option>
+ <option value="2">2鍙疯澶�</option>
+ <option value="3">3鍙疯澶�</option>
+ <option value="4">4鍙疯澶�</option>
+ <option value="5">5鍙疯澶�</option>
+ <option value="6">6鍙疯澶�</option>
+ </select>
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -76,6 +90,8 @@
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">鍒濆鍖�</button>
+ <button class="layui-btn layui-btn-primary" id="disable-ALL" lay-event="disableALL">鎵�閫夊叏閮ㄧ鐢�</button>
+ <button class="layui-btn layui-btn-primary" id="open-All" lay-event="openAll">鎵�閫夊叏閮ㄦ墦寮�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
@@ -142,24 +158,28 @@
</div>
<!-- 搴撲綅绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label">楂樹綆绫诲瀷</label>
+ <label class="layui-form-label">搴撲綅绫诲瀷</label>
<div class="layui-input-inline">
<select name="locType1">
<option style="display: none"></option>
<option value="0">鏈煡</option>
- <option value="1">浣庡簱浣�</option>
- <option value="2">楂樺簱浣�</option>
+ <option value="1">娴嬭瘯搴撲綅</option>
+ <option value="2">闈欑疆搴撲綅</option>
</select>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">瀹界獎绫诲瀷</label>
+ <label class="layui-form-label">璁惧鍙�</label>
<div class="layui-input-inline">
<select name="locType2">
<option style="display: none"></option>
<option value="0">鏈煡</option>
- <option value="1">绐勫簱浣�</option>
- <option value="2">瀹藉簱浣�</option>
+ <option value="1">1鍙疯澶�</option>
+ <option value="2">2鍙疯澶�</option>
+ <option value="3">3鍙疯澶�</option>
+ <option value="4">4鍙疯澶�</option>
+ <option value="5">5鍙疯澶�</option>
+ <option value="6">6鍙疯澶�</option>
</select>
</div>
</div>
--
Gitblit v1.9.1