From cb2ef0d32782054eaf0a5c00290e049aaca84fd5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 27 八月 2021 10:22:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index 77b9c66..1ebf34e 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -9,29 +9,33 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.service.MatCodeService;
+import com.zy.common.entity.KeyValueVo;
import com.zy.common.web.BaseController;
import com.zy.ints.entity.WaitMatin;
import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class WaitMatinController extends BaseController {
@Autowired
private WaitMatinService waitMatinService;
+ @Autowired
+ private MatCodeService matCodeService;
@RequestMapping(value = "/waitMatin/head/page/auth")
@ManagerAuth
public R headPage(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
if (!Cools.isEmpty(param.get("modi_time"))){
String val = String.valueOf(param.get("modi_time"));
if (val.contains(RANGE_TIME_LINK)) {
@@ -45,12 +49,25 @@
}
+ /*************************************** xm-select ***********************************************/
-
-
-
-
-
+ // xm-select 鎼滅储鍟嗗搧鍒楄〃
+ @RequestMapping("/mat/all/get/kv")
+ @ManagerAuth
+ public R getMatDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
+ .andNew().like("mat_no", condition).or().like("mat_name", condition)
+ .orderBy("appe_time", false);
+ List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (MatCode mat : mats) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(mat.getMatNo() + " - " + mat.getMatName());
+ vo.setValue(mat.getMatNo());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
@@ -95,9 +112,25 @@
@RequestMapping(value = "/waitMatin/add/auth")
@ManagerAuth
- public R add(WaitMatin waitMatin) {
- waitMatinService.insert(waitMatin);
- return R.ok();
+ @Transactional
+ public R add(@RequestBody List<WaitMatin> waitMatins) {
+ if (Cools.isEmpty(waitMatins)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ int i = 1;
+ Date now = new Date();
+ for (WaitMatin waitMatin : waitMatins) {
+ waitMatin.setSeqNo(i);
+ waitMatin.setAppeTime(now);
+ waitMatin.setAppeUser(getUserId());
+ waitMatin.setModiTime(now);
+ waitMatin.setModiUser(getUserId());
+ if (!waitMatinService.insert(waitMatin)) {
+ throw new CoolException("娣诲姞鍗曟嵁鏄庣粏澶辫触");
+ }
+ i++;
+ }
+ return R.ok("娣诲姞鎴愬姛");
}
@RequestMapping(value = "/waitMatin/update/auth")
@@ -112,11 +145,11 @@
@RequestMapping(value = "/waitMatin/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- waitMatinService.deleteById(id);
+ public R delete(@RequestParam String billNo){
+ if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", billNo))) {
+ throw new CoolException("鍒犻櫎鍗曟嵁鏄庣粏澶辫触");
}
- return R.ok();
+ return R.ok("鍒犻櫎鎴愬姛");
}
@RequestMapping(value = "/waitMatin/export/auth")
--
Gitblit v1.9.1