#

luxiaotao1123

2020-06-20 b1b78ed80b8bc68c31b7c8ab006bda8899b9b0f4

#

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

@@ -10,6 +10,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
@@ -87,6 +88,13 @@
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocType().equals("R") || oldLocMast.getLocType().equals("F")) {
            if (locMast.getLocType().equals("O") || locMast.getLocType().equals("D")) {
                locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);

 src/main/webapp/static/js/locMast/locMast.js

@@ -257,13 +257,13 @@
                    type: 2,
                    title: '修改',
                    maxmin: true,
                    area: [top.detailWidth, top.detailHeight],
                    area: ['500px', top.detailHeight],
                    shadeClose: false,
                    content: 'locMast_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('#data-detail :input', index), false);
                        // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), 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');

 src/main/webapp/views/locMast/locMast_detail.html

@@ -14,7 +14,7 @@

<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <form id="detail" class="layui-form" style="text-align: center">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
@@ -23,13 +23,13 @@
            </div>
        </div>
    -->
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>库 位 号：</label>
            <div class="layui-input-inline">
                <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'locMast')">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;display: none">
            <label class="layui-form-label">库位类型：</label>
            <div class="layui-input-inline cool-auto-complete">
                <input id="whsType" class="layui-input" type="text" style="display: none">
@@ -65,37 +65,37 @@
                <input id="sheetNo" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">堆垛机号：</label>
            <div class="layui-input-inline">
                <input id="crnNo" class="layui-input" type="text">
                <input id="crnNo" class="layui-input" type="text" disabled="disabled">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">排：</label>
            <div class="layui-input-inline">
                <input id="row1" class="layui-input" type="text">
                <input id="row1" class="layui-input" type="text" disabled="disabled">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">列：</label>
            <div class="layui-input-inline">
                <input id="bay1" class="layui-input" type="text">
                <input id="bay1" class="layui-input" type="text" disabled="disabled">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">层：</label>
            <div class="layui-input-inline">
                <input id="lev1" class="layui-input" type="text">
                <input id="lev1" class="layui-input" type="text" disabled="disabled">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">满　　板：</label>
            <div class="layui-input-inline">
            <div class="layui-input-inline" style="text-align: left">
                <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
        <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="locType" class="layui-input" type="text" style="display: none" lay-verify="required" >
@@ -225,8 +225,8 @@
            <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 id="prompt" style="text-indent: 30px;">
            <span class="not-null">温馨提示：修改为空库位时会清除库存明细</span>
        </div>
    </form>
</div>