From fc06a66b6ec47ae489f1cba3340b273054093c37 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 十二月 2025 09:56:46 +0800
Subject: [PATCH] 添加修改按钮
---
src/main/java/com/zy/asrs/controller/PlaController.java | 49 +++++++++++++++++++++++-
src/main/webapp/views/pla/plaDetl.html | 3 +
src/main/webapp/static/js/pla/plaDetl.js | 27 +++++++++++++
src/main/webapp/views/pla3/plaDetl.html | 3 +
src/main/webapp/views/pla2/plaDetl.html | 3 +
5 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index c91151c..d5377c7 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -20,8 +20,10 @@
import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
+import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -60,6 +62,8 @@
@Resource
private OperateLogService operateLogService;
+ @Autowired
+ private ConfigServiceImpl configService;
// 鑾峰彇涓嬫媺閫夋嫨妗嗗�煎垪琛�
@GetMapping(value = "/pla/dropdownValues/list")
@@ -133,6 +137,47 @@
@RequestMapping(value = "/pla/update/auth")
@ManagerAuth
public R update(@RequestBody List<Pla> plas) {
+ Date date = new Date();
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "pla_status"));
+ String value;
+ if (config != null && config.getStatus() == 1) {
+ value = config.getValue();
+ } else {
+ value = "";
+ }
+ plas.forEach(pla -> {
+ Pla plaSave = plaService.selectById(pla.getId());
+ String status = plaSave.getStatus();
+ if (status != null && !Cools.isEmpty(value) && value.indexOf(status) == -1) {
+ throw new CoolException("淇敼" + plaSave.getBatch() + "鎵瑰彿鏉冮檺涓嶈冻锛岃鑱旂郴绠＄悊鍛樿繘琛屼慨鏀�");
+ }
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+
+ PlaLog plaLog = new PlaLog();
+ BeanUtils.copyProperties(plaSave, plaLog);
+ plaLog.setId(null);
+ plaLog.setCreateTime(date);
+ plaLog.setModifyUser(getUser().getUsername());
+ plaLogService.insert(plaLog);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("鑱氫钩閰稿簱瀛樻槑缁嗕慨鏀�");
+ operateLog.setUserId(getUserId());
+ operateLog.setIp(request.getRemoteAddr());
+ operateLog.setRequest(pla.toString());
+ operateLog.setResponse(plaSave.toString());
+ operateLog.setCreateTime(new Date());
+ operateLogService.insert(operateLog);
+
+ });
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pla/updateByAdmin/auth")
+ @ManagerAuth
+ public R updateByAdmin(@RequestBody List<Pla> plas) {
Date date = new Date();
plas.forEach(pla -> {
Pla plaSave = plaService.selectById(pla.getId());
@@ -220,13 +265,13 @@
if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
throw new CoolException("鎵瑰彿:" + pla.getBatch() + "锛屽寘鍙�:" + pla.getPackageNo() + " 鍓╀綑鍙嚭搴撻噸閲忎笉瓒筹紝璇疯皟鏁村嚭搴撻噸閲�");
}
- if (Cools.isEmpty(pla.getMassState())){
+ if (Cools.isEmpty(pla.getMassState())) {
throw new CoolException("璐ㄩ噺鎸囨爣涓轰笂浼�");
}
pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
pla.setHandlerBy(getUser().getUsername());
pla.setStatus(GlobleParameter.PLA_STATUS_2);
- log.info("淇敼涓哄緟鍑哄簱锛屽湴鍧�锛歿},鏁版嵁:{}","/pla/sellout/auth", pla);
+ log.info("淇敼涓哄緟鍑哄簱锛屽湴鍧�锛歿},鏁版嵁:{}", "/pla/sellout/auth", pla);
pla.setModifyTime(new Date());
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 57e768e..5d0f8a7 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -387,6 +387,33 @@
});
}
break;
+ case 'updateDataByAdmin':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾淇敼'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/updateByAdmin/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ 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 "deleteData":
var data = checkStatus.data;
if (data.length === 0){
diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index e4d443f..353a490 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -346,6 +346,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">淇敼</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">绠＄悊鍛樹慨鏀�</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">鏍￠獙</button>
<button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">鍐荤粨</button>
<button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">瑙ｅ喕</button>
@@ -396,7 +397,7 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
diff --git a/src/main/webapp/views/pla2/plaDetl.html b/src/main/webapp/views/pla2/plaDetl.html
index 69de4d5..53dd2a9 100644
--- a/src/main/webapp/views/pla2/plaDetl.html
+++ b/src/main/webapp/views/pla2/plaDetl.html
@@ -328,6 +328,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">淇敼</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">绠＄悊鍛樹慨鏀�</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">鏍￠獙</button>
<button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">鍐荤粨</button>
<button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">瑙ｅ喕</button>
@@ -378,7 +379,7 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=1" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
diff --git a/src/main/webapp/views/pla3/plaDetl.html b/src/main/webapp/views/pla3/plaDetl.html
index af96acf..8c2f591 100644
--- a/src/main/webapp/views/pla3/plaDetl.html
+++ b/src/main/webapp/views/pla3/plaDetl.html
@@ -328,6 +328,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">淇敼</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">绠＄悊鍛樹慨鏀�</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">鏍￠獙</button>
<button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">鍐荤粨</button>
<button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">瑙ｅ喕</button>
@@ -378,7 +379,7 @@
<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/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
--
Gitblit v1.9.1