#
luxiaotao1123
2020-06-13 2b613ec7306bf62b6bebde76fe6b4cccc4fc64ff
#
1个文件已添加
2个文件已修改
77 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/WorkController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/emptyOut.js 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,7 +1,9 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
@@ -35,11 +37,19 @@
        return R.ok().add(basDevpService.getAvailableOutSite());
    }
    @RequestMapping("/full/store/start")
    @RequestMapping("/full/store/put/start")
    @ManagerAuth(memo = "全板入库")
    public R start(@RequestBody FullStoreParam fullStoreParam) {
        workService.startupFullStore(fullStoreParam,getUserId());
        return R.ok();
    }
    @RequestMapping("/empty/plate/out/start")
    @ManagerAuth(memo = "全板入库")
    public R start(EmptyPlateOutParam param) {
        System.out.println(JSON.toJSONString(param));
        return R.ok();
    }
}
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
New file
@@ -0,0 +1,31 @@
package com.zy.asrs.entity.param;
import java.util.List;
/**
 * Created by vincent on 2020/6/13
 */
public class EmptyPlateOutParam {
    // 出站口
    private Integer outSite;
    // 库位号集合
    private List<String> locNos;
    public Integer getOutSite() {
        return outSite;
    }
    public void setOutSite(Integer outSite) {
        this.outSite = outSite;
    }
    public List<String> getLocNos() {
        return locNos;
    }
    public void setLocNos(List<String> locNos) {
        this.locNos = locNos;
    }
}
src/main/webapp/static/js/pakStore/emptyOut.js
@@ -48,7 +48,7 @@
            ,{field: 'crnNo', align: 'center',title: '堆垛机号'}
            ,{field: 'row1', align: 'center',title: '排'}
            ,{field: 'bay1', align: 'center',title: '列'}
            ,{field: 'lev1', align: 'center',title: '层', sort:true}
            ,{field: 'lev1', align: 'center',title: '层'}
            ,{field: 'fullPlt', align: 'center',title: '满板', templet:function(row){
                    var html = "<input value='fullPlt' type='checkbox' disabled=‘disabled’ lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
                    if(row.fullPlt === 'Y'){html += " checked ";}
@@ -57,7 +57,6 @@
                },width:80}
            ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
        ]],
        request: {
            pageName: 'curr',
@@ -94,13 +93,42 @@
    // 监听头工具栏事件
    table.on('toolbar(locMast)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id);
        var data = table.checkStatus(obj.config.id).data;
        switch (obj.event) {
            case 'outbound':
                var staNo = $("#staNoSelect").val();
                if (staNo === ""){
                    layer.msg("请选择出库口");
                }
                var locNos = [];
                data.forEach(function(elem) {
                    locNos.push(elem.locNo);
                });
                if (data.length === 0){
                    layer.msg('请至少选中一行数据');
                } else {
                    $.ajax({
                        url: baseUrl+"/empty/plate/out/start",
                        headers: {'token': localStorage.getItem('token')},
                        data: {
                            outSite: staNo,
                            locNos: locNos
                        },
                        method: 'POST',
                        traditional:true,
                        success: function (res) {
                            if (res.code === 200){
                                tableReload(); // 重载表格
                                getOutBound(); // 重载出库口
                                layer.msg(res.msg);
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                            }
                        }
                    });
                }
                break;
        }
    });