#

luxiaotao1123

2021-03-03 f4d4d3084e30f0752e4723b795712dd271a8d640

#

 src/main/java/zy/cloud/wms/manager/controller/WorkController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,10 +12,12 @@
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
import zy.cloud.wms.manager.service.WrkStsService;

import java.util.List;

@@ -28,6 +32,8 @@
    private WorkService workService;
    @Autowired
    private PakoutService pakoutService;
    @Autowired
    private WrkStsService wrkStsService;

    @RequestMapping("/stock/in")
    @ManagerAuth(memo = "上架")
@@ -57,7 +63,21 @@
    @ManagerAuth(memo = "获取出库单")
    public R getPakout(@RequestParam String docNumber) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
        return R.ok().add(pakouts);
        if (Cools.isEmpty(pakouts)) {
            return R.parse(BaseRes.EMPTY);
        }
        Long sts = pakouts.get(0).getWrkSts();
        if (sts == 1) {
            sts =2L;
        }
        WrkSts wrkSts = wrkStsService.selectById(sts);
        return R.ok().add(Cools
                .add("number", pakouts.get(0).getDocNum())
                .add("wrkSts", pakouts.get(0).getWrkSts())
                .add("wrkSts$", wrkSts==null?"未知":wrkSts.getStsName())
                .add("custName", Cools.isEmpty(pakouts.get(0).getCustName())?"-":pakouts.get(0).getCustName())
                .add("pakouts", pakouts)
        );
    }

}

 src/main/webapp/views/pda/stockOut.html

@@ -35,7 +35,12 @@
        .status-3 {
            color: green;
        }

        /* 客户 */
        #custName {
            padding-left: 2px;
            line-height: 30px;
            font-size: 14px;
        }
        /* 主体 */
        main {
            border: 1px solid gainsboro;
@@ -78,16 +83,6 @@

<!-- 主体 -->
<main id="pakout-box">
<!--    <hr>-->
<!--    <div class="pakout-item">-->
<!--        <div class="item-header">-->
<!--            六角钻尾螺丝4.8*-->
<!--        </div>-->
<!--        <div class="item-content">-->
<!--            <div style="float: left">10箱</div>-->
<!--            <div style="float: right">货位：A01-1</div>-->
<!--        </div>-->
<!--    </div>-->

</main>
<!-- 尾部 -->
@@ -118,22 +113,27 @@
            method: 'POST',
            success: function (res) {
                if (res.code === 200) {
                    if (res.data != null && res.data.length > 0) {
                        pakoutData = res.data;
                    if (res.data != null) {
                        pakoutData = res.data.pakouts;
                        if (pakoutData != null) {
                            // 头
                            $('#status').html(res.data.wrkSts$);
                            $('#status').attr("class", "layui-form-label status-" + res.data.wrkSts);
                            $('#custName').html(res.data.custName);
                            // 主
                            var tpl = $("#pakoutDetlTpl").html();
                            var template = Handlebars.compile(tpl);
                            var html = template(pakoutData);
                            var html = template(res.data);
                            $('#pakout-box').append(html);
                        }
                        console.log(res.data)
                        $('#confirm').focus();
                    }
                } else if (res.code === 201) {
                } else if (res.code === 403) {
                    top.location.href = baseUrl + "/pda";
                } else {
                    locDetlData = [];
                    tableIns.reload({data: locDetlData});
                    pakoutData = [];
                    tips(res.msg, true);
                }
            }
        })
@@ -218,7 +218,7 @@
    }
</script>
<script type="text/template" id="pakoutDetlTpl">
    {{#each data}}
    {{#each pakouts}}
        <hr>
        <div class="pakout-item">
            <div class="item-header">