#
luxiaotao1123
2021-03-05 644d37c99c6a4e910470f7fa4596c15d1b3e231c
#
3个文件已修改
81 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/custOrder/custOrder.html 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/common/utils/BarcodeUtils.java
@@ -18,7 +18,7 @@
 */
public class BarcodeUtils {
    private static final int DEFAULT_WIDTH = 110;
    private static final int DEFAULT_WIDTH = 150;
    private static final int DEFAULT_HEIGHT = 40;
    /**
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -98,7 +98,7 @@
        vo.setDocNum(param.getNumber());
        vo.setList(pakouts);
        vo.setTotal(total);
        vo.setCustName(custName);
        vo.setCustName("浙江中扬立库技术有限公司");
        vo.setWorkerName("陆晓涛");
        return R.ok().add(vo);
    }
src/main/webapp/views/custOrder/custOrder.html
@@ -59,72 +59,43 @@
<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">
    <!-- 头 -->
    <div id="print-header">
        <!-- 左 -->
        <div style="float: left; width: 80%">
            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}">
            <p>{{data.docNum}}</p>
        <div style="text-align: center">
            <div style="text-align: center;margin-bottom: 10px">
                <span style="font-family: 宋体"> 捡货单 </span>
            </div>
            <img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
            <p style="letter-spacing: 2px;margin-top: 5px">{{data.docNum}}</p>
        </div>
        <!-- 右 -->
        <div style="float: left;width: 20%">
            <div>捡货数量:<span>{{data.total}}</span></div>
        <div style="font-size: xx-small; text-align: left; margin-top: 10px">
            <span style="font-family: 宋体">客户:{{data.custName}}</span>
        </div>
        <div style="float: left; width: 80%">
            客户:<span>{{data.custName}}</span>
        </div>
        <div style="float: left; width: 20%">
            捡货人:{{data.workerName}}
        <div style="margin-top: 10px">
            <div style="float: left;width: 50%; text-align: left">
                <span style="font-size: xx-small;font-family: 宋体">捡货数量:{{data.total}}</span>
            </div>
            <div style="float: left; width: 50%; text-align: right">
                <span style="font-size: xx-small;font-family: 宋体">捡货人:{{data.workerName}}</span>
            </div>
        </div>
    </div>
    <hr>
    <!-- 主体 -->
    <div>
    <div style="margin-top: 100px">
        {{#each data.list}}
        <div class="pakout-item">
            <div class="item-header">
        <div class="pakout-item" style="padding: 10px 5px 20px 5px;">
            <div class="item-header" style="margin-top: 10px;font-family: 宋体; font-size: x-small">
                {{maktx}}
            </div>
            <div class="item-content">
                <div style="float: left">{{anfme}}{{unit}}</div>
                <div style="float: right">货位:{{locNo}}</div>
            <div class="item-content" style="margin-top: 20px">
                <div style="float: left;font-family: 宋体; font-size: xx-small">{{anfme}}{{unit}}</div>
                <div style="float: right;font-family: 宋体; font-size: xx-small">货位:{{locNo}}</div>
            </div>
        </div>
        {{/each}}