From 1df6f4e9ab81da3212cffc126bece65350b6d09f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 14:59:49 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 12 +++++++++++-
src/main/webapp/static/js/custOrder/custOrder.js | 31 ++++++++++++++++++++++++++++++-
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 8 +++-----
src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java | 5 +++++
4 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java b/src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java
index 2ea98f0..4b56405 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java
+++ b/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;
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 9dface3..63d82ba 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/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);
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 603ed8e..0a6917f 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/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 {
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 3536bd0..5977051 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/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>
--
Gitblit v1.9.1