From 57e23c353a177b9c003a2f524a2adeaf641e2e4c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 16 八月 2024 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
index f53228e..dabce8c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ShelvesRuleController.java
@@ -5,6 +5,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.ShelvesRuleDetl;
+import com.zy.asrs.wms.asrs.service.ShelvesRuleDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -15,6 +18,7 @@
import com.zy.asrs.wms.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -26,6 +30,8 @@
@Autowired
private ShelvesRuleService shelvesRuleService;
+ @Autowired
+ private ShelvesRuleDetlService shelvesRuleDetlService;
@PreAuthorize("hasAuthority('asrs:shelvesRule:list')")
@PostMapping("/shelvesRule/page")
@@ -55,10 +61,21 @@
return R.error("缂哄皯鍙傛暟");
}
ShelvesRule shelvesRule = new ShelvesRule();
+ shelvesRule.setName(param.get("name").toString());
shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
if (!shelvesRuleService.save(shelvesRule)) {
- return R.error("娣诲姞澶辫触");
+ throw new CoolException("娣诲姞澶辫触");
+ }
+
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
}
return R.ok("娣诲姞鎴愬姛");
}
@@ -66,6 +83,7 @@
@PreAuthorize("hasAuthority('asrs:shelvesRule:update')")
@OperationLog("淇敼涓婃灦瑙勫垯")
@PostMapping("/shelvesRule/update")
+ @Transactional
public R update(@RequestBody HashMap<String, Object> param) {
if(!param.containsKey("ruleType") || !param.containsKey("laneList") || !param.containsKey("id")) {
return R.error("缂哄皯鍙傛暟");
@@ -76,11 +94,25 @@
return R.error("涓婃灦瑙勫垯涓嶅瓨鍦�");
}
+ shelvesRule.setName(param.get("name").toString());
shelvesRule.setRuleType(Integer.parseInt(param.get("ruleType").toString()));
shelvesRule.setLane(JSON.toJSONString(param.get("laneList")));
+ shelvesRule.setStatus(Integer.parseInt(param.get("status").toString()));
if (!shelvesRuleService.updateById(shelvesRule)) {
- return R.error("淇敼澶辫触");
+ throw new CoolException("淇敼澶辫触");
}
+
+ shelvesRuleDetlService.remove(new LambdaQueryWrapper<ShelvesRuleDetl>().eq(ShelvesRuleDetl::getRuleId, shelvesRule.getId()));
+ List<Integer> detls = JSON.parseArray(JSON.toJSONString(param.get("detls")), Integer.class);
+ for (Integer detlType : detls) {
+ ShelvesRuleDetl shelvesRuleDetl = new ShelvesRuleDetl();
+ shelvesRuleDetl.setRuleId(shelvesRule.getId());
+ shelvesRuleDetl.setDetlType(detlType);
+ if (!shelvesRuleDetlService.save(shelvesRuleDetl)) {
+ throw new CoolException("娣诲姞瑙勫垯鏄庣粏澶辫触");
+ }
+ }
+
return R.ok("淇敼鎴愬姛");
}
--
Gitblit v1.9.1