From 0916bb4ea987c0599b6af6bb8dd251a071770e05 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 14:32:15 +0800
Subject: [PATCH] 通用下拉选择框值从视图获取
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 10 +++
src/main/java/com/zy/asrs/service/PlaService.java | 3 +
src/main/java/com/zy/asrs/controller/PlaController.java | 23 +++++++
src/main/webapp/views/pla/plaDetl.html | 11 +++
src/main/webapp/static/js/pla/plaDetl.js | 27 +++++++++
src/main/webapp/views/pla3/plaDetl.html | 16 +++++
src/main/webapp/views/pla2/plaDetl.html | 16 +++++
src/main/java/com/zy/asrs/mapper/PlaMapper.java | 6 ++
src/main/java/com/zy/asrs/entity/DropdownValuesDto.java | 16 +++++
src/main/resources/mapper/PlaMapper.xml | 4 +
10 files changed, 131 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index f9d4513..592e255 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -32,6 +32,7 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Slf4j
@@ -54,6 +55,28 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @GetMapping(value = "/pla/dropdownValues/list")
+ @ManagerAuth(memo = "鑾峰彇涓嬫媺閫夋嫨妗嗗�煎垪琛�")
+ 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
diff --git a/src/main/java/com/zy/asrs/entity/DropdownValuesDto.java b/src/main/java/com/zy/asrs/entity/DropdownValuesDto.java
new file mode 100644
index 0000000..f1fac36
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DropdownValuesDto.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description 涓嬫媺閫夋嫨妗嗗�奸�氱敤瑙嗗浘
+ * @createDate 2025/10/23 13:36
+ */
+@Data
+public class DropdownValuesDto {
+
+ private String type;
+
+ private String value;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
index f6c4c13..30ea888 100644
--- a/src/main/java/com/zy/asrs/mapper/PlaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.Pla;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -26,6 +27,11 @@
Integer getStockStatisCountAll(Map<String, Object> map);
/**
+ * 鑾峰彇涓嬫媺鍒楄〃鍊�
+ */
+ List<DropdownValuesDto> getDropdownValues();
+
+ /**
* 鑷姩瑙ｅ喕鍐荤粨鏃堕棿瓒呰繃90澶╃殑搴撳瓨
* @return 鏇存柊鏁伴噺
*/
diff --git a/src/main/java/com/zy/asrs/service/PlaService.java b/src/main/java/com/zy/asrs/service/PlaService.java
index ea13b76..7caee55 100644
--- a/src/main/java/com/zy/asrs/service/PlaService.java
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -11,6 +12,8 @@
public interface PlaService extends IService<Pla> {
+ List<DropdownValuesDto> getDropdownValues();
+
Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand);
void queryStock(OrderDetl orderDetl, List<PlaQty> plaQties);
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 9eb8ebe..401a7c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -29,6 +31,14 @@
@Autowired
private PlaQtyService plaQtyService;
+ @Resource
+ private PlaMapper plaMapper;
+
+ @Override
+ public List<DropdownValuesDto> getDropdownValues() {
+ return plaMapper.getDropdownValues();
+ }
+
public Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand) {
return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
}
diff --git a/src/main/resources/mapper/PlaMapper.xml b/src/main/resources/mapper/PlaMapper.xml
index ea2d216..561079f 100644
--- a/src/main/resources/mapper/PlaMapper.xml
+++ b/src/main/resources/mapper/PlaMapper.xml
@@ -43,4 +43,8 @@
</where>
GROUP BY brand,matnr,workshop HAVING SUM(weight_anfme) > 0 ORDER BY matnr,workshop
</select>
+ <select id="getDropdownValues" resultType="com.zy.asrs.entity.DropdownValuesDto">
+ SELECT type, value
+ FROM dropdown_values_view
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index b6ddf4e..c95b607 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -104,6 +104,33 @@
var form = layui.form;
admin = layui.admin;
+ // 妯℃嫙浠庡悗绔帴鍙ｈ幏鍙栨暟鎹�
+ $.ajax({
+ url: baseUrl + "/pla/dropdownValues/list",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ var data = res.data
+
+ if (data.owner && Array.isArray(data.owner)) {
+ data.owner.forEach(function(item) {
+ $('#ownerSelect').append(new Option(item, item));
+ });
+ }
+
+ if (data.workshop && Array.isArray(data.workshop)) {
+ data.workshop.forEach(function(item) {
+ $('#workshopSelect').append(new Option(item, item));
+ });
+ }
+
+ // 閲嶆柊娓叉煋 LayUI 琛ㄥ崟
+ form.render('select');
+ }
+ }
+ });
+
// 鏃ユ湡鏃堕棿鑼冨洿
laydate.render({
elem: '#ID-laydate-range-datetime',
diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index de42122..782e8c7 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -304,7 +304,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="owner" placeholder="涓讳綋" autocomplete="off">
+ <select id="ownerSelect" name="owner" lay-search>
+ <option value="">涓讳綋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="workshopSelect" name="workshop" lay-search>
+ <option value="">杞﹂棿</option>
+ </select>
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/pla2/plaDetl.html b/src/main/webapp/views/pla2/plaDetl.html
index 7497875..5bbd725 100644
--- a/src/main/webapp/views/pla2/plaDetl.html
+++ b/src/main/webapp/views/pla2/plaDetl.html
@@ -296,6 +296,22 @@
</div>
</div>
</div>
+ <div class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner" lay-search>
+ <option value="">涓讳綋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="workshopSelect" name="workshop" lay-search>
+ <option value="">杞﹂棿</option>
+ </select>
+ </div>
+ </div>
+ </div>
</div>
<script type="text/html" id="toolbar">
diff --git a/src/main/webapp/views/pla3/plaDetl.html b/src/main/webapp/views/pla3/plaDetl.html
index 72e37dc..a35bb21 100644
--- a/src/main/webapp/views/pla3/plaDetl.html
+++ b/src/main/webapp/views/pla3/plaDetl.html
@@ -296,6 +296,22 @@
</div>
</div>
</div>
+ <div class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner" lay-search>
+ <option value="">涓讳綋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="workshopSelect" name="workshop" lay-search>
+ <option value="">杞﹂棿</option>
+ </select>
+ </div>
+ </div>
+ </div>
</div>
<script type="text/html" id="toolbar">
--
Gitblit v1.9.1