From 2f3992c0e26bc8252b18263be940df281b62aea1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 15:29:43 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/custOrder/custOrder.html                       |   69 ++++++++++++++++++++++++++++++++++
 src/main/webapp/static/js/custOrder/custOrder.js                     |    2 
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |    9 ++++
 src/main/java/zy/cloud/wms/manager/entity/result/StoPrintVo.java     |    6 +++
 4 files changed, 84 insertions(+), 2 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 4b56405..deaddc5 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
@@ -15,4 +15,10 @@
 
     private List<Pakout> list;
 
+    private Double total;
+
+    private String custName;
+
+    private String workerName;
+
 }
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 63d82ba..35d0905 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
@@ -88,9 +88,18 @@
     @Override
     public R stockOutPrint(StockOutParam param, Long userId) {
         List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
+        Double total = 0.0D;
+        String custName = "";
+        for (Pakout pakout : pakouts) {
+            total = pakout.getAnfme() + total;
+            custName = pakout.getCustName();
+        }
         StoPrintVo vo = new StoPrintVo();
         vo.setDocNum(param.getNumber());
         vo.setList(pakouts);
+        vo.setTotal(total);
+        vo.setCustName(custName);
+        vo.setWorkerName("闄嗘檽娑�");
         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 99453ed..f7f038e 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -266,7 +266,7 @@
             method: 'POST',
             success: function (res) {
                 if (res.code === 200){
-                    res.data["barcodeUrl"]=baseUrl+"/custOrder/code/auth?type=2&param="+res.data.docNum;
+                    res.data["barcodeUrl"]=baseUrl+"/custOrder/code/auth?type=1&param="+res.data.docNum;
                     var tpl = $('#pakoutPrintTpl').html();
                     var template = Handlebars.compile(tpl);
                     var html = template(res);
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 690a5fd..e796201 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -58,10 +58,77 @@
 
 <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
 <div id="pakoutPrintBox" style="display: none"></div>
+
+
+<!--<div id="print-contain">-->
+<!--    &lt;!&ndash; 澶� &ndash;&gt;-->
+<!--    <div id="print-header">-->
+<!--        &lt;!&ndash; 宸� &ndash;&gt;-->
+<!--        <div style="float: left; width: 80%">-->
+<!--            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}">-->
+<!--            <p>XSSDSSSS-qwewqewq</p>-->
+<!--        </div>-->
+<!--        &lt;!&ndash; 鍙� &ndash;&gt;-->
+<!--        <div style="float: left;width: 20%">-->
+<!--            <div>鎹¤揣鏁伴噺锛�<span>20</span></div>-->
+<!--        </div>-->
+<!--        <div style="float: left; width: 80%">-->
+<!--            瀹㈡埛锛�<span>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</span>-->
+<!--        </div>-->
+<!--        <div style="float: left; width: 20%">-->
+<!--            鎹¤揣浜猴細闄嗘檽娑�-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <hr>-->
+<!--    &lt;!&ndash; 涓讳綋 &ndash;&gt;-->
+<!--    <div>-->
+<!--        <div class="pakout-item">-->
+<!--            <div class="item-header">-->
+<!--                {{maktx}}-->
+<!--            </div>-->
+<!--            <div class="item-content">-->
+<!--                <div style="float: left">{{anfme}}{{unit}}</div>-->
+<!--                <div style="float: right">璐т綅锛歿{locNo}}</div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
 </body>
 
 <script type="text/template" id="pakoutPrintTpl">
-    <img class="template-code template-qrcode" src="{{data.barcodeUrl}}" width="80%">
+    <!-- 澶� -->
+    <div id="print-header">
+        <!-- 宸� -->
+        <div style="float: left; width: 80%">
+            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}">
+            <p>{{data.docNum}}</p>
+        </div>
+        <!-- 鍙� -->
+        <div style="float: left;width: 20%">
+            <div>鎹¤揣鏁伴噺锛�<span>{{data.total}}</span></div>
+        </div>
+        <div style="float: left; width: 80%">
+            瀹㈡埛锛�<span>{{data.custName}}</span>
+        </div>
+        <div style="float: left; width: 20%">
+            鎹¤揣浜猴細{{data.workerName}}
+        </div>
+    </div>
+    <hr>
+    <!-- 涓讳綋 -->
+    <div>
+        {{#each data.list}}
+        <div class="pakout-item">
+            <div class="item-header">
+                {{maktx}}
+            </div>
+            <div class="item-content">
+                <div style="float: left">{{anfme}}{{unit}}</div>
+                <div style="float: right">璐т綅锛歿{locNo}}</div>
+            </div>
+        </div>
+        {{/each}}
+    </div>
 </script>
 
 </html>

--
Gitblit v1.9.1