自动化立体仓库 - WMS系统
pang.jiabao
昨天 0916bb4ea987c0599b6af6bb8dd251a071770e05
通用下拉选择框值从视图获取
9个文件已修改
1个文件已添加
132 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/PlaController.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/DropdownValuesDto.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/PlaMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/PlaService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PlaMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pla/plaDetl.js 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pla/plaDetl.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pla2/plaDetl.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pla3/plaDetl.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
src/main/java/com/zy/asrs/entity/DropdownValuesDto.java
New file
@@ -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;
}
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 更新数量
     */
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);
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));
    }
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>
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',
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">
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">
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">