From e106f6b67c9a137b43e383ff1106c35ae93223bc Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期四, 26 八月 2021 17:07:08 +0800
Subject: [PATCH] 1.0.1
---
src/main/java/com/zy/ints/controller/WaitMatinController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/ints/controller/WaitMatinController.java b/src/main/java/com/zy/ints/controller/WaitMatinController.java
index b8a07de..5b51cb4 100644
--- a/src/main/java/com/zy/ints/controller/WaitMatinController.java
+++ b/src/main/java/com/zy/ints/controller/WaitMatinController.java
@@ -10,6 +10,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
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;
@@ -26,6 +29,8 @@
@Autowired
private WaitMatinService waitMatinService;
+ @Autowired
+ private MatCodeService matCodeService;
@RequestMapping(value = "/waitMatin/head/page/auth")
@ManagerAuth
@@ -46,6 +51,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);
+ }
--
Gitblit v1.9.1