Commit 896b14aa38c497fc3c3e7a2c475ad055689f6dc9
1 parent
2666a7d1
物料打印
Showing
2 changed files
with
19 additions
and
21 deletions
.idea/workspace.xml
... | ... | @@ -5,10 +5,8 @@ |
5 | 5 | </component> |
6 | 6 | <component name="ChangeListManager"> |
7 | 7 | <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment=""> |
8 | - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" afterDir="false" /> | |
9 | 8 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
10 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" afterDir="false" /> | |
11 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" afterDir="false" /> | |
9 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" afterDir="false" /> | |
12 | 10 | </list> |
13 | 11 | <ignored path="$PROJECT_DIR$/target/" /> |
14 | 12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
... | ... | @@ -55,8 +53,8 @@ |
55 | 53 | <file pinned="false" current-in-tab="true"> |
56 | 54 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html"> |
57 | 55 | <provider selected="true" editor-type-id="text-editor"> |
58 | - <state relative-caret-position="228"> | |
59 | - <caret line="42" column="70" lean-forward="true" selection-start-line="42" selection-start-column="70" selection-end-line="42" selection-end-column="70" /> | |
56 | + <state relative-caret-position="133"> | |
57 | + <caret line="64" column="29" lean-forward="true" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" /> | |
60 | 58 | <folding> |
61 | 59 | <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> |
62 | 60 | <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> |
... | ... | @@ -387,7 +385,7 @@ |
387 | 385 | <property name="RequestMappingsPanelWidth1" value="75" /> |
388 | 386 | <property name="WebServerToolWindowFactoryState" value="false" /> |
389 | 387 | <property name="aspect.path.notification.shown" value="true" /> |
390 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578455269808" /> | |
388 | + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578455422696" /> | |
391 | 389 | <property name="full.screen.before.presentation.mode" value="false" /> |
392 | 390 | <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" /> |
393 | 391 | <property name="node.js.detected.package.eslint" value="true" /> |
... | ... | @@ -744,14 +742,7 @@ |
744 | 742 | <workItem from="1578293993555" duration="9808000" /> |
745 | 743 | <workItem from="1578358115196" duration="1507000" /> |
746 | 744 | <workItem from="1578379653786" duration="11257000" /> |
747 | - <workItem from="1578444006015" duration="6940000" /> | |
748 | - </task> | |
749 | - <task id="LOCAL-00025" summary="修改任务取消入库组盘状态不回滚,修改任务完成入库单状态不完成"> | |
750 | - <created>1569477488017</created> | |
751 | - <option name="number" value="00025" /> | |
752 | - <option name="presentableId" value="LOCAL-00025" /> | |
753 | - <option name="project" value="LOCAL" /> | |
754 | - <updated>1569477488017</updated> | |
745 | + <workItem from="1578444006015" duration="7109000" /> | |
755 | 746 | </task> |
756 | 747 | <task id="LOCAL-00026" summary="添加自动生成容器编码"> |
757 | 748 | <created>1569484931952</created> |
... | ... | @@ -1089,11 +1080,18 @@ |
1089 | 1080 | <option name="project" value="LOCAL" /> |
1090 | 1081 | <updated>1578385852155</updated> |
1091 | 1082 | </task> |
1092 | - <option name="localTasksCounter" value="74" /> | |
1083 | + <task id="LOCAL-00074" summary="物料打印"> | |
1084 | + <created>1578455348000</created> | |
1085 | + <option name="number" value="00074" /> | |
1086 | + <option name="presentableId" value="LOCAL-00074" /> | |
1087 | + <option name="project" value="LOCAL" /> | |
1088 | + <updated>1578455348001</updated> | |
1089 | + </task> | |
1090 | + <option name="localTasksCounter" value="75" /> | |
1093 | 1091 | <servers /> |
1094 | 1092 | </component> |
1095 | 1093 | <component name="TimeTrackingManager"> |
1096 | - <option name="totallyTimeSpent" value="158315000" /> | |
1094 | + <option name="totallyTimeSpent" value="158484000" /> | |
1097 | 1095 | </component> |
1098 | 1096 | <component name="ToolWindowManager"> |
1099 | 1097 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
... | ... | @@ -1172,7 +1170,6 @@ |
1172 | 1170 | </option> |
1173 | 1171 | </component> |
1174 | 1172 | <component name="VcsManagerConfiguration"> |
1175 | - <MESSAGE value="修改任务执行接口" /> | |
1176 | 1173 | <MESSAGE value="修改接口实体类" /> |
1177 | 1174 | <MESSAGE value="修改接口实体类 修改仓位分配接口" /> |
1178 | 1175 | <MESSAGE value="修改系统管理参数配置添加和修改页面中的模块和类型" /> |
... | ... | @@ -1197,7 +1194,8 @@ |
1197 | 1194 | <MESSAGE value="修复接口bug,新增库存同步物料同步用户同步接口" /> |
1198 | 1195 | <MESSAGE value="托盘条码打印" /> |
1199 | 1196 | <MESSAGE value="库位条码打印" /> |
1200 | - <option name="LAST_COMMIT_MESSAGE" value="库位条码打印" /> | |
1197 | + <MESSAGE value="物料打印" /> | |
1198 | + <option name="LAST_COMMIT_MESSAGE" value="物料打印" /> | |
1201 | 1199 | </component> |
1202 | 1200 | <component name="XDebuggerManager"> |
1203 | 1201 | <breakpoint-manager> |
... | ... | @@ -1687,8 +1685,8 @@ |
1687 | 1685 | </entry> |
1688 | 1686 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html"> |
1689 | 1687 | <provider selected="true" editor-type-id="text-editor"> |
1690 | - <state relative-caret-position="228"> | |
1691 | - <caret line="42" column="70" lean-forward="true" selection-start-line="42" selection-start-column="70" selection-end-line="42" selection-end-column="70" /> | |
1688 | + <state relative-caret-position="133"> | |
1689 | + <caret line="64" column="29" lean-forward="true" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" /> | |
1692 | 1690 | <folding> |
1693 | 1691 | <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> |
1694 | 1692 | <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> |
... | ... |
src/main/resources/templates/config/material/print.html
... | ... | @@ -62,7 +62,7 @@ |
62 | 62 | </td> |
63 | 63 | </tr> |
64 | 64 | <tr> |
65 | - <td>任务数量</td> | |
65 | + <td>物料数量</td> | |
66 | 66 | <td style="text-align:center; padding: 0"> |
67 | 67 | <!--<input name="" type="text" style="line-height:18px; border:0; text-align:center;" th:text="${receiptDetail.qty}"/>--> |
68 | 68 | <input id="qty" name="qty" value="" class="form-control" type="text" style="text-align:center;height:30px;border: none"/> |
... | ... |