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 | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 5688b5d..d5377c7 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -11,7 +11,6 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.microsoft.sqlserver.jdbc.SQLServerException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
@@ -21,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;
@@ -29,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
@@ -55,6 +60,34 @@
@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")
@ManagerAuth
@@ -68,6 +101,11 @@
if (!Cools.isEmpty(param.get("brand"))) {
wrapper.eq("brand", param.get("brand"));
param.remove("brand");
+ }
+ // 浠撳簱绮剧‘鍖归厤
+ if (!Cools.isEmpty(param.get("stash"))) {
+ wrapper.eq("stash", param.get("stash"));
+ param.remove("stash");
}
// 娌℃湁閫夋嫨鐨勬椂鍊欓粯璁や笉鏄剧ず宸插嚭搴撶殑鐗╂枡
if (Cools.isEmpty(param.get("status"))) {
@@ -89,7 +127,7 @@
@RequestMapping(value = "/pla/add/auth")
@ManagerAuth
public R add(@RequestBody List<Pla> plas) {
- System.out.println(plas.toString());
+ log.info(plas.toString());
plas.forEach(pla -> {
plaService.insert(pla);
});
@@ -99,7 +137,48 @@
@RequestMapping(value = "/pla/update/auth")
@ManagerAuth
public R update(@RequestBody List<Pla> plas) {
- System.out.println(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());
@@ -108,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();
@@ -119,7 +208,7 @@
@RequestMapping(value = "/pla/delete/auth")
@ManagerAuth
public R delete(@RequestBody List<Pla> plas) {
- System.out.println(plas.toString());
+ log.info(plas.toString());
plas.forEach(pla -> {
if (!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_1)) {
throw new CoolException("宸插叆搴撶殑鏁版嵁鏃犳硶琚垹闄�");
@@ -146,7 +235,7 @@
}
@RequestMapping(value = "/pla/sellout/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "sellout")
@Transactional
@Synchronized
public R sellout(@RequestBody List<Pla> plas) {
@@ -158,10 +247,14 @@
OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);
for (Pla pla : plas) {
-
+ // 鑾峰彇鏈�鏂板喕缁撶姸鎬�
+ Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze,stock_freeze_by as stockFreezeBy,stock_freeze_date as stockFreezeDate").eq("id", pla.getId()));
+ pla.setStockFreeze(pla1.getStockFreeze());
+ pla.setStockFreezeBy(pla1.getStockFreezeBy());
+ pla.setStockFreezeDate(pla1.getStockFreezeDate());
if (pla.getStockFreeze() == 0) {
// throw new CoolException("搴撳瓨宸茶鍐荤粨锛岃閲嶆柊閫夋嫨搴撳瓨");
- System.out.println(pla.getStockFreezeBy() + "," + getUser().getUsername());
+ log.info("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨;{},{}", pla.getStockFreezeBy(), getUser().getUsername());
if (!Cools.eq(pla.getStockFreezeBy(), getUser().getUsername())) {
throw new CoolException("璇ュ簱瀛樺凡琚叾浠栫敤鎴峰喕缁擄紝璇烽噸鏂伴�夋嫨");
}
@@ -172,9 +265,13 @@
if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
throw new CoolException("鎵瑰彿:" + pla.getBatch() + "锛屽寘鍙�:" + pla.getPackageNo() + " 鍓╀綑鍙嚭搴撻噸閲忎笉瓒筹紝璇疯皟鏁村嚭搴撻噸閲�");
}
+ 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);
pla.setModifyTime(new Date());
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
@@ -366,9 +463,14 @@
.andNew().like("batch", condition)
.groupBy("batch")
.orderBy("batch", false);
- List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
+ Page<Pla> plaPage = new Page<>(1, 30);
+ plaPage.setSearchCount(false);
+ Page<Pla> plaPage1 = plaService.selectPage(plaPage, wrapper);
+ // 閲嶆柊鏌ヨ鐒跺悗缁檖age璁剧疆Total
+ plaPage.setTotal(this.plaService.selectCount(new EntityWrapper<Pla>().setSqlSelect("batch")
+ .andNew().like("batch", condition)));
List<KeyValueVo> valueVos = new ArrayList<>();
- for (Pla pla : plas) {
+ for (Pla pla : plaPage1.getRecords()) {
KeyValueVo vo = new KeyValueVo();
vo.setName(pla.getBatch());
vo.setValue(pla.getBatch());
--
Gitblit v1.9.1