#
luxiaotao1123
2021-03-05 1df6f4e9ab81da3212cffc126bece65350b6d09f
#
4个文件已修改
56 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/custOrder/custOrder.js 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/custOrder/custOrder.html 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java
@@ -1,6 +1,9 @@
package zy.cloud.wms.manager.entity.result;
import lombok.Data;
import zy.cloud.wms.manager.entity.Pakout;
import java.util.List;
/**
 * Created by vincent on 2021/3/3
@@ -10,4 +13,6 @@
    private String docNum;
    private List<Pakout> list;
}
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -10,10 +10,7 @@
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.Comb;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -90,9 +87,10 @@
    @Override
    public R stockOutPrint(StockOutParam param, Long userId) {
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
        StoPrintVo vo = new StoPrintVo();
        vo.setDocNum(param.getNumber());
        vo.setList(pakouts);
        return R.ok().add(vo);
    }
src/main/webapp/static/js/custOrder/custOrder.js
@@ -267,7 +267,36 @@
            success: function (res) {
                console.log(res)
                if (res.code === 200){
                    alert(JSON.stringify(res.data));
                    var tpl = $('#pakoutPrintTpl').html();
                    var template = Handlebars.compile(tpl);
                    var html = template(res);
                    var box = $("#box");
                    box.html(html);box.show();
                    box.print({
                        mediaPrint:true,
                        deferred: $.Deferred().done(function () {
                            layer.confirm('[重要] 打印是否成功?',  {btn: ['Yes', 'No']}, function(){
                                $.ajax({
                                    url: baseUrl+"/trayCode/print/auth",
                                    headers: {'token': localStorage.getItem('token')},
                                    data: data.field,
                                    method: 'POST',
                                    success: function (res) {
                                        if (res.code === 200){
                                            layer.closeAll();
                                            $(".layui-laypage-btn")[0].click();
                                            layer.msg(res.msg, {icon: 1})
                                        } else if (res.code === 403){
                                            top.location.href = baseUrl+"/";
                                        } else {
                                            layer.msg(res.msg, {icon: 2})
                                        }
                                    }
                                })
                            });
                        })
                    });
                    box.hide();
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
src/main/webapp/views/custOrder/custOrder.html
@@ -49,13 +49,23 @@
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/custOrder/custOrder.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
<div id="pakoutPrintBox" style="display: none"></div>
</body>
<script type="text/template" id="pakoutPrintTpl">
    {{#each data}}
    {{/each}}
</script>
</html>