#

luxiaotao1123

2020-06-13 5cffd2d4226daaf981f0a341f9cd327e924f6619

#

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

@@ -10,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

/**
@@ -44,14 +45,21 @@

    @RequestMapping("/full/store/put/start")
    @ManagerAuth(memo = "全板入库")
    public R start(@RequestBody FullStoreParam fullStoreParam) {
    public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
        workService.startupFullStore(fullStoreParam,getUserId());
        return R.ok("入库成功");
    }

    @RequestMapping("/empty/plate/in/start")
    @ManagerAuth(memo = "空板入库")
    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
        workService.emptyPlateIn(sourceStaNo, getUserId());
        return R.ok("入库成功");
    }

    @RequestMapping("/empty/plate/out/start")
    @ManagerAuth(memo = "全板入库")
    public R start(EmptyPlateOutParam param) {
    @ManagerAuth(memo = "空板出库")
    public R emptyPlateOutStart(EmptyPlateOutParam param) {
        workService.emptyPlateOut(param, getUserId());
        return R.ok("出库成功");
    }

 src/main/java/com/zy/asrs/service/WorkService.java

@@ -11,6 +11,11 @@
    void startupFullStore(FullStoreParam param, Long userId);

    /**
     * 孔板入库
     */
    void emptyPlateIn(Integer sourceStaNo, Long userId);

    /**
     * 空板出库
     */
    void emptyPlateOut(EmptyPlateOutParam param, Long userId);

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -105,6 +105,11 @@
    }

    @Override
    public void emptyPlateIn(Integer sourceStaNo, Long userId) {

    }

    @Override
    @Transactional
    public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
        if (Cools.isEmpty(param.getOutSite())) {

 src/main/webapp/static/js/pakStore/emptyIn.js

@@ -14,7 +14,7 @@
            url: baseUrl+"/available/empty/put/site",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            asymc: false,
            async: false,
            success: function (res) {
                if (res.code === 200){
                    var tpl = $("#putSiteSelectTemplate").html();
@@ -31,6 +31,28 @@
        })
    }

    // 空板入库
    form.on('submit(inbound)', function (data) {
        var inSite = $('#inSiteSelect').val();
        $.ajax({
            url: baseUrl+"/empty/plate/in/start",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            data: {sourceStaNo: inSite},
            async: false,
            success: function (res) {
                if (res.code === 200){
                    layer.msg(res.msg);
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                }else {
                    layer.msg(res.msg)
                }
            }
        })
    });



})


 src/main/webapp/static/js/pakStore/emptyOut.js

@@ -12,7 +12,7 @@
            url: baseUrl+"/available/empty/take/site",
            headers: {'token': localStorage.getItem('token')},
            method: 'POST',
            asymc: false,
            async: false,
            success: function (res) {
                if (res.code === 200){
                    var tpl = $("#takeSiteSelectTemplate").html();

 src/main/webapp/views/pakStore/emptyIn.html

@@ -22,7 +22,13 @@
        }

        .function-area {
            padding: 20px 50px;
            padding: 50px 80px;
        }
        .layui-form-label {
            width: 120px;
        }
        .function-area .layui-form {
            width: 300px;
        }
    </style>
</head>
@@ -30,23 +36,21 @@

<!-- 功能区 -->
<div class="function-area">
    <div class="layui-form">
        <div class="layui-form-item">
            <label class="layui-form-label" style="padding: 9px 0">空板入库口：</label>
            <div class="layui-input-block" style="margin-left: 90px;">
    <div class="layui-form layui-form-pane">
        <div class="layui-form-item" style="margin-bottom: 30px">
            <label class="layui-form-label" style="">空板入库口</label>
            <div class="layui-input-block">
                <select id="inSiteSelect" lay-verify="required" lay-search="">
                    <option value="">请选择站点</option>
                </select>
            </div>
        </div>

        <div style="text-align: center; margin-top: 20px">
            <button class="layui-btn layui-btn-radius layui-btn-normal" id="btn-inbound" lay-submit lay-filter="inbound">入库启动</button>
        <hr style="margin-top: 10px">
        <div style="text-align: left; margin-top: 30px">
            <button class="layui-btn layui-btn-lg layui-btn-radius layui-btn-normal" id="btn-inbound" lay-submit lay-filter="inbound">入库启动</button>
        </div>
    </div>
</div>



<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>