From c6016de7236793b6164a13a8ecbcc0eb59920f45 Mon Sep 17 00:00:00 2001
From: wangyanxiong <password>
Date: Mon, 30 Dec 2019 09:26:33 +0800
Subject: [PATCH] 托盘条码打印
---
.idea/workspace.xml | 51 ++++++++++++++++++++++++++++++---------------------
src/main/resources/templates/config/container/print.html | 4 ++--
2 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2464ed6..843280f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -71,8 +71,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="34">
- <caret line="30" column="36" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
+ <state relative-caret-position="148">
+ <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
@@ -81,6 +81,15 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="108">
+ <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
@@ -719,14 +728,7 @@
<workItem from="1577321748902" duration="21403000" />
<workItem from="1577406875935" duration="16374000" />
<workItem from="1577436625365" duration="3084000" />
- <workItem from="1577665795897" duration="2920000" />
- </task>
- <task id="LOCAL-00020" summary="收货添加定位、取消定位、取消组盘按钮">
- <created>1569232154274</created>
- <option name="number" value="00020" />
- <option name="presentableId" value="LOCAL-00020" />
- <option name="project" value="LOCAL" />
- <updated>1569232154274</updated>
+ <workItem from="1577665795897" duration="3373000" />
</task>
<task id="LOCAL-00021" summary="修改入库单数量使用BigDecimal类型，修改入库单添加、修改、物理类型添加和修改页面">
<created>1569318560852</created>
@@ -1064,11 +1066,18 @@
<option name="project" value="LOCAL" />
<updated>1577439445443</updated>
</task>
- <option name="localTasksCounter" value="69" />
+ <task id="LOCAL-00069" summary="托盘条码打印">
+ <created>1577668882647</created>
+ <option name="number" value="00069" />
+ <option name="presentableId" value="LOCAL-00069" />
+ <option name="project" value="LOCAL" />
+ <updated>1577668882648</updated>
+ </task>
+ <option name="localTasksCounter" value="70" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="85386000" />
+ <option name="totallyTimeSpent" value="85839000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -1293,13 +1302,6 @@
</SUITE>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/mapper/DeptMapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="227">
- <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/service/DeptServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
@@ -1664,10 +1666,17 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="108">
+ <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="34">
- <caret line="30" column="36" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
+ <state relative-caret-position="148">
+ <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
diff --git a/src/main/resources/templates/config/container/print.html b/src/main/resources/templates/config/container/print.html
index 4d22896..26367fd 100644
--- a/src/main/resources/templates/config/container/print.html
+++ b/src/main/resources/templates/config/container/print.html
@@ -28,7 +28,7 @@
</div>
<div class="container" style=" width:320px;/*height:228px;*/color: #333">
<div class="row">
- <table width="50%" border="0" class="dy-report table table-bordered"
+ <table width="50%" border="0" class="dy-report table "
th:each="row:${container}">
<input th:value="${row.code}" id="code" type="hidden"/>
<tbody>
@@ -68,7 +68,7 @@
textAlign:"center",//设置文本的水平对齐方式
textPosition:"bottom",//设置文本的垂直位置
textMargin:1,//设置条形码和文本之间的间距
- fontSize:12,//设置文本的大小
+ fontSize:15,//设置文本的大小
background:"#ffffff",//设置条形码的背景
lineColor:"#000000",//设置条和文本的颜色。
margin:1//设置条形码周围的空白边距
--
libgit2 0.22.2