diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3c1b81d..5b5276e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" afterDir="false" />
+ <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" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -50,81 +50,33 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1292">
- <caret line="68" column="44" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="44" />
+ <state relative-caret-position="133">
+ <caret line="64" column="29" lean-forward="true" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
+ <folding>
+ <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" />
+ <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" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/material.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="41" column="29" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="38" />
- </state>
- </provider>
- </entry>
- </file>
- <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="150">
- <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
- <folding>
- <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
+ <state relative-caret-position="-3041">
+ <caret line="67" column="12" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="241">
- <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
- <folding>
- <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#2973#2979#0" expanded="true" />
- <element signature="e#2979#2985#0" expanded="true" />
- <element signature="e#2985#2991#0" expanded="true" />
- <element signature="e#2991#2997#0" expanded="true" />
- <element signature="e#2997#3003#0" expanded="true" />
- <element signature="e#3003#3009#0" expanded="true" />
- <element signature="e#3009#3015#0" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#3995#4001#0" expanded="true" />
- <element signature="e#4001#4007#0" expanded="true" />
- <element signature="e#4007#4013#0" expanded="true" />
- <element signature="e#4013#4019#0" expanded="true" />
- <element signature="e#4019#4025#0" expanded="true" />
- <element signature="e#4025#4031#0" expanded="true" />
- <element signature="e#4031#4037#0" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
+ <state relative-caret-position="113">
+ <caret line="193" column="28" lean-forward="true" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" />
</state>
</provider>
</entry>
@@ -169,6 +121,13 @@
<option value="$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html" />
<option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
<option value="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/location.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/print.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/report.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" />
</list>
</option>
</component>
@@ -197,6 +156,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
@@ -248,6 +208,16 @@
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="api" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -271,7 +241,7 @@
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
- <item name="container" type="462c0819:PsiDirectoryNode" />
+ <item name="location" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -283,7 +253,7 @@
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
<item name="config" type="462c0819:PsiDirectoryNode" />
- <item name="container" type="462c0819:PsiDirectoryNode" />
+ <item name="location" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -295,7 +265,8 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="config" type="462c0819:PsiDirectoryNode" />
+ <item name="material" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -306,8 +277,9 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+ <item name="config" type="462c0819:PsiDirectoryNode" />
+ <item name="material" type="462c0819:PsiDirectoryNode" />
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -319,23 +291,31 @@
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
<item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
- <item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
<item name="wms2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
<item name="wms2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -343,8 +323,6 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -353,8 +331,6 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="config" type="462c0819:PsiDirectoryNode" />
- <item name="container" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -363,7 +339,7 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="config" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -372,8 +348,8 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+ <item name="config" type="462c0819:PsiDirectoryNode" />
+ <item name="material" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -382,7 +358,7 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="receipt" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -391,14 +367,13 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="receipt" type="462c0819:PsiDirectoryNode" />
- <item name="receiptHeader" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -410,7 +385,7 @@
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1577352095697" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578455422696" />
<property name="full.screen.before.presentation.mode" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" />
<property name="node.js.detected.package.eslint" value="true" />
@@ -434,6 +409,8 @@
<recent name="com.huaheng.api.general.domain" />
</key>
<key name="CopyFile.RECENT_KEYS">
+ <recent name="D:\wms2\src\main\resources\templates\config\material" />
+ <recent name="D:\wms2\src\main\resources\templates\config\location" />
<recent name="D:\wms2\src\main\resources\templates\config\container" />
<recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" />
</key>
@@ -758,35 +735,14 @@
<workItem from="1577665795897" duration="4942000" />
<workItem from="1577670757674" duration="6000" />
<workItem from="1577670887870" duration="8057000" />
- <workItem from="1577687039415" duration="15130000" />
- </task>
- <task id="LOCAL-00022" summary="修改物料管理中物料类型使用物料类别表，不在使用数据字典">
- <created>1569395439782</created>
- <option name="number" value="00022" />
- <option name="presentableId" value="LOCAL-00022" />
- <option name="project" value="LOCAL" />
- <updated>1569395439782</updated>
- </task>
- <task id="LOCAL-00023" summary="修改波次主表、波次流程头表、波次流程明细页面">
- <created>1569402291802</created>
- <option name="number" value="00023" />
- <option name="presentableId" value="LOCAL-00023" />
- <option name="project" value="LOCAL" />
- <updated>1569402291802</updated>
- </task>
- <task id="LOCAL-00024" summary="修改入库首选项修改添加模块为select">
- <created>1569411473661</created>
- <option name="number" value="00024" />
- <option name="presentableId" value="LOCAL-00024" />
- <option name="project" value="LOCAL" />
- <updated>1569411473661</updated>
- </task>
- <task id="LOCAL-00025" summary="修改任务取消入库组盘状态不回滚，修改任务完成入库单状态不完成">
- <created>1569477488017</created>
- <option name="number" value="00025" />
- <option name="presentableId" value="LOCAL-00025" />
- <option name="project" value="LOCAL" />
- <updated>1569477488017</updated>
+ <workItem from="1577687039415" duration="19596000" />
+ <workItem from="1578012059818" duration="10353000" />
+ <workItem from="1578271903287" duration="2723000" />
+ <workItem from="1578276289137" duration="660000" />
+ <workItem from="1578293993555" duration="9808000" />
+ <workItem from="1578358115196" duration="1507000" />
+ <workItem from="1578379653786" duration="11257000" />
+ <workItem from="1578444006015" duration="7109000" />
</task>
<task id="LOCAL-00026" summary="添加自动生成容器编码">
<created>1569484931952</created>
@@ -1103,17 +1059,45 @@
<option name="project" value="LOCAL" />
<updated>1577669193189</updated>
</task>
- <option name="localTasksCounter" value="71" />
+ <task id="LOCAL-00071" summary="托盘条码打印">
+ <created>1577703299302</created>
+ <option name="number" value="00071" />
+ <option name="presentableId" value="LOCAL-00071" />
+ <option name="project" value="LOCAL" />
+ <updated>1577703299303</updated>
+ </task>
+ <task id="LOCAL-00072" summary="托盘条码打印">
+ <created>1577706582680</created>
+ <option name="number" value="00072" />
+ <option name="presentableId" value="LOCAL-00072" />
+ <option name="project" value="LOCAL" />
+ <updated>1577706582680</updated>
+ </task>
+ <task id="LOCAL-00073" summary="库位条码打印">
+ <created>1578385852154</created>
+ <option name="number" value="00073" />
+ <option name="presentableId" value="LOCAL-00073" />
+ <option name="project" value="LOCAL" />
+ <updated>1578385852155</updated>
+ </task>
+ <task id="LOCAL-00074" summary="物料打印">
+ <created>1578455348000</created>
+ <option name="number" value="00074" />
+ <option name="presentableId" value="LOCAL-00074" />
+ <option name="project" value="LOCAL" />
+ <updated>1578455348001</updated>
+ </task>
+ <option name="localTasksCounter" value="75" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="110601000" />
+ <option name="totallyTimeSpent" value="158484000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.27680966" />
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.23391421" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -1134,8 +1118,8 @@
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.09048257" side_tool="true" weight="0.44192636" />
<window_info anchor="bottom" id="Java Enterprise" order="11" />
<window_info anchor="bottom" id="Database Changes" order="12" />
- <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3286119" />
- <window_info anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" weight="0.509915" />
+ <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3281471" />
+ <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" visible="true" weight="0.43342775" />
<window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -1186,8 +1170,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="添加站台表，入库组盘头表和任务表添加站台，默认为0" />
- <MESSAGE value="修改任务执行接口" />
<MESSAGE value="修改接口实体类" />
<MESSAGE value="修改接口实体类 修改仓位分配接口" />
<MESSAGE value="修改系统管理参数配置添加和修改页面中的模块和类型" />
@@ -1211,7 +1193,9 @@
<MESSAGE value="修改时间搜索无效，添加入库单没有明细不可以提交审核" />
<MESSAGE value="修复接口bug，新增库存同步物料同步用户同步接口" />
<MESSAGE value="托盘条码打印" />
- <option name="LAST_COMMIT_MESSAGE" value="托盘条码打印" />
+ <MESSAGE value="库位条码打印" />
+ <MESSAGE value="物料打印" />
+ <option name="LAST_COMMIT_MESSAGE" value="物料打印" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -1223,12 +1207,6 @@
<option name="timeStamp" value="24" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java</url>
- <line>165</line>
- <properties />
- <option name="timeStamp" value="26" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url>
<line>179</line>
<properties />
@@ -1247,12 +1225,6 @@
<option name="timeStamp" value="87" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java</url>
- <line>35</line>
- <properties />
- <option name="timeStamp" value="101" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java</url>
<line>194</line>
<properties>
@@ -1267,12 +1239,6 @@
<option name="timeStamp" value="121" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java</url>
- <line>312</line>
- <properties />
- <option name="timeStamp" value="123" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/configWarning/service/ConfigWarningService.java</url>
<line>110</line>
<properties />
@@ -1332,423 +1298,398 @@
</SUITE>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="16" column="46" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="46" />
+ <state>
+ <caret column="4" selection-start-column="4" selection-end-column="4" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/LoginApi.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="186">
- <caret line="31" column="32" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="32" />
+ <state relative-caret-position="152">
+ <caret line="675" column="43" lean-forward="true" selection-start-line="675" selection-start-column="43" selection-end-line="675" selection-end-column="43" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" />
- </state>
+ <state relative-caret-position="-962" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ShipmentDomain.java">
+ <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-171" />
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
- <caret line="12" column="48" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="48" />
+ <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="126">
- <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
+ <state>
+ <caret column="49663" selection-start-column="49663" selection-end-column="49663" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml">
+ <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="160">
- <caret line="140" column="2" selection-start-line="140" selection-start-column="2" selection-end-line="140" selection-end-column="2" />
+ <state relative-caret-position="127">
+ <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="214">
- <caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" />
+ <state relative-caret-position="241">
+ <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="290">
- <caret line="38" column="62" selection-start-line="38" selection-start-column="47" selection-end-line="38" selection-end-column="62" />
+ <state relative-caret-position="1330">
+ <caret line="70" column="4" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="70" selection-end-column="22" />
+ <folding>
+ <element signature="n#style#0;n#span#1;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java">
+ <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="233">
- <caret line="304" column="21" lean-forward="true" selection-start-line="304" selection-start-column="21" selection-end-line="304" selection-end-column="21" />
+ <state relative-caret-position="551">
+ <caret line="29" column="24" lean-forward="true" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
+ <folding>
+ <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java">
+ <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="136" column="52" selection-start-line="136" selection-start-column="34" selection-end-line="136" selection-end-column="52" />
+ <state relative-caret-position="19">
+ <caret line="47" column="36" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="e#3995#4001#0" expanded="true" />
+ <element signature="e#4001#4007#0" expanded="true" />
+ <element signature="e#4007#4013#0" expanded="true" />
+ <element signature="e#4013#4019#0" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ShipmentApi.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="31" column="55" lean-forward="true" selection-start-line="31" selection-start-column="55" selection-end-line="31" selection-end-column="55" />
+ <state relative-caret-position="149">
+ <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="236">
- <caret line="111" column="56" selection-start-line="111" selection-start-column="43" selection-end-line="111" selection-end-column="56" />
+ <state relative-caret-position="133">
+ <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="247">
- <caret line="32" column="52" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
+ <state relative-caret-position="149">
+ <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
+ <state relative-caret-position="149">
<caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.class">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
+ <state relative-caret-position="-70">
+ <caret line="41" column="67" selection-start-line="41" selection-start-column="60" selection-end-line="41" selection-end-column="67" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="149">
- <caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
+ <state relative-caret-position="209">
+ <caret line="19" column="11" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="11" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="18" column="29" lean-forward="true" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
+ <state relative-caret-position="133">
+ <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-152">
- <caret line="8" column="60" lean-forward="true" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
+ <state relative-caret-position="296">
+ <caret line="24" column="34" lean-forward="true" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="95">
- <caret line="27" column="89" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="89" />
+ <state relative-caret-position="310">
+ <caret line="35" column="59" lean-forward="true" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/BasicDataApi.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="206">
- <caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" />
+ <state relative-caret-position="291">
+ <caret line="170" column="1" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="1" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
- <caret line="23" column="22" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
+ <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="19">
- <caret line="42" column="28" lean-forward="true" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
- <folding>
- <element signature="e#5266#5267#0" expanded="true" />
- <element signature="e#5320#5321#0" expanded="true" />
- <element signature="e#5486#5487#0" expanded="true" />
- <element signature="e#5551#5552#0" expanded="true" />
- <element signature="e#5726#5727#0" expanded="true" />
- <element signature="e#5796#5797#0" expanded="true" />
- <element signature="e#5950#5951#0" expanded="true" />
- <element signature="e#6008#6009#0" expanded="true" />
- <element signature="e#6166#6167#0" expanded="true" />
- <element signature="e#6222#6223#0" expanded="true" />
- <element signature="e#8470#8471#0" expanded="true" />
- <element signature="e#8520#8521#0" expanded="true" />
- <element signature="e#17198#17199#0" expanded="true" />
- <element signature="e#17266#17267#0" expanded="true" />
- </folding>
+ <state relative-caret-position="247">
+ <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/Receipt.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+ <state relative-caret-position="494">
+ <caret line="35" column="51" selection-start-line="35" selection-start-column="51" selection-end-line="35" selection-end-column="51" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/BasicDataApi.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2907">
- <caret line="170" column="1" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="1" />
+ <state relative-caret-position="665">
+ <caret line="64" column="42" selection-start-line="64" selection-start-column="33" selection-end-line="64" selection-end-column="42" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/InventoryDomain.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
+ <state relative-caret-position="150">
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="657" column="76" selection-start-line="657" selection-start-column="76" selection-end-line="657" selection-end-column="76" />
+ <state relative-caret-position="189">
+ <caret line="66" column="12" lean-forward="true" selection-start-line="66" selection-start-column="12" selection-end-line="66" selection-end-column="12" />
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="171">
- <caret line="70" column="6" selection-start-line="70" selection-start-column="6" selection-end-line="70" selection-end-column="6" />
- </state>
+ <state relative-caret-position="-824" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="76">
- <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+ <state relative-caret-position="-26">
+ <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="57">
- <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
+ <state relative-caret-position="202">
+ <caret line="156" lean-forward="true" selection-start-line="156" selection-end-line="156" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="391">
- <caret line="322" column="10" lean-forward="true" selection-start-line="310" selection-start-column="7" selection-end-line="322" selection-end-column="10" />
+ <state relative-caret-position="317">
+ <caret line="71" selection-start-line="71" selection-end-line="71" />
</state>
</provider>
</entry>
- <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="140">
- <caret line="472" column="4" selection-start-line="472" selection-start-column="4" selection-end-line="472" selection-end-column="4" />
+ <state relative-caret-position="190">
+ <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="128">
- <caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="101" selection-end-column="8" />
+ <state relative-caret-position="304">
+ <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
</state>
</provider>
</entry>
- <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="128">
- <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" />
+ <state relative-caret-position="95">
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="4" selection-start-column="4" selection-end-column="4" />
+ <state relative-caret-position="2812">
+ <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-872">
- <caret line="41" column="33" lean-forward="true" selection-start-line="41" selection-start-column="33" selection-end-line="41" selection-end-column="33" />
+ <state relative-caret-position="61">
+ <caret line="202" selection-start-line="202" selection-end-line="214" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
+ <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="152">
- <caret line="675" column="43" lean-forward="true" selection-start-line="675" selection-start-column="43" selection-end-line="675" selection-end-column="43" />
+ <state relative-caret-position="166">
+ <caret line="1215" column="4" selection-start-line="1215" selection-start-column="4" selection-end-line="1215" selection-end-column="4" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-962" />
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="19">
- <caret line="30207" selection-start-line="30207" selection-end-line="30207" />
+ <state relative-caret-position="190">
+ <caret line="11245" column="4" selection-start-line="11245" selection-start-column="4" selection-end-line="11245" selection-end-column="4" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html">
+ <entry file="file://$USER_HOME$/Desktop/HttpPrinter3.0.0.5_20200103_014305_%E5%90%ABhtml%E7%A4%BA%E4%BE%8B/调用示例/Http协议示例/html/http_test_fastreport.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="70" column="4" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="70" selection-end-column="22" />
- <folding>
- <element signature="n#style#0;n#span#1;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
+ <state relative-caret-position="-3819">
+ <caret line="207" column="42" selection-start-line="207" selection-start-column="27" selection-end-line="207" selection-end-column="42" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-171" />
+ <state relative-caret-position="126">
+ <caret line="60" column="104" selection-start-line="60" selection-start-column="104" selection-end-line="60" selection-end-column="104" />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
+ <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1292">
- <caret line="68" column="44" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="44" />
+ <state relative-caret-position="240">
+ <caret line="46" column="7" selection-start-line="46" selection-start-column="7" selection-end-line="46" selection-end-column="7" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
+ <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="228">
- <caret line="41" column="29" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="38" />
+ <state relative-caret-position="665">
+ <caret line="47" column="29" lean-forward="true" selection-start-line="47" selection-start-column="29" selection-end-line="47" selection-end-column="29" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-316">
- <caret line="43" column="118" selection-start-line="43" selection-start-column="113" selection-end-line="43" selection-end-column="118" />
+ <state relative-caret-position="146">
+ <caret line="113" lean-forward="true" selection-start-line="113" selection-end-line="113" />
</state>
</provider>
</entry>
- <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/location.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="155">
- <caret line="46" column="4" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" />
+ <state relative-caret-position="285">
+ <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="147">
- <caret line="98" column="13" selection-start-line="98" selection-start-column="13" selection-end-line="98" selection-end-column="13" />
- <folding>
- <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
+ <state relative-caret-position="179">
+ <caret line="310" selection-start-line="310" selection-end-line="322" selection-end-column="10" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="241">
- <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
- <folding>
- <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#2973#2979#0" expanded="true" />
- <element signature="e#2979#2985#0" expanded="true" />
- <element signature="e#2985#2991#0" expanded="true" />
- <element signature="e#2991#2997#0" expanded="true" />
- <element signature="e#2997#3003#0" expanded="true" />
- <element signature="e#3003#3009#0" expanded="true" />
- <element signature="e#3009#3015#0" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#3995#4001#0" expanded="true" />
- <element signature="e#4001#4007#0" expanded="true" />
- <element signature="e#4007#4013#0" expanded="true" />
- <element signature="e#4013#4019#0" expanded="true" />
- <element signature="e#4019#4025#0" expanded="true" />
- <element signature="e#4025#4031#0" expanded="true" />
- <element signature="e#4031#4037#0" expanded="true" />
- <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
+ <caret line="105" column="28" lean-forward="true" selection-start-line="105" selection-start-column="28" selection-end-line="105" selection-end-column="28" />
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css">
+ <entry file="file://$USER_HOME$/Desktop/demo.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="152">
- <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" />
+ <state relative-caret-position="19">
+ <caret line="1" column="6" lean-forward="true" selection-start-line="1" selection-start-column="6" selection-end-line="1" selection-end-column="6" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="49663" selection-start-column="49663" selection-end-column="49663" />
+ <state relative-caret-position="208">
+ <caret line="317" column="50" lean-forward="true" selection-start-line="317" selection-start-column="50" selection-end-line="317" selection-end-column="50" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/material.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="127">
- <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" />
+ <state relative-caret-position="-3041">
+ <caret line="67" column="12" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="241">
- <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" />
+ <state relative-caret-position="113">
+ <caret line="193" column="28" lean-forward="true" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
+ <state relative-caret-position="133">
+ <caret line="64" column="29" lean-forward="true" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
<folding>
- <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <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" />
+ <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" />
</folding>
</state>
</provider>
diff --git a/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java b/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
index 4e6771f..509aa71 100644
--- a/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
+++ b/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
@@ -14,6 +14,7 @@ import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.container.domain.Container;
import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.domain.LocationStatus;
import com.huaheng.pc.config.location.service.LocationService;
@@ -312,4 +313,21 @@ public class LocationController extends BaseController {
}
return AjaxResult.success(locations);
}
+
+
+ @RequiresPermissions("iconfig:location:print")
+ @Log(title = "库位条码", operating = "库位条码打印", action = BusinessType.OTHER)
+ @GetMapping("/print/{ids}")
+ public String print(@PathVariable("ids") Integer[] ids, ModelMap mmap)
+ {
+ List<Location> list = new ArrayList<>();
+ for(Integer id:ids){
+ if(id != null) {
+ Location location = locationService.getById(id);
+ list.add(location);
+ }
+ mmap.put("location", list);
+ }
+ return prefix + "/print";
+ }
}
diff --git a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
index 74d5ddd..69d9cb2 100644
--- a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
+++ b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
@@ -18,8 +18,10 @@ import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.material.service.MaterialServiceImpl;
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@Api(tags={"物料控制类"})
@@ -181,4 +184,19 @@ public class MaterialController extends BaseController {
return util.importTemplateExcel("物料");
}
+ @RequiresPermissions("config:material:print")
+ @Log(title = "库存-库存交易明细", operating = "库存交易明细报表打印", action = BusinessType.OTHER)
+ @GetMapping("/print/{ids}")
+ public String report(@PathVariable("ids") Integer[] ids, ModelMap mmap)
+ {
+ List<Material> list = new ArrayList<>();
+ for(Integer id:ids){
+ if(id != null) {
+ Material material = materialService.getById(id);
+ list.add(material);
+ }
+ mmap.put("material", list);
+ }
+ return prefix + "/print";
+ }
}
diff --git a/src/main/resources/templates/config/location/location.html b/src/main/resources/templates/config/location/location.html
index d983495..6e5555d 100644
--- a/src/main/resources/templates/config/location/location.html
+++ b/src/main/resources/templates/config/location/location.html
@@ -71,6 +71,10 @@
<a class="btn btn-outline btn-primary btn-rounded" onclick="addBatch()" shiro:hasPermission="config:location:addBatch">
<i class="fa fa-plus-square-o"></i> 批量新增
</a>
+ <a class="btn btn-outline btn-success btn-rounded" onclick="print()"
+ shiro:hasPermission="inventory:inventoryTransaction:report">
+ <i class="fa fa-plus"></i> 打印
+ </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:location:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
@@ -243,6 +247,20 @@
function addBatch() {
$.modal.open("批量添加", prefix + "/addBatch");
}
+
+ function print() {
+ var rows=$("#bootstrap-table").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ var ids = "";
+ for(var i=0; i<rows.length; i++) {
+ ids = ids + rows[i].id + ","
+ }
+ let url=prefix+'/print/' + ids;
+ $.modal.open("打印",url);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/config/location/print.html b/src/main/resources/templates/config/location/print.html
new file mode 100644
index 0000000..79bca4e
--- /dev/null
+++ b/src/main/resources/templates/config/location/print.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <head th:include="include :: header"></head>
+ <title>库存交易明细</title>
+ <!--<link href="css/bootstrap.min.css" rel="stylesheet" />-->
+ <!--<link href="css/font-awesome.min.css" rel="stylesheet" />-->
+ <!--<!–[if IE]>-->
+ <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />-->
+ <!--<![endif]–>-->
+ <link href="css/bootstrap.min.css" rel="stylesheet" />
+ <link href="css/font-awesome.min.css" rel="stylesheet" />
+ <link href="css/font-awesome-ie7.min.css" rel="stylesheet" />
+ <style type="text/css">
+ body,ul,li{
+ padding:0;
+ margin:0;
+ }
+ ul,li{
+ list-style:none;
+ }
+ .table-bordered td,.table-bordered th{border:0px solid #000!important}
+
+ .ewm_w ul{width:500px; margin:0 auto;}
+ .ewm_w li{width:500px;height:228px; padding:0px;margin:0px auto; display:inline-table;}
+
+ .ewm_w{
+ width:156px;
+ float:left;
+ padding-left:0px;
+ }
+ .r_two{
+ padding-left:20px;
+ }
+ </style>
+</head>
+
+<body>
+<div class="container">
+ <div class="row" style="text-align:right"><span class="hidden-print" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span></div>
+ <div class="row" style="width:500px;padding:0px 0px; margin:0 auto">
+ <div style="width: 312px; margin:0;padding:0;">
+ <div th:each="row:${location}">
+ <div class="ewm_w" >
+ <table style="height: 220px; margin:0;padding:0;" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered">
+ <!--th:each="row:${container}">-->
+ <tbody>
+ <tr>
+ <td align="center">
+ <img id="barcode" name="rotate" />
+ <input th:value="${row.code}" id="code" type="hidden" name="code"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="ewm_w" >
+ <table style="height: 220px; margin:0;padding:0;" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered">
+ <!--th:each="row:${container}">-->
+ <tbody>
+ <tr>
+ <td align="center">
+ <img id="barcode" name="rotate" />
+ <input th:value="${row.code}" id="code" type="hidden" name="code"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div th:include="include :: footer"></div>
+<style type="text/css">
+ @media print {
+ .noprint {
+ display: none;
+ }
+ }
+</style>
+<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
+<script type="text/javascript" src="../../../js/barcode/JsBarcode.all.js"></script>
+<script type="text/javascript">
+ var barcodeStyle = {
+ format: "CODE128",//选择要使用的条形码类型
+ width:1,//设置条之间的宽度
+ height:70,//高度
+ displayValue:true,//是否在条形码下方显示文字
+ // text:"456",//覆盖显示的文本
+ // fontOptions:"bold italic",//使文字加粗体或变斜体
+ font:"monospace",//设置文本的字体fantasy
+ textAlign:"center",//设置文本的水平对齐方式
+ textPosition:"bottom",//设置文本的垂直位置
+ textMargin:1,//设置条形码和文本之间的间距
+ fontSize:17,//设置文本的大小
+ background:"#ffffff",//设置条形码的背景
+ lineColor:"#000000",//设置条和文本的颜色。
+ margin:1//设置条形码周围的空白边距
+ };
+ function print_qrcode() {
+ $('.dy-report').each(function (i, item) {
+ var code= document.getElementsByName("code")[i].getAttribute("value");
+ $(this).find('#barcode').JsBarcode( code, barcodeStyle);
+ document.getElementsByName("rotate")[i].style.transform = 'rotate('+90+'deg)';
+ });
+ }
+ print_qrcode();
+</script>
+
+<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
+<script type="text/javascript">
+ function a(){
+ window.print();
+ }
+</script>
+
+</body>
+</html>
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/config/material/material.html b/src/main/resources/templates/config/material/material.html
index 7487de7..06c5e8d 100644
--- a/src/main/resources/templates/config/material/material.html
+++ b/src/main/resources/templates/config/material/material.html
@@ -50,6 +50,10 @@
<a class="btn btn-outline btn-info btn-rounded" onclick="$.table.importExcel()">
<i class="fa fa-upload"></i> 导入
</a>
+ <a class="btn btn-outline btn-success btn-rounded" onclick="report()"
+ shiro:hasPermission="inventory:inventoryTransaction:report">
+ <i class="fa fa-plus"></i> 打印
+ </a>
</div>
<div class="col-sm-12 select-info">
@@ -230,6 +234,20 @@
};
$.table.init(options);
});
+
+ function report() {
+ var rows=$("#bootstrap-table").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ var ids = "";
+ for(var i=0; i<rows.length; i++) {
+ ids = ids + rows[i].id + ","
+ }
+ let url=prefix+'/print/' + ids;
+ $.modal.open("打印",url);
+ }
</script>
<!-- 导入区域 -->
diff --git a/src/main/resources/templates/config/material/print.html b/src/main/resources/templates/config/material/print.html
new file mode 100644
index 0000000..5b58692
--- /dev/null
+++ b/src/main/resources/templates/config/material/print.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <head th:include="include :: header"></head>
+ <title>物料明细</title>
+ <!--<link href="css/bootstrap.min.css" rel="stylesheet" />-->
+ <!--<link href="css/font-awesome.min.css" rel="stylesheet" />-->
+ <!--<!–[if IE]>-->
+ <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />-->
+ <!--<![endif]–>-->
+
+ <style type="text/css">
+ .table-bordered td, .table-bordered th {
+ border: 1px solid #000 !important;
+ }
+ .table tbody tr td{
+ padding: 3px;
+ text-align: center;
+ }
+ </style>
+</head>
+
+<body id="ddd">
+<div class="noprint container" style="text-align:right; padding: 20px;float: right">
+ <span style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
+</div>
+<div class="container" style=" width:320px;/*height:228px;*/color: #333">
+ <div class="row">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered"
+ th:each="row:${material}">
+ <caption style="font-size:18px;text-align:center; color:#333; padding-bottom: 3px;">长沙华恒机器人系统有限公司</caption>
+ <tbody>
+ <tr>
+ <td width="20%" scope="col">物料编码</td>
+ <td colspan="2" scope="col" style="text-align:center">
+ <span th:text="${row.code}" ></span>
+ </td>
+ </tr>
+ <tr>
+ <td scope="col">物料类别</td>
+ <td colspan="2" scope="col" style="text-align:center">
+ <span th:text="${row.type}" ></span>
+ </td>
+ </tr>
+ <tr style="vertical-align:middle">
+ <td>物料名称</td>
+ <td style="text-align:center">
+ <span th:text="${row.name}"></span>
+ </td>
+ <td rowspan="3" width="15%" style="padding: 2px">
+ <!--<img class="" align="center" valign="middle" style="vertical-align:middle; padding:2px;"/>-->
+ <!--<span class="qrcode"></span>-->
+ <div class="qrcode"></div>
+ </td>
+ </tr>
+ <tr>
+ <td>物料规格</td>
+ <td style="text-align:center">
+ <span th:text="${row.spec}"></span>
+ </td>
+ </tr>
+ <tr>
+ <td>物料数量</td>
+ <td style="text-align:center; padding: 0">
+ <!--<input name="" type="text" style="line-height:18px; border:0; text-align:center;" th:text="${receiptDetail.qty}"/>-->
+ <input id="qty" name="qty" value="" class="form-control" type="text" style="text-align:center;height:30px;border: none"/>
+ </td>
+ </tr>
+ <tr>
+ <td scope="col">项目号</td>
+ <td colspan="2" scope="col" style="text-align:center">
+ <input value="" class="form-control" type="text" style="text-align:center;height:30px;border: none"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+<div th:include="include :: footer"></div>
+<style type="text/css">
+ @media print {
+ .noprint {
+ display: none;
+ }
+ }
+</style>
+<!--<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>-->
+<!--<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>-->
+<script type="text/javascript" src="../../../js/qrcode/qrcode.min.js"></script>
+<script type="text/javascript">
+ function a() {
+ // $("#ddd").jqprint();
+ $(".qrcode").children().remove();
+ print_qrcode();
+ window.print();
+ }
+ function print_qrcode(){
+ $('.dy-report').each(function (i,item) {
+ var company=$(this).children()[1].children[0].innerText;
+ var code16=$(this).children()[1].children[1].innerText;
+ var name=$(this).children()[1].children[2].innerText;
+ var spec=$(this).children()[1].children[3].innerText;
+ var projectNo=$(this).children()[1].children[5].innerText;
+ company=company.substring(5);
+ code16=code16.substring(5);
+ name=name.substring(5);
+ spec=spec.substring(5);
+ projectNo=projectNo.substring(5);
+ var reg=/\t/;
+ name=name.replace(reg,"");
+ var qty=$(this).find('input').val();
+ // var code_text=company+'/'+ code16 +'/' +name+'/'+spec+'/'+qty+'/'+project;
+ var code_text=company+'/'+ name +'/'+ spec +'/'+qty;
+ var QRcode=new QRCode($(this).find('.qrcode')[0],{
+ text:code_text,
+ width:56,
+ height:56,
+ correctLevel:QRCode.CorrectLevel.L
+ });
+ });
+ }
+ print_qrcode();
+
+</script>
+
+</body>
+</html>
+
+
+
+
+
+
+
+