#

18516761980

2023-03-09 21a9bab4a910f78ed182c24543195698a63b1fe0

#

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

@@ -10,8 +10,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,8 @@

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private LocMastService locMastService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth
@@ -77,18 +81,94 @@
        return R.ok();
    }

    @RequestMapping(value = "/wrkMast/update/auth")
    @ManagerAuth(memo = "工作档修改")
    @RequestMapping(value = "/wrkMast/update/auth")
    @ManagerAuth(memo = "工作档修改")
    public R update(WrkMast wrkMast){
        if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
            return R.error();
            return R.error("工作号异常");
        }else if (wrkMast.getWrkSts()==null){
            return R.error("修改状态异常");
        }
        wrkMast.setModiUser(getUserId());
        wrkMast.setModiTime(new Date());
        wrkMastService.updateById(wrkMast);
        WrkMast wrkMast1=null;
        try{
            wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
            if (Cools.isEmpty(wrkMast1) || null==wrkMast1.getWrkNo()){
                throw new CoolException("工作号"+wrkMast.getWrkNo()+"所属工作档查询失败");
            }else if (wrkMast1.getWrkSts()==null){
                throw new CoolException("工作号"+wrkMast.getWrkNo()+"所属工作档状态异常");
            }
        }catch (Exception e){
            return R.error("失败!!!请尝试刷新页面。"+"异常原因："+e);
        }
        if (wrkMast1.getWrkSts()-wrkMast.getWrkSts()==0){
            return R.error("所选状态与此工作档状态一致，无需修改");
        }
        if (juBge(wrkMast.getWrkSts(), wrkMast1)){
            return R.error("修改状态失败，请规范操作");
        }
        wrkMast1.setModiUser(getUserId());
        wrkMast1.setModiTime(new Date());
        wrkMast1.setWrkSts(wrkMast.getWrkSts());
        wrkMastService.updateById(wrkMast1);
        return R.ok();
    }

    public Boolean juBge(Long wrkSts1,WrkMast wrkMast1){
        if (wrkSts1>20){
            throw new CoolException("大于20的状态不能进行修改！！！");
        }
        switch (wrkMast1.getIoType()){
            case 1:
            case 10:
            case 53:
            case 54:
            case 57:
                if (wrkSts1>=1 && wrkSts1<=10){
                    if (wrkSts1==10){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getLocNo()));
                        if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位异常请维护库位数据");
                        }
                        if (locMast.getLocSts().equals("S")||locMast.getLocSts().equals("Q")){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态为"+locMast.getLocSts$()+"，请维护库位数据");
                        }else if (locMast.getLocSts().equals("F")){
                        }else {
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }
                return true;
            case 101:
            case 103:
            case 104:
            case 107:
            case 110:
                if (wrkSts1>=11 && wrkSts1<=18){
                    if (wrkSts1==18){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast1.getSourceLocNo()));
                        if (Cools.isEmpty(locMast) || locMast.getLocSts()==null){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位异常请维护库位数据");
                        }
                        if (locMast.getLocSts().equals("R")||locMast.getLocSts().equals("P")){
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态为"+locMast.getLocSts$()+"，请维护库位数据");
                        }else if (locMast.getLocSts().equals("O")){
                        }else {
                            throw new CoolException("工作号"+wrkMast1.getWrkNo()+"工作档所对应的库位号状态异常，请维护库位数据");
                        }
                    }
                    return false;
                }
                return true;
            case 11:
                return false;
            case 3:
            case 6:
            default:
                return true;
        }
    }

    @RequestMapping(value = "/wrkMast/delete/auth")
    @ManagerAuth(memo = "工作档删除")
    public R delete(@RequestParam String param){

 src/main/webapp/static/js/common.js

@@ -231,7 +231,7 @@
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    ,{field: 'manuDate', align: 'center',title: '单据时间', hide: true}
    ,{field: 'weight', align: 'center',title: '重量', hide: true}
    ,{field: 'units', align: 'center',title: '包数', hide: true}
    ,{field: 'units', align: 'center',title: '支数', hide: true}
    ,{field: 'origin', align: 'center',title: '物料状态', hide: true}



 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -67,7 +67,7 @@
            //         return html;
            //     }}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:250}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:290}
        ]],
        request: {
            pageName: 'curr',
@@ -198,7 +198,7 @@
                    content: 'wrkMast_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
                        clearFormVal(layer.getChildFrame('#detail', index));
                        clearFormVal(layer.getChildFrame('#detail', index));
                        layer.getChildFrame('##dealDownLine', index).hide();layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                    }
                });
@@ -357,6 +357,24 @@
                    layer.closeAll();
                });
                break;
            case 'priWrkMast':
                layer.open({
                    type: 2,
                    title: '维护工作档',
                    maxmin: true,
                    area: ['500px', top.detailHeight],
                    shadeClose: false,
                    content: 'wrkMast_detail.html',
                    success: function(layero, index){
                        layer.getChildFrame('#data-detail-submit-save', index).hide();
                        setFormVal(layer.getChildFrame('#detail', index), data, false);
                        top.convertDisabled(layer.getChildFrame('#locNo', index), true);
                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
                        layero.find('iframe')[0].contentWindow.layui.form.render('select');
                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
                    }
                });
                break;
        }
    });


 src/main/webapp/views/wrkMast/wrkMast.html

@@ -113,23 +113,12 @@
</div>

<script type="text/html" id="operate">
    {{#if (d.preHave === 'Y' && d.wrkSts === 3) { }}
    <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">先入品</a>
    {{# } }}
    {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">空操作</a>
    {{# } }}
    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>
    {{#if (d.ioType === 103) { }}
        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>
    {{# } }}
    {{#if (d.ioType === 107) { }}
        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">盘</a>
    {{# } }}
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">维护状态</a>
    {{#if (d.steNo) { }}
        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">弃车</a>
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">弃车</a>
    {{# } }}
</script>


 src/main/webapp/views/wrkMast/wrkMast_detail.html

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" xmlns="http://www.w3.org/1999/html">
<head>
    <meta charset="utf-8">
    <title></title>
@@ -14,18 +14,18 @@

<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
        <div class="layui-inline"  style="width:31%;">
    <form id="detail" class="layui-form" style="height: 100%">
        <div class="layui-inline"  >
            <label class="layui-form-label"><span class="not-null">*</span>工 作 号：</label>
            <div class="layui-input-inline">
                <input id="wrkNo" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMast')">
                <input id="wrkNo" class="layui-input" disabled =“disabled” onkeyup="check(this.id, 'wrkMast')">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline">
            <label class="layui-form-label">工作状态：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="wrkSts" class="layui-input" type="text" style="display: none">
                <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>
            <div class="layui-input-inline cool-auto-complete" style="height: 200px">
                <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="请输入" autocomplete="off" style="display: none">
                <input id="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -33,156 +33,13 @@
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">入出库类型：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="ioType" class="layui-input" type="text" style="display: none">
                <input id="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        <div id="prompt">
            温馨提示：大于10的工作状态请查看  基础数据<span style="font-weight: 900;color: black">→</span>工作状态
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">堆 垛 机：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="crnNo" class="layui-input" type="text" 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-inline"  style="width:31%;">
            <label class="layui-form-label">优 先 级：</label>
            <div class="layui-input-inline">
                <input id="ioPri" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">目标库位：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="locNo" class="layui-input" type="text" style="display: none">
                <input id="locNo$" 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="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">目 标 站：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="staNo" class="layui-input" type="text" style="display: none">
                <input id="staNo$" 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="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">源　　站：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="sourceStaNo" class="layui-input" type="text" style="display: none">
                <input id="sourceStaNo$" 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="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">源 库 位：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="sourceLocNo" class="layui-input" type="text" style="display: none">
                <input id="sourceLocNo$" 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="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">拣　　料：</label>
            <div class="layui-input-inline">
                <input id="picking" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">退　　出：</label>
            <div class="layui-input-inline">
                <input id="exitMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">空　　板：</label>
            <div class="layui-input-inline">
                <input id="emptyMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">工作时间：</label>
            <div class="layui-input-inline">
                <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label" style="font-size: x-small">堆垛机启动时间：</label>
            <div class="layui-input-inline">
                <input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label" style="font-size: x-small">堆垛机停止时间：</label>
            <div class="layui-input-inline">
                <input id="crnEndTime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">拣料时间：</label>
            <div class="layui-input-inline">
                <input id="refIotime$" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">备　　注：</label>
            <div class="layui-input-inline">
                <input id="memo" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">条　　码：</label>
            <div class="layui-input-inline">
                <input id="barcode" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">满　　板：</label>
            <div class="layui-input-inline">
                <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
            </div>
        </div>


        <hr class="layui-bg-gray">

        <div id="data-detail-btn" class="layui-btn-container layui-form-item">
            <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</div>
            <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">修改</div>
            <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">关闭</div>
        </div>

        <div id="prompt">
            温馨提示：请仔细填写相关信息，<span class="extrude"><span class="not-null">*</span> 为必填选项。</span>
        </div>
    </form>
</div>