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 | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 84840d9..d5377c7 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -20,6 +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;
@@ -28,10 +32,12 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Slf4j
@@ -53,6 +59,34 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Resource
+ private OperateLogService operateLogService;
+ @Autowired
+ private ConfigServiceImpl configService;
+
+ // 鑾峰彇涓嬫媺閫夋嫨妗嗗�煎垪琛�
+ @GetMapping(value = "/pla/dropdownValues/list")
+ @ManagerAuth
+ public R list() {
+ List<DropdownValuesDto> list = plaService.getDropdownValues();
+ Map<String, List<String>> map = new HashMap<>();
+
+ // owner 鍘婚噸骞跺姞鍏� map
+ List<String> owners = list.stream()
+ .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("owner"))
+ .map(DropdownValuesDto::getValue)
+ .collect(Collectors.toList());
+ map.put("owner", owners);
+
+ // workshop 鍘婚噸骞跺姞鍏� map
+ List<String> workshops = list.stream()
+ .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("workshop"))
+ .map(DropdownValuesDto::getValue)
+ .collect(Collectors.toList());
+ map.put("workshop", workshops);
+ return R.ok(map);
+ }
@RequestMapping(value = "/pla/list/auth")
@@ -103,7 +137,48 @@
@RequestMapping(value = "/pla/update/auth")
@ManagerAuth
public R update(@RequestBody List<Pla> plas) {
- log.info(plas.toString());
+ 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());
pla.setModifyTime(new Date());
@@ -112,9 +187,19 @@
PlaLog plaLog = new PlaLog();
BeanUtils.copyProperties(plaSave, plaLog);
plaLog.setId(null);
- plaLog.setCreateTime(new Date());
+ 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();
@@ -180,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.warn("淇敼涓哄緟鍑哄簱锛屽湴鍧�锛歿},鏁版嵁:{}","/pla/sellout/auth", pla);
+ log.info("淇敼涓哄緟鍑哄簱锛屽湴鍧�锛歿},鏁版嵁:{}", "/pla/sellout/auth", pla);
pla.setModifyTime(new Date());
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
--
Gitblit v1.9.1