Commit c6016de7236793b6164a13a8ecbcc0eb59920f45

Authored by wangyanxiong
1 parent 84d4d5a7

托盘条码打印

.idea/workspace.xml
... ... @@ -71,8 +71,8 @@
71 71 <file pinned="false" current-in-tab="true">
72 72 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
73 73 <provider selected="true" editor-type-id="text-editor">
74   - <state relative-caret-position="34">
75   - <caret line="30" column="36" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
  74 + <state relative-caret-position="148">
  75 + <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
76 76 <folding>
77 77 <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
78 78 </folding>
... ... @@ -81,6 +81,15 @@
81 81 </entry>
82 82 </file>
83 83 <file pinned="false" current-in-tab="false">
  84 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
  85 + <provider selected="true" editor-type-id="text-editor">
  86 + <state relative-caret-position="108">
  87 + <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" />
  88 + </state>
  89 + </provider>
  90 + </entry>
  91 + </file>
  92 + <file pinned="false" current-in-tab="false">
84 93 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
85 94 <provider selected="true" editor-type-id="text-editor">
86 95 <state relative-caret-position="125">
... ... @@ -719,14 +728,7 @@
719 728 <workItem from="1577321748902" duration="21403000" />
720 729 <workItem from="1577406875935" duration="16374000" />
721 730 <workItem from="1577436625365" duration="3084000" />
722   - <workItem from="1577665795897" duration="2920000" />
723   - </task>
724   - <task id="LOCAL-00020" summary="收货添加定位、取消定位、取消组盘按钮">
725   - <created>1569232154274</created>
726   - <option name="number" value="00020" />
727   - <option name="presentableId" value="LOCAL-00020" />
728   - <option name="project" value="LOCAL" />
729   - <updated>1569232154274</updated>
  731 + <workItem from="1577665795897" duration="3373000" />
730 732 </task>
731 733 <task id="LOCAL-00021" summary="修改入库单数量使用BigDecimal类型,修改入库单添加、修改、物理类型添加和修改页面">
732 734 <created>1569318560852</created>
... ... @@ -1064,11 +1066,18 @@
1064 1066 <option name="project" value="LOCAL" />
1065 1067 <updated>1577439445443</updated>
1066 1068 </task>
1067   - <option name="localTasksCounter" value="69" />
  1069 + <task id="LOCAL-00069" summary="托盘条码打印">
  1070 + <created>1577668882647</created>
  1071 + <option name="number" value="00069" />
  1072 + <option name="presentableId" value="LOCAL-00069" />
  1073 + <option name="project" value="LOCAL" />
  1074 + <updated>1577668882648</updated>
  1075 + </task>
  1076 + <option name="localTasksCounter" value="70" />
1068 1077 <servers />
1069 1078 </component>
1070 1079 <component name="TimeTrackingManager">
1071   - <option name="totallyTimeSpent" value="85386000" />
  1080 + <option name="totallyTimeSpent" value="85839000" />
1072 1081 </component>
1073 1082 <component name="ToolWindowManager">
1074 1083 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
... ... @@ -1293,13 +1302,6 @@
1293 1302 </SUITE>
1294 1303 </component>
1295 1304 <component name="editorHistoryManager">
1296   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/mapper/DeptMapper.java">
1297   - <provider selected="true" editor-type-id="text-editor">
1298   - <state relative-caret-position="227">
1299   - <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
1300   - </state>
1301   - </provider>
1302   - </entry>
1303 1305 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/service/DeptServiceImpl.java">
1304 1306 <provider selected="true" editor-type-id="text-editor">
1305 1307 <state relative-caret-position="189">
... ... @@ -1664,10 +1666,17 @@
1664 1666 </state>
1665 1667 </provider>
1666 1668 </entry>
  1669 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
  1670 + <provider selected="true" editor-type-id="text-editor">
  1671 + <state relative-caret-position="108">
  1672 + <caret line="2755" column="1" selection-start-line="2755" selection-start-column="1" selection-end-line="2755" selection-end-column="1" />
  1673 + </state>
  1674 + </provider>
  1675 + </entry>
1667 1676 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
1668 1677 <provider selected="true" editor-type-id="text-editor">
1669   - <state relative-caret-position="34">
1670   - <caret line="30" column="36" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
  1678 + <state relative-caret-position="148">
  1679 + <caret line="69" column="36" lean-forward="true" selection-start-line="69" selection-start-column="36" selection-end-line="69" selection-end-column="36" />
1671 1680 <folding>
1672 1681 <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
1673 1682 </folding>
... ...
src/main/resources/templates/config/container/print.html
... ... @@ -28,7 +28,7 @@
28 28 </div>
29 29 <div class="container" style=" width:320px;/*height:228px;*/color: #333">
30 30 <div class="row">
31   - <table width="50%" border="0" class="dy-report table table-bordered"
  31 + <table width="50%" border="0" class="dy-report table "
32 32 th:each="row:${container}">
33 33 <input th:value="${row.code}" id="code" type="hidden"/>
34 34 <tbody>
... ... @@ -68,7 +68,7 @@
68 68 textAlign:"center",//设置文本的水平对齐方式
69 69 textPosition:"bottom",//设置文本的垂直位置
70 70 textMargin:1,//设置条形码和文本之间的间距
71   - fontSize:12,//设置文本的大小
  71 + fontSize:15,//设置文本的大小
72 72 background:"#ffffff",//设置条形码的背景
73 73 lineColor:"#000000",//设置条和文本的颜色。
74 74 margin:1//设置条形码周围的空白边距
... ...