#

LSH

2024-05-18 efa0a4cfe6296e3a4a65f8714f34694169eadea7

#

 src/main/java/com/zy/asrs/controller/StaDescController.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.param.StaDescInitParam;
import com.zy.asrs.service.StaDescService;
import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
@@ -24,6 +25,47 @@
    @Autowired
    private StaDescService staDescService;

    @RequestMapping(value = "/staDesc/init/auth")
    @ManagerAuth(memo = "初始化站点路径")
    public R init(StaDescInitParam param) {
        try{
            if (param.getTypeDesc()==1){
                staDescService.delete(new EntityWrapper<>());
            }
            String[] startStaList = param.getStartStaList().split(";");
            String[] endStaList = param.getEndStaList().split(";");
            List<StaDesc> staDescList = new ArrayList<>();
            for (String startSta : startStaList){
                for (String endSta : endStaList){
                    for (Integer type:param.getType()){
                        int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
                                .eq("type_no", type)
                                .eq("stn_no", Integer.parseInt(startSta))
                                .eq("crn_no", param.getCrnNo())
                                .eq("crn_stn", Integer.parseInt(endSta)));
                        if (sameRes > 0) {
                            continue;
                        }
                        StaDesc staDesc = new StaDesc();
                        staDesc.setCrnNo(param.getCrnNo());
                        staDesc.setTypeNo(type);
                        staDesc.setStnNo(Integer.parseInt(startSta));
                        staDesc.setCrnStn(Integer.parseInt(endSta));
                        staDesc.setModiUser(getUserId());
                        staDesc.setModiTime(new Date());
                        staDesc.setAppeUser(getUserId());
                        staDesc.setAppeTime(new Date());
                        staDescList.add(staDesc);
                    }
                }
            }
            staDescService.insertBatch(staDescList);
        }catch (Exception e){
            return R.error();
        }

        return R.ok("ok1").add("ok2");
    }
    @RequestMapping(value = "/staDesc/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {

 src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java

New file
@@ -0,0 +1,141 @@
package com.zy.asrs.entity.param;

import com.core.common.BaseRes;
import com.core.exception.CoolException;

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.List;

/**
 * Created by vincent on 2020/6/13
 */
public class StaDescInitParam {

    // 堆垛机号
    private Integer crnNo;

    // 格式化开关（打开删除老数据）
    private Integer typeDesc = 0;
    // 入库
    private Integer typeDesc1 = 0;
    // 空板入库
    private Integer typeDesc10 = 0;
    // 拣料盘点入库
    private Integer typeDesc53 = 0;
    // 出库
    private Integer typeDesc101 = 0;
    // 空板出库
    private Integer typeDesc110 = 0;
    // 拣料盘点出库
    private Integer typeDesc103 = 0;

    private String startStaList = "";

    private String endStaList = "";

    public String getStartStaList() {
        return startStaList;
    }

    public void setStartStaList(String startStaList) {
        this.startStaList = startStaList;
    }

    public String getEndStaList() {
        return endStaList;
    }

    public void setEndStaList(String endStaList) {
        this.endStaList = endStaList;
    }

    public Integer getCrnNo() {
        return crnNo;
    }

    public void setCrnNo(Integer crnNo) {
        this.crnNo = crnNo;
    }

    public Integer getTypeDesc() {
        return typeDesc;
    }

    public void setTypeDesc(Integer typeDesc) {
        this.typeDesc = typeDesc;
    }

    public Integer getTypeDesc1() {
        return typeDesc1;
    }

    public void setTypeDesc1(Integer typeDesc1) {
        this.typeDesc1 = typeDesc1;
    }

    public Integer getTypeDesc10() {
        return typeDesc10;
    }

    public void setTypeDesc10(Integer typeDesc10) {
        this.typeDesc10 = typeDesc10;
    }

    public Integer getTypeDesc53() {
        return typeDesc53;
    }

    public void setTypeDesc53(Integer typeDesc53) {
        this.typeDesc53 = typeDesc53;
    }

    public Integer getTypeDesc101() {
        return typeDesc101;
    }

    public void setTypeDesc101(Integer typeDesc101) {
        this.typeDesc101 = typeDesc101;
    }

    public Integer getTypeDesc110() {
        return typeDesc110;
    }

    public void setTypeDesc110(Integer typeDesc110) {
        this.typeDesc110 = typeDesc110;
    }

    public Integer getTypeDesc103() {
        return typeDesc103;
    }

    public void setTypeDesc103(Integer typeDesc103) {
        this.typeDesc103 = typeDesc103;
    }

    public List<Integer> getType(){
        List<Integer> type = new ArrayList<>();
        if (this.typeDesc1==1){
            type.add(1);
        }
        if (this.typeDesc10==1){
            type.add(10);
        }
        if (this.typeDesc53==1){
            type.add(53);
            type.add(57);
        }
        if (this.typeDesc101==1){
            type.add(101);
        }
        if (this.typeDesc110==1){
            type.add(110);
        }
        if (this.typeDesc103==1){
            type.add(103);
            type.add(107);
        }
        return type;
    }
}

 src/main/webapp/static/js/staDesc/staDesc.js

@@ -208,9 +208,53 @@
                    });
                });
                break;
            case 'init':
                layer.prompt({title: '请输入口令，并初始化站点', formType: 1,   shadeClose: true}, function(pass, idx){
                    http.get(baseUrl+"/locMast/init/pwd", {pwd: pass}, function (res) {
                        if (res.data) {
                            layer.open({
                                type: 1,
                                title: '初始化站点',
                                area: ["500px"],
                                maxmin: true,
                                shadeClose: true,
                                content: $("#resetLocDiv"),
                                success: function (layero, index) {

                                }
                            })
                        } else {
                            layer.msg("口令错误");
                        }
                        layer.close(idx);
                    })
                });
                break;
        }
    });

    // 初始化保存
    form.on('submit(initDo)', function (data) {
        $.ajax({
            url: baseUrl+"/staDesc/init/auth",
            headers: {'token': localStorage.getItem('token')},
            data: data.field,
            method: 'POST',
            async: false,
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                    layer.closeAll();
                    tableReload(false);
                } else if (res.code === 403){
                    parent.location.href = "/";
                }else {
                    layer.msg(res.msg)
                }
            }
        })
    });

    // 监听行工具事件
    table.on('tool(staDesc)', function(obj){
        var data = obj.data;

 src/main/webapp/views/staDesc/staDesc.html

@@ -73,6 +73,7 @@
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-primary" id="btn-init" lay-event="init">初始化</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
    </div>
@@ -89,7 +90,110 @@
<script type="text/javascript" src="../../static/js/staDesc/staDesc.js" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>

<!-- 重置站点路径弹窗 -->
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
    <div class="layui-form layui-form-pane">
        <!-- 格式化 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">格式化</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc" lay-skin="switch" value="1" lay-text="删除|保留">
                </div>
            </div>
        </div>
        <!-- 堆垛机号 -->
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>堆垛机号：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="crnNo" name="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number"  style="display: none">
                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-form-item">
        </div>
        <!-- 堆垛机数量 -->
        <div class="layui-form-item">
            <label class="layui-form-label">作业站</label>
            <div class="layui-input-inline">
                <input type="text" name="startStaList" lay-verify="required" autocomplete="off" class="layui-input" placeholder="123;321">
            </div>
        </div>
        <!-- 堆垛机数量 -->
        <div class="layui-form-item">
            <label class="layui-form-label">堆垛机站</label>
            <div class="layui-input-inline">
                <input type="text" name="endStaList" lay-verify="required" autocomplete="off" class="layui-input" placeholder="123;321">
            </div>
        </div>
        <!-- 入库 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">入库</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc1" lay-skin="switch" value="1" lay-text="打开|关闭">
                </div>
            </div>
        </div>
        <!-- 空板入库 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">空板入库</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc10" lay-skin="switch" value="1" lay-text="打开|关闭">
                </div>
            </div>
        </div>
        <!-- 拣料、盘点再入库 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">拣料、盘点再入库</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc53" lay-skin="switch" value="1" lay-text="打开|关闭">
                </div>
            </div>
        </div>
        <!-- 出库 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">出库</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc101" lay-skin="switch" value="1" lay-text="打开|关闭">
                </div>
            </div>
        </div>
        <!-- 空板出库 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">空板出库</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc110" lay-skin="switch" value="1" lay-text="打开|关闭">
                </div>
            </div>
        </div>
        <!-- 拣料、盘点出库 -->
        <div class="layui-form-item">
            <div class="layui-inline">
                <label class="layui-form-label">拣料、盘点出库</label>
                <div class="layui-input-inline" style="width: 100px;">
                    <input type="checkbox" name="typeDesc103" lay-skin="switch" value="1" lay-text="打开|关闭">
                </div>
            </div>
        </div>
        <div id="prompt" style="text-indent: 10px;">
            <span class="not-null">初始化站点路径，请谨慎操作！</span>
        </div>
        <!-- 按钮 -->
        <div style="text-align: center; margin-top: 20px">
            <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">确定</button>
        </div>
    </div>
</div>
</body>
</html>