Commit 64f365081d3c671f772b43624ca46401af5f252a
1 parent
3551a654
盘点明细页面
Showing
7 changed files
with
302 additions
and
841 deletions
.idea/WMSV1.iml deleted
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<module type="JAVA_MODULE" version="4"> | |
| 3 | - <component name="FacetManager"> | |
| 4 | - <facet type="Spring" name="Spring"> | |
| 5 | - <configuration /> | |
| 6 | - </facet> | |
| 7 | - <facet type="web" name="Web"> | |
| 8 | - <configuration> | |
| 9 | - <webroots /> | |
| 10 | - <sourceRoots> | |
| 11 | - <root url="file://$MODULE_DIR$/src/main/java" /> | |
| 12 | - <root url="file://$MODULE_DIR$/src/main/resources" /> | |
| 13 | - </sourceRoots> | |
| 14 | - </configuration> | |
| 15 | - </facet> | |
| 16 | - </component> | |
| 17 | -</module> | |
| 18 | 0 | \ No newline at end of file |
.idea/workspace.xml
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment=""> | |
| 5 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" /> | |
| 6 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" /> | |
| 4 | + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment=""> | |
| 5 | + <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" /> | |
| 7 | 6 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 8 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" afterDir="false" /> | |
| 9 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html" afterDir="false" /> | |
| 10 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/addGoods.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/addGoods.html" afterDir="false" /> | |
| 11 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/cyclecountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" /> | |
| 12 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/edit.html" afterDir="false" /> | |
| 13 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/add.html" afterDir="false" /> | |
| 14 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" /> | |
| 15 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/edit.html" afterDir="false" /> | |
| 16 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/report.html" afterDir="false" /> | |
| 17 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" /> | |
| 18 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" /> | |
| 19 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" /> | |
| 20 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" /> | |
| 7 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" /> | |
| 8 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" afterDir="false" /> | |
| 9 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" /> | |
| 10 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" /> | |
| 11 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" /> | |
| 21 | 12 | </list> |
| 22 | 13 | <ignored path="$PROJECT_DIR$/target/" /> |
| 23 | - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | |
| 24 | 14 | <option name="SHOW_DIALOG" value="false" /> |
| 25 | 15 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| 26 | 16 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
| 27 | 17 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
| 28 | 18 | </component> |
| 29 | - <component name="DatabaseView"> | |
| 30 | - <option name="SHOW_INTERMEDIATE" value="false" /> | |
| 31 | - <option name="GROUP_DATA_SOURCES" value="true" /> | |
| 32 | - <option name="GROUP_SCHEMA" value="true" /> | |
| 33 | - <option name="GROUP_CONTENTS" value="false" /> | |
| 34 | - <option name="SORT_POSITIONED" value="false" /> | |
| 35 | - <option name="SHOW_EMPTY_GROUPS" value="false" /> | |
| 36 | - <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> | |
| 37 | - <option name="HIDDEN_KINDS"> | |
| 38 | - <set /> | |
| 39 | - </option> | |
| 40 | - <expand> | |
| 41 | - <path> | |
| 42 | - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | |
| 43 | - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
| 44 | - </path> | |
| 45 | - <path> | |
| 46 | - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | |
| 47 | - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
| 48 | - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | |
| 49 | - </path> | |
| 50 | - <path> | |
| 51 | - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | |
| 52 | - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
| 53 | - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | |
| 54 | - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> | |
| 55 | - </path> | |
| 56 | - <path> | |
| 57 | - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | |
| 58 | - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
| 59 | - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | |
| 60 | - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> | |
| 61 | - <item name="location: table" type="285a2a93:MysqlImplModel$Table" /> | |
| 62 | - </path> | |
| 63 | - </expand> | |
| 64 | - <select /> | |
| 65 | - </component> | |
| 66 | 19 | <component name="FileEditorManager"> |
| 67 | - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
| 68 | 20 | <leaf> |
| 69 | 21 | <file pinned="false" current-in-tab="false"> |
| 70 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java"> | |
| 71 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 72 | - </entry> | |
| 73 | - </file> | |
| 74 | - <file pinned="false" current-in-tab="false"> | |
| 75 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 22 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 76 | 23 | <provider selected="true" editor-type-id="text-editor"> |
| 77 | - <state relative-caret-position="639"> | |
| 78 | - <caret line="85" selection-start-line="85" selection-end-line="85" /> | |
| 79 | - <folding> | |
| 80 | - <element signature="imports" expanded="true" /> | |
| 81 | - </folding> | |
| 82 | - <state relative-caret-position="409"> | |
| 83 | - <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" /> | |
| 24 | + <state relative-caret-position="163"> | |
| 25 | + <caret line="46" column="36" lean-forward="true" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" /> | |
| 84 | 26 | </state> |
| 85 | 27 | </provider> |
| 86 | 28 | </entry> |
| 87 | 29 | </file> |
| 88 | 30 | <file pinned="false" current-in-tab="false"> |
| 89 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
| 31 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 90 | 32 | <provider selected="true" editor-type-id="text-editor"> |
| 91 | - <state relative-caret-position="152"> | |
| 92 | - <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> | |
| 33 | + <state relative-caret-position="327"> | |
| 34 | + <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" /> | |
| 93 | 35 | </state> |
| 94 | 36 | </provider> |
| 95 | 37 | </entry> |
| 96 | 38 | </file> |
| 97 | - <file pinned="false" current-in-tab="true"> | |
| 98 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 99 | - <file pinned="false" current-in-tab="true"> | |
| 100 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 39 | + <file pinned="false" current-in-tab="false"> | |
| 40 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> | |
| 101 | 41 | <provider selected="true" editor-type-id="text-editor"> |
| 102 | - <state relative-caret-position="72"> | |
| 103 | - <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" /> | |
| 104 | - <state relative-caret-position="-173"> | |
| 105 | - <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" /> | |
| 42 | + <state relative-caret-position="20"> | |
| 43 | + <caret line="57" column="17" lean-forward="true" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> | |
| 106 | 44 | </state> |
| 107 | 45 | </provider> |
| 108 | 46 | </entry> |
| 109 | 47 | </file> |
| 110 | - <file pinned="false" current-in-tab="false"> | |
| 111 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html"> | |
| 48 | + <file pinned="false" current-in-tab="true"> | |
| 49 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html"> | |
| 112 | 50 | <provider selected="true" editor-type-id="text-editor"> |
| 113 | - <state relative-caret-position="-513"> | |
| 51 | + <state relative-caret-position="186"> | |
| 52 | + <caret line="627" column="34" selection-start-line="627" selection-start-column="34" selection-end-line="627" selection-end-column="34" /> | |
| 114 | 53 | <folding> |
| 115 | - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" /> | |
| 54 | + <element signature="e#2532#2538#0" expanded="true" /> | |
| 55 | + <element signature="e#12645#13357#0" /> | |
| 56 | + <element signature="e#14470#15250#0" /> | |
| 57 | + <element signature="e#15294#16280#0" /> | |
| 58 | + <element signature="e#16281#17279#0" /> | |
| 59 | + <element signature="e#17284#17312#0" /> | |
| 116 | 60 | </folding> |
| 117 | 61 | </state> |
| 118 | 62 | </provider> |
| ... | ... | @@ -120,69 +64,20 @@ |
| 120 | 64 | </file> |
| 121 | 65 | </leaf> |
| 122 | 66 | </component> |
| 123 | - <component name="FileTemplateManagerImpl"> | |
| 124 | - <option name="RECENT_TEMPLATES"> | |
| 125 | - <list> | |
| 126 | - <option value="Class" /> | |
| 127 | - </list> | |
| 128 | - </option> | |
| 129 | - </component> | |
| 130 | 67 | <component name="Git.Settings"> |
| 131 | 68 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 132 | - <option name="RECENT_BRANCH_BY_REPOSITORY"> | |
| 133 | - <map> | |
| 134 | - <entry key="$PROJECT_DIR$" value="master" /> | |
| 135 | - </map> | |
| 136 | - </option> | |
| 137 | - <option name="RESET_MODE" value="HARD" /> | |
| 138 | 69 | </component> |
| 139 | 70 | <component name="IdeDocumentHistory"> |
| 140 | 71 | <option name="CHANGED_PATHS"> |
| 141 | 72 | <list> |
| 142 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" /> | |
| 143 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" /> | |
| 144 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" /> | |
| 145 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" /> | |
| 146 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" /> | |
| 147 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" /> | |
| 148 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" /> | |
| 149 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" /> | |
| 150 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" /> | |
| 151 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" /> | |
| 152 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" /> | |
| 153 | - <option value="$PROJECT_DIR$/pom.xml" /> | |
| 154 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" /> | |
| 155 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" /> | |
| 156 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" /> | |
| 157 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" /> | |
| 158 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" /> | |
| 159 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" /> | |
| 160 | - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" /> | |
| 161 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" /> | |
| 162 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" /> | |
| 163 | - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" /> | |
| 164 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" /> | |
| 165 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" /> | |
| 166 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" /> | |
| 167 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountHeader/mapper/CyclecountHeaderMapperAuto.java" /> | |
| 168 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountDetail/mapper/CyclecountDetailMapper.java" /> | |
| 169 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" /> | |
| 170 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" /> | |
| 171 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" /> | |
| 73 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" /> | |
| 74 | + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" /> | |
| 172 | 75 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" /> |
| 173 | 76 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" /> |
| 174 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" /> | |
| 175 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" /> | |
| 77 | + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" /> | |
| 176 | 78 | </list> |
| 177 | 79 | </option> |
| 178 | 80 | </component> |
| 179 | - <component name="IgnoredFileRootStore"> | |
| 180 | - <option name="generatedRoots"> | |
| 181 | - <set> | |
| 182 | - <option value="E:\code\wms2\.idea" /> | |
| 183 | - </set> | |
| 184 | - </option> | |
| 185 | - </component> | |
| 186 | 81 | <component name="MavenImportPreferences"> |
| 187 | 82 | <option name="importingSettings"> |
| 188 | 83 | <MavenImportingSettings> |
| ... | ... | @@ -202,11 +97,11 @@ |
| 202 | 97 | </treeState> |
| 203 | 98 | </component> |
| 204 | 99 | <component name="ProjectFrameBounds" extendedState="6"> |
| 205 | - <option name="x" value="470" /> | |
| 206 | - <option name="width" value="980" /> | |
| 207 | - <option name="height" value="1030" /> | |
| 100 | + <option name="x" value="-9" /> | |
| 101 | + <option name="y" value="-9" /> | |
| 102 | + <option name="width" value="1938" /> | |
| 103 | + <option name="height" value="1048" /> | |
| 208 | 104 | </component> |
| 209 | - <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> | |
| 210 | 105 | <component name="ProjectLevelVcsManager"> |
| 211 | 106 | <ConfirmationsSetting value="2" id="Add" /> |
| 212 | 107 | </component> |
| ... | ... | @@ -215,6 +110,8 @@ |
| 215 | 110 | <foldersAlwaysOnTop value="true" /> |
| 216 | 111 | </navigator> |
| 217 | 112 | <panes> |
| 113 | + <pane id="Scope" /> | |
| 114 | + <pane id="PackagesPane" /> | |
| 218 | 115 | <pane id="ProjectPane"> |
| 219 | 116 | <subPane> |
| 220 | 117 | <expand> |
| ... | ... | @@ -326,46 +223,7 @@ |
| 326 | 223 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 327 | 224 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 328 | 225 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 329 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 330 | - <item name="mapper" type="462c0819:PsiDirectoryNode" /> | |
| 331 | - </path> | |
| 332 | - <path> | |
| 333 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 334 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 335 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 336 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 337 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 338 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 339 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 340 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 341 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 342 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 343 | - <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 344 | - </path> | |
| 345 | - <path> | |
| 346 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 347 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 348 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 349 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 350 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 351 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 352 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 353 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 354 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 355 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 356 | - </path> | |
| 357 | - <path> | |
| 358 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 359 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 360 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 361 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 362 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 363 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 364 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 365 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 366 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 367 | 226 | <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> |
| 368 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 369 | 227 | </path> |
| 370 | 228 | <path> |
| 371 | 229 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -378,31 +236,6 @@ |
| 378 | 236 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 379 | 237 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 380 | 238 | <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> |
| 381 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 382 | - </path> | |
| 383 | - <path> | |
| 384 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 385 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 386 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 387 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 388 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 389 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 390 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 391 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 392 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 393 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 394 | - </path> | |
| 395 | - <path> | |
| 396 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 397 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 398 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 399 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 400 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 401 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 402 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 403 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 404 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 405 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 406 | 239 | <item name="controller" type="462c0819:PsiDirectoryNode" /> |
| 407 | 240 | </path> |
| 408 | 241 | <path> |
| ... | ... | @@ -410,19 +243,6 @@ |
| 410 | 243 | <item name="wms2" type="462c0819:PsiDirectoryNode" /> |
| 411 | 244 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
| 412 | 245 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 413 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 414 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 415 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 416 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 417 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 418 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 419 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 420 | - </path> | |
| 421 | - <path> | |
| 422 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 423 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 424 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 425 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 426 | 246 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 427 | 247 | </path> |
| 428 | 248 | <path> |
| ... | ... | @@ -451,7 +271,6 @@ |
| 451 | 271 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 452 | 272 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 453 | 273 | <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> |
| 454 | - <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 455 | 274 | </path> |
| 456 | 275 | <path> |
| 457 | 276 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -460,8 +279,6 @@ |
| 460 | 279 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 461 | 280 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 462 | 281 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 463 | - <item name="task" type="462c0819:PsiDirectoryNode" /> | |
| 464 | - <item name="taskHeader" type="462c0819:PsiDirectoryNode" /> | |
| 465 | 282 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 466 | 283 | <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> |
| 467 | 284 | </path> |
| ... | ... | @@ -475,49 +292,18 @@ |
| 475 | 292 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 476 | 293 | <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> |
| 477 | 294 | </path> |
| 478 | - <path> | |
| 479 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 480 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 481 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 482 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 483 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 484 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 485 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 486 | - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
| 487 | - </path> | |
| 488 | 295 | </expand> |
| 489 | 296 | <select /> |
| 490 | 297 | </subPane> |
| 491 | 298 | </pane> |
| 492 | - <pane id="Scope" /> | |
| 493 | - <pane id="PackagesPane" /> | |
| 494 | 299 | </panes> |
| 495 | 300 | </component> |
| 496 | 301 | <component name="PropertiesComponent"> |
| 497 | - <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> | |
| 498 | - <property name="DatabaseDriversLRU" value="mysql" /> | |
| 499 | 302 | <property name="RequestMappingsPanelOrder0" value="0" /> |
| 500 | 303 | <property name="RequestMappingsPanelOrder1" value="1" /> |
| 501 | 304 | <property name="RequestMappingsPanelWidth0" value="75" /> |
| 502 | 305 | <property name="RequestMappingsPanelWidth1" value="75" /> |
| 503 | 306 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| 504 | - <property name="WebServerToolWindowFactoryState" value="false" /> | |
| 505 | - <property name="aspect.path.notification.shown" value="true" /> | |
| 506 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566803879583" /> | |
| 507 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" /> | |
| 508 | - <property name="node.js.detected.package.eslint" value="true" /> | |
| 509 | - <property name="node.js.detected.package.tslint" value="true" /> | |
| 510 | - <property name="node.js.path.for.package.eslint" value="project" /> | |
| 511 | - <property name="node.js.path.for.package.tslint" value="project" /> | |
| 512 | - <property name="node.js.selected.package.eslint" value="(autodetect)" /> | |
| 513 | - <property name="node.js.selected.package.tslint" value="(autodetect)" /> | |
| 514 | - <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> | |
| 515 | - </component> | |
| 516 | - <component name="RecentsManager"> | |
| 517 | - <key name="MoveFile.RECENT_KEYS"> | |
| 518 | - <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
| 519 | - <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
| 520 | - </key> | |
| 521 | 307 | </component> |
| 522 | 308 | <component name="RunDashboard"> |
| 523 | 309 | <option name="ruleStates"> |
| ... | ... | @@ -533,17 +319,7 @@ |
| 533 | 319 | </component> |
| 534 | 320 | <component name="RunManager"> |
| 535 | 321 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> |
| 536 | - <module name="huaheng" /> | |
| 537 | - <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | |
| 538 | - <option name="ALTERNATIVE_JRE_PATH" /> | |
| 539 | - <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 540 | - <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
| 541 | - <method v="2"> | |
| 542 | - <option name="Make" enabled="true" /> | |
| 543 | - </method> | |
| 544 | - </configuration> | |
| 545 | - <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | |
| 546 | - <module name="WMSV1" /> | |
| 322 | + <module name="wms2" /> | |
| 547 | 323 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
| 548 | 324 | <option name="ALTERNATIVE_JRE_PATH" /> |
| 549 | 325 | <method v="2"> |
| ... | ... | @@ -551,117 +327,38 @@ |
| 551 | 327 | </method> |
| 552 | 328 | </configuration> |
| 553 | 329 | </component> |
| 554 | - <component name="ServiceViewManager"> | |
| 555 | - <option name="allServicesViewState"> | |
| 556 | - <serviceView> | |
| 557 | - <treeState> | |
| 558 | - <expand> | |
| 559 | - <path> | |
| 560 | - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> | |
| 561 | - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
| 562 | - </path> | |
| 563 | - </expand> | |
| 564 | - <select /> | |
| 565 | - </treeState> | |
| 566 | - </serviceView> | |
| 567 | - </option> | |
| 568 | - </component> | |
| 569 | 330 | <component name="SvnConfiguration"> |
| 570 | 331 | <configuration /> |
| 571 | 332 | </component> |
| 572 | - <component name="TaskManager"> | |
| 573 | - <task active="true" id="Default" summary="Default task"> | |
| 574 | - <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" /> | |
| 575 | - <created>1565160110910</created> | |
| 576 | - <option name="number" value="Default" /> | |
| 577 | - <option name="presentableId" value="Default" /> | |
| 578 | - <updated>1565160110910</updated> | |
| 579 | - <workItem from="1565160112236" duration="11971000" /> | |
| 580 | - <workItem from="1565224833241" duration="14642000" /> | |
| 581 | - <workItem from="1565242153135" duration="1476000" /> | |
| 582 | - <workItem from="1565259513116" duration="148000" /> | |
| 583 | - <workItem from="1565311988064" duration="7176000" /> | |
| 584 | - <workItem from="1565328536669" duration="797000" /> | |
| 585 | - <workItem from="1566803530593" duration="266000" /> | |
| 586 | - </task> | |
| 587 | - <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> | |
| 588 | - <created>1565226427512</created> | |
| 589 | - <option name="number" value="00001" /> | |
| 590 | - <option name="presentableId" value="LOCAL-00001" /> | |
| 591 | - <option name="project" value="LOCAL" /> | |
| 592 | - <updated>1565226427512</updated> | |
| 593 | - </task> | |
| 594 | - <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面"> | |
| 595 | - <created>1565256884822</created> | |
| 596 | - <option name="number" value="00002" /> | |
| 597 | - <option name="presentableId" value="LOCAL-00002" /> | |
| 598 | - <option name="project" value="LOCAL" /> | |
| 599 | - <updated>1565256884822</updated> | |
| 600 | - </task> | |
| 601 | - <task id="LOCAL-00003" summary="修改库区service"> | |
| 602 | - <created>1565259481656</created> | |
| 603 | - <option name="number" value="00003" /> | |
| 604 | - <option name="presentableId" value="LOCAL-00003" /> | |
| 605 | - <option name="project" value="LOCAL" /> | |
| 606 | - <updated>1565259481656</updated> | |
| 607 | - </task> | |
| 608 | - <option name="localTasksCounter" value="4" /> | |
| 609 | - <servers /> | |
| 610 | - </component> | |
| 611 | - <component name="TimeTrackingManager"> | |
| 612 | - <option name="totallyTimeSpent" value="266000" /> | |
| 613 | - </component> | |
| 614 | 333 | <component name="ToolWindowManager"> |
| 615 | 334 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
| 616 | 335 | <layout> |
| 336 | + <window_info id="Web" side_tool="true" /> | |
| 617 | 337 | <window_info id="Designer" /> |
| 618 | - <window_info id="Image Layers" /> | |
| 619 | - <window_info id="Capture Tool" /> | |
| 620 | 338 | <window_info id="UI Designer" /> |
| 621 | 339 | <window_info id="Favorites" side_tool="true" /> |
| 622 | - <window_info id="Web" side_tool="true" /> | |
| 623 | - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" /> | |
| 340 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2855228" /> | |
| 624 | 341 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 625 | - <window_info anchor="bottom" id="Spring" /> | |
| 626 | - <window_info anchor="bottom" id="Terminal" /> | |
| 627 | 342 | <window_info anchor="bottom" id="Docker" show_stripe_button="false" /> |
| 628 | - <window_info anchor="bottom" id="Event Log" side_tool="true" /> | |
| 629 | - <window_info anchor="bottom" id="Java Enterprise" /> | |
| 630 | 343 | <window_info anchor="bottom" id="Database Changes" /> |
| 631 | 344 | <window_info anchor="bottom" id="Version Control" /> |
| 632 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.1883378" /> | |
| 633 | - <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 634 | - <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 635 | - <window_info id="Designer" order="3" /> | |
| 636 | - <window_info id="UI Designer" order="4" /> | |
| 637 | - <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 638 | - <window_info id="Image Layers" order="6" /> | |
| 639 | - <window_info id="Capture Tool" order="7" /> | |
| 345 | + <window_info anchor="bottom" id="Java Enterprise" /> | |
| 346 | + <window_info anchor="bottom" id="Spring" /> | |
| 347 | + <window_info anchor="bottom" id="MyBatis Log" /> | |
| 348 | + <window_info anchor="bottom" id="Event Log" side_tool="true" /> | |
| 349 | + <window_info anchor="bottom" id="Messages" weight="0.12606232" /> | |
| 640 | 350 | <window_info anchor="bottom" id="Message" order="0" /> |
| 641 | 351 | <window_info anchor="bottom" id="Find" order="1" /> |
| 642 | 352 | <window_info anchor="bottom" id="Run" order="2" /> |
| 643 | - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | |
| 353 | + <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.08073654" /> | |
| 644 | 354 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 645 | 355 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 646 | - <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" /> | |
| 647 | - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
| 648 | - <window_info anchor="bottom" id="Version Control" order="8" weight="0.49433428" /> | |
| 649 | - <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" /> | |
| 650 | - <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" /> | |
| 651 | - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" /> | |
| 652 | - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" /> | |
| 653 | - <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" /> | |
| 654 | - <window_info anchor="bottom" id="Messages" order="14" weight="0.16005665" /> | |
| 655 | - <window_info anchor="bottom" id="MyBatis Log" order="15" /> | |
| 656 | - <window_info anchor="bottom" id="Terminal" order="16" /> | |
| 657 | 356 | <window_info anchor="bottom" id="TODO" order="6" /> |
| 658 | - <window_info anchor="right" id="Maven" weight="0.3297587" /> | |
| 659 | 357 | <window_info anchor="right" id="Palette" /> |
| 660 | - <window_info anchor="right" id="Capture Analysis" /> | |
| 661 | - <window_info anchor="right" id="Database" /> | |
| 662 | - <window_info anchor="right" id="Palette	" /> | |
| 663 | - <window_info anchor="right" id="Theme Preview" /> | |
| 358 | + <window_info anchor="right" id="Maven" weight="0.097184986" /> | |
| 664 | 359 | <window_info anchor="right" id="Bean Validation" /> |
| 360 | + <window_info anchor="right" id="Palette	" /> | |
| 361 | + <window_info anchor="right" id="Database" /> | |
| 665 | 362 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 666 | 363 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| 667 | 364 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| ... | ... | @@ -670,295 +367,70 @@ |
| 670 | 367 | <component name="TypeScriptGeneratedFilesManager"> |
| 671 | 368 | <option name="version" value="1" /> |
| 672 | 369 | </component> |
| 673 | - <component name="Vcs.Log.Tabs.Properties"> | |
| 674 | - <option name="TAB_STATES"> | |
| 675 | - <map> | |
| 676 | - <entry key="MAIN"> | |
| 677 | - <value> | |
| 678 | - <State> | |
| 679 | - <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
| 680 | - <collection /> | |
| 681 | - </option> | |
| 682 | - <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
| 683 | - <collection /> | |
| 684 | - </option> | |
| 685 | - <option name="COLUMN_ORDER" /> | |
| 686 | - </State> | |
| 687 | - </value> | |
| 688 | - </entry> | |
| 689 | - </map> | |
| 690 | - </option> | |
| 691 | - <option name="RECENT_FILTERS"> | |
| 692 | - <map> | |
| 693 | - <entry key="Branch"> | |
| 694 | - <value> | |
| 695 | - <list /> | |
| 696 | - </value> | |
| 697 | - </entry> | |
| 698 | - <entry key="User"> | |
| 699 | - <value> | |
| 700 | - <list /> | |
| 701 | - </value> | |
| 702 | - </entry> | |
| 703 | - </map> | |
| 704 | - </option> | |
| 705 | - </component> | |
| 706 | - <component name="VcsManagerConfiguration"> | |
| 707 | - <MESSAGE value="添加库位、库位类型增删改查接口" /> | |
| 708 | - <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" /> | |
| 709 | - <MESSAGE value="修改库区service" /> | |
| 710 | - <option name="LAST_COMMIT_MESSAGE" value="修改库区service" /> | |
| 711 | - <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" /> | |
| 712 | - <MESSAGE value="添加userWarehouse" /> | |
| 713 | - <MESSAGE value="添加containerCapacity" /> | |
| 714 | - <MESSAGE value="添加物料页面" /> | |
| 715 | - <MESSAGE value="添加商品详情" /> | |
| 716 | - <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" /> | |
| 717 | - <MESSAGE value="添加task实体类" /> | |
| 718 | - <MESSAGE value="添加商品、商品详情页面" /> | |
| 719 | - <MESSAGE value="添加承运商" /> | |
| 720 | - <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" /> | |
| 721 | - <MESSAGE value="添加仓库配置" /> | |
| 722 | - <MESSAGE value="代码错误，库存导包" /> | |
| 723 | - <MESSAGE value="代码错误，导包" /> | |
| 724 | - <MESSAGE value="上架任务查询" /> | |
| 725 | - <MESSAGE value="库存交易搜索" /> | |
| 726 | - <MESSAGE value="库存状态搜索" /> | |
| 727 | - <MESSAGE value="盘点" /> | |
| 728 | - <option name="LAST_COMMIT_MESSAGE" value="盘点" /> | |
| 729 | - </component> | |
| 730 | - <component name="XDebuggerManager"> | |
| 731 | - <breakpoint-manager> | |
| 732 | - <breakpoints> | |
| 733 | - <line-breakpoint enabled="true" type="java-line"> | |
| 734 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url> | |
| 735 | - <line>302</line> | |
| 736 | - <properties /> | |
| 737 | - <option name="timeStamp" value="12" /> | |
| 738 | - </line-breakpoint> | |
| 739 | - <line-breakpoint enabled="true" type="java-line"> | |
| 740 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url> | |
| 741 | - <line>66</line> | |
| 742 | - <properties /> | |
| 743 | - <option name="timeStamp" value="24" /> | |
| 744 | - </line-breakpoint> | |
| 745 | - <line-breakpoint enabled="true" type="java-line"> | |
| 746 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url> | |
| 747 | - <line>26</line> | |
| 748 | - <properties /> | |
| 749 | - <option name="timeStamp" value="25" /> | |
| 750 | - </line-breakpoint> | |
| 751 | - </breakpoints> | |
| 752 | - </breakpoint-manager> | |
| 753 | - <watches-manager> | |
| 754 | - <configuration name="SpringBootApplicationConfigurationType"> | |
| 755 | - <watch expression="receiptTotal" /> | |
| 756 | - <watch expression="this.h" custom="java.lang.reflect.Proxy" /> | |
| 757 | - <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" /> | |
| 758 | - </configuration> | |
| 759 | - </watches-manager> | |
| 760 | - </component> | |
| 761 | 370 | <component name="editorHistoryManager"> |
| 762 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java"> | |
| 371 | + <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> | |
| 763 | 372 | <provider selected="true" editor-type-id="text-editor" /> |
| 764 | 373 | </entry> |
| 765 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 766 | - <provider selected="true" editor-type-id="text-editor"> | |
| 767 | - <state relative-caret-position="409"> | |
| 768 | - <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" /> | |
| 769 | - </state> | |
| 770 | - </provider> | |
| 771 | - </entry> | |
| 772 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
| 773 | - <provider selected="true" editor-type-id="text-editor"> | |
| 774 | - <state relative-caret-position="152"> | |
| 775 | - <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" /> | |
| 776 | - </state> | |
| 777 | - </provider> | |
| 778 | - </entry> | |
| 779 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html"> | |
| 780 | - <provider selected="true" editor-type-id="text-editor"> | |
| 781 | - <state relative-caret-position="-513"> | |
| 782 | - <folding> | |
| 783 | - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" /> | |
| 784 | - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" /> | |
| 785 | - </folding> | |
| 786 | - </state> | |
| 787 | - </provider> | |
| 788 | - </entry> | |
| 789 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java"> | |
| 790 | - <provider selected="true" editor-type-id="text-editor"> | |
| 791 | - <state relative-caret-position="-185"> | |
| 792 | - <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" /> | |
| 793 | - <folding> | |
| 794 | - <element signature="imports" expanded="true" /> | |
| 795 | - </folding> | |
| 796 | - </state> | |
| 797 | - </provider> | |
| 798 | - </entry> | |
| 799 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 800 | - <provider selected="true" editor-type-id="text-editor"> | |
| 801 | - <state relative-caret-position="40"> | |
| 802 | - <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" /> | |
| 803 | - <folding> | |
| 804 | - <element signature="imports" expanded="true" /> | |
| 805 | - </folding> | |
| 806 | - </state> | |
| 807 | - </provider> | |
| 808 | - </entry> | |
| 809 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js"> | |
| 810 | - <provider selected="true" editor-type-id="text-editor"> | |
| 811 | - <state relative-caret-position="213"> | |
| 812 | - <caret line="119" column="12" selection-start-line="119" selection-start-column="12" selection-end-line="119" selection-end-column="12" /> | |
| 813 | - </state> | |
| 814 | - </provider> | |
| 815 | - </entry> | |
| 816 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html"> | |
| 817 | - <provider selected="true" editor-type-id="text-editor"> | |
| 818 | - <state relative-caret-position="-99"> | |
| 819 | - <caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" /> | |
| 820 | - </state> | |
| 821 | - </provider> | |
| 822 | - </entry> | |
| 823 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html"> | |
| 824 | - <provider selected="true" editor-type-id="text-editor"> | |
| 825 | - <state relative-caret-position="312"> | |
| 826 | - <caret line="39" column="41" lean-forward="true" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" /> | |
| 827 | - </state> | |
| 828 | - </provider> | |
| 829 | - </entry> | |
| 830 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java"> | |
| 831 | - <provider selected="true" editor-type-id="text-editor"> | |
| 832 | - <state relative-caret-position="322"> | |
| 833 | - <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" /> | |
| 834 | - </state> | |
| 835 | - </provider> | |
| 836 | - </entry> | |
| 837 | - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java"> | |
| 838 | - <provider selected="true" editor-type-id="text-editor"> | |
| 839 | - <state relative-caret-position="-7"> | |
| 840 | - <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" /> | |
| 841 | - </state> | |
| 842 | - </provider> | |
| 843 | - </entry> | |
| 844 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java"> | |
| 845 | - <provider selected="true" editor-type-id="text-editor"> | |
| 846 | - <state relative-caret-position="226"> | |
| 847 | - <caret line="77" column="143" selection-start-line="77" selection-start-column="143" selection-end-line="77" selection-end-column="143" /> | |
| 848 | - </state> | |
| 849 | - </provider> | |
| 850 | - </entry> | |
| 851 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java"> | |
| 852 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 853 | - </entry> | |
| 854 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java"> | |
| 855 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 856 | - </entry> | |
| 857 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java"> | |
| 374 | + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml"> | |
| 858 | 375 | <provider selected="true" editor-type-id="text-editor" /> |
| 859 | 376 | </entry> |
| 860 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java"> | |
| 861 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 862 | - </entry> | |
| 863 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java"> | |
| 864 | - <provider selected="true" editor-type-id="text-editor"> | |
| 865 | - <state relative-caret-position="40"> | |
| 866 | - <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" /> | |
| 867 | - </state> | |
| 868 | - </provider> | |
| 869 | - </entry> | |
| 870 | 377 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java"> |
| 871 | 378 | <provider selected="true" editor-type-id="text-editor"> |
| 872 | - <state relative-caret-position="420"> | |
| 873 | - <caret line="25" column="15" lean-forward="true" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" /> | |
| 874 | - </state> | |
| 875 | - </provider> | |
| 876 | - </entry> | |
| 877 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java"> | |
| 878 | - <provider selected="true" editor-type-id="text-editor"> | |
| 879 | - <state relative-caret-position="100"> | |
| 880 | - <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" /> | |
| 379 | + <state relative-caret-position="287"> | |
| 380 | + <caret line="607" column="5" lean-forward="true" selection-start-line="607" selection-start-column="5" selection-end-line="607" selection-end-column="5" /> | |
| 881 | 381 | <folding> |
| 882 | - <element signature="e#0#15820#0" expanded="true" /> | |
| 382 | + <element signature="e#11035#11036#0" expanded="true" /> | |
| 383 | + <element signature="e#11064#11065#0" expanded="true" /> | |
| 384 | + <element signature="e#17291#17292#0" expanded="true" /> | |
| 385 | + <element signature="e#17330#17331#0" expanded="true" /> | |
| 386 | + <element signature="e#17395#17396#0" expanded="true" /> | |
| 387 | + <element signature="e#17451#17452#0" expanded="true" /> | |
| 883 | 388 | </folding> |
| 884 | 389 | </state> |
| 885 | 390 | </provider> |
| 886 | 391 | </entry> |
| 887 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java"> | |
| 888 | - <provider selected="true" editor-type-id="text-editor"> | |
| 889 | - <state relative-caret-position="764"> | |
| 890 | - <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" /> | |
| 891 | - <folding> | |
| 892 | - <element signature="e#0#16496#0" expanded="true" /> | |
| 893 | - </folding> | |
| 894 | - </state> | |
| 895 | - </provider> | |
| 896 | - </entry> | |
| 897 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java"> | |
| 392 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html"> | |
| 898 | 393 | <provider selected="true" editor-type-id="text-editor"> |
| 899 | - <state relative-caret-position="120"> | |
| 900 | - <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" /> | |
| 901 | - <folding> | |
| 902 | - <element signature="imports" expanded="true" /> | |
| 903 | - </folding> | |
| 394 | + <state relative-caret-position="176"> | |
| 395 | + <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" /> | |
| 904 | 396 | </state> |
| 905 | 397 | </provider> |
| 906 | 398 | </entry> |
| 907 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
| 399 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 908 | 400 | <provider selected="true" editor-type-id="text-editor"> |
| 909 | - <state relative-caret-position="70"> | |
| 910 | - <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" /> | |
| 401 | + <state relative-caret-position="327"> | |
| 402 | + <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" /> | |
| 911 | 403 | </state> |
| 912 | 404 | </provider> |
| 913 | 405 | </entry> |
| 914 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 406 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 915 | 407 | <provider selected="true" editor-type-id="text-editor"> |
| 916 | - <state relative-caret-position="-173"> | |
| 917 | - <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" /> | |
| 918 | - <state relative-caret-position="639"> | |
| 919 | - <caret line="85" selection-start-line="85" selection-end-line="85" /> | |
| 920 | - <folding> | |
| 921 | - <element signature="imports" expanded="true" /> | |
| 922 | - </folding> | |
| 408 | + <state relative-caret-position="163"> | |
| 409 | + <caret line="46" column="36" lean-forward="true" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" /> | |
| 923 | 410 | </state> |
| 924 | 411 | </provider> |
| 925 | 412 | </entry> |
| 926 | 413 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> |
| 927 | 414 | <provider selected="true" editor-type-id="text-editor"> |
| 928 | - <state relative-caret-position="531"> | |
| 929 | - <caret line="91" selection-start-line="91" selection-end-line="91" /> | |
| 930 | - <folding> | |
| 931 | - <element signature="imports" expanded="true" /> | |
| 932 | - </folding> | |
| 415 | + <state relative-caret-position="20"> | |
| 416 | + <caret line="57" column="17" lean-forward="true" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> | |
| 933 | 417 | </state> |
| 934 | 418 | </provider> |
| 935 | 419 | </entry> |
| 936 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java"> | |
| 420 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html"> | |
| 937 | 421 | <provider selected="true" editor-type-id="text-editor"> |
| 938 | - <state relative-caret-position="4480"> | |
| 939 | - <caret line="231" column="4" selection-start-line="231" selection-start-column="4" selection-end-line="231" selection-end-column="4" /> | |
| 422 | + <state relative-caret-position="186"> | |
| 423 | + <caret line="627" column="34" selection-start-line="627" selection-start-column="34" selection-end-line="627" selection-end-column="34" /> | |
| 940 | 424 | <folding> |
| 941 | - <element signature="e#15677#15678#0" expanded="true" /> | |
| 942 | - <element signature="e#15706#15707#0" expanded="true" /> | |
| 943 | - <element signature="e#15751#15752#0" expanded="true" /> | |
| 944 | - <element signature="e#15787#15788#0" expanded="true" /> | |
| 425 | + <element signature="e#2532#2538#0" expanded="true" /> | |
| 426 | + <element signature="e#12645#13357#0" /> | |
| 427 | + <element signature="e#14470#15250#0" /> | |
| 428 | + <element signature="e#15294#16280#0" /> | |
| 429 | + <element signature="e#16281#17279#0" /> | |
| 430 | + <element signature="e#17284#17312#0" /> | |
| 945 | 431 | </folding> |
| 946 | 432 | </state> |
| 947 | 433 | </provider> |
| 948 | 434 | </entry> |
| 949 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
| 950 | - <provider selected="true" editor-type-id="text-editor"> | |
| 951 | - <state relative-caret-position="303"> | |
| 952 | - <caret line="103" column="20" lean-forward="true" selection-start-line="103" selection-start-column="20" selection-end-line="103" selection-end-column="34" /> | |
| 953 | - </state> | |
| 954 | - </provider> | |
| 955 | - </entry> | |
| 956 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 957 | - <provider selected="true" editor-type-id="text-editor"> | |
| 958 | - <state relative-caret-position="72"> | |
| 959 | - <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" /> | |
| 960 | - </state> | |
| 961 | - </provider> | |
| 962 | - </entry> | |
| 963 | 435 | </component> |
| 964 | 436 | </project> |
| 965 | 437 | \ No newline at end of file |
| ... | ... |
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
| ... | ... | @@ -57,16 +57,32 @@ public class CycleCountDetailController extends BaseController { |
| 57 | 57 | @Log(title = "库存-盘点",operating = "查看盘点明细", action = BusinessType.GRANT) |
| 58 | 58 | @ResponseBody |
| 59 | 59 | public TableDataInfo list(CycleCountDetail cycleCountDetail, String createdBegin, String createdEnd) { |
| 60 | + | |
| 60 | 61 | LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
| 61 | 62 | PageDomain pageDomain = TableSupport.buildPageRequest(); |
| 62 | 63 | Integer pageNum = pageDomain.getPageNum(); |
| 63 | 64 | Integer pageSize = pageDomain.getPageSize(); |
| 64 | 65 | |
| 65 | - lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin) | |
| 66 | + lambdaQueryWrapper.ge( | |
| 67 | + StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin) | |
| 66 | 68 | .le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围 |
| 67 | - .eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库 | |
| 68 | - | |
| 69 | - | |
| 69 | + //.eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库 | |
| 70 | + .eq(cycleCountDetail.getCycleCountHeadId() != null ,CycleCountDetail::getCycleCountHeadId,cycleCountDetail.getCycleCountHeadId())//盘点主单 | |
| 71 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompanyCode()),CycleCountDetail::getCompanyCode, cycleCountDetail.getCompanyCode())//货主 | |
| 72 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getLocationCode()), CycleCountDetail::getLocationCode, cycleCountDetail.getLocationCode()) //库位 | |
| 73 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getContainerCode()), CycleCountDetail::getContainerCode,cycleCountDetail.getContainerCode()) //容器 | |
| 74 | + .eq(cycleCountDetail.getInventoryDetailId() != null, CycleCountDetail::getInventoryDetailId, cycleCountDetail.getInventoryDetailId())//库存明细ID | |
| 75 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getMaterialCode()), CycleCountDetail::getMaterialCode,cycleCountDetail.getMaterialCode())//物料编码 | |
| 76 | + .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialName()), CycleCountDetail::getMaterialName, cycleCountDetail.getMaterialName())//物料名称 | |
| 77 | + .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialSpec()), CycleCountDetail::getMaterialSpec,cycleCountDetail.getMaterialSpec())//物料规格 | |
| 78 | + .eq(cycleCountDetail.getTaskHeaderId() != null, CycleCountDetail::getTaskHeaderId, cycleCountDetail.getTaskHeaderId())//任务主表 | |
| 79 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getInventorySts()), CycleCountDetail::getInventorySts,cycleCountDetail.getInventorySts())//库存状态 | |
| 80 | + .eq(cycleCountDetail.getEnableStatus() != null, CycleCountDetail::getEnableStatus, cycleCountDetail.getEnableStatus())//明细状态 | |
| 81 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getBatch()),CycleCountDetail::getBatch,cycleCountDetail.getBatch())//批次 | |
| 82 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getLot()),CycleCountDetail::getLot,cycleCountDetail.getLot())//批号 | |
| 83 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getProjectNo()),CycleCountDetail::getProjectNo,cycleCountDetail.getProjectNo())//项目号 | |
| 84 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getCreatedBy()),CycleCountDetail::getCreatedBy,cycleCountDetail.getCreatedBy())//创建人 | |
| 85 | + .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompletedBy()), CycleCountDetail::getCompletedBy,cycleCountDetail.getCompletedBy())//完成人 | |
| 70 | 86 | .orderByDesc(CycleCountDetail::getId); |
| 71 | 87 | |
| 72 | 88 | if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) { |
| ... | ... |
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
| ... | ... | @@ -132,11 +132,11 @@ public class CycleCountDetail implements Serializable { |
| 132 | 132 | private Long countedQty; |
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | - * 调整数量 | |
| 135 | + * 差异数量 | |
| 136 | 136 | */ |
| 137 | - @TableField(value = "adjustQty") | |
| 138 | - @ApiModelProperty(value="调整数量") | |
| 139 | - private Long adjustQty; | |
| 137 | + @TableField(value = "gapQty") | |
| 138 | + @ApiModelProperty(value="差异数量") | |
| 139 | + private Long gapQty; | |
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | 142 | * 失败原因 |
| ... | ... | @@ -278,83 +278,19 @@ public class CycleCountDetail implements Serializable { |
| 278 | 278 | @ApiModelProperty(value="项目号") |
| 279 | 279 | private String projectNo; |
| 280 | 280 | |
| 281 | - private static final long serialVersionUID = 1L; | |
| 282 | - | |
| 283 | - public static final String COL_ID = "id"; | |
| 284 | - | |
| 285 | - public static final String COL_COUNTID = "countId"; | |
| 286 | - | |
| 287 | - public static final String COL_ROUND = "round"; | |
| 288 | - | |
| 289 | - public static final String COL_TASKHEADERID = "taskHeaderId"; | |
| 290 | - | |
| 291 | - public static final String COL_TASKDETAILID = "taskDetailId"; | |
| 292 | - | |
| 293 | - public static final String COL_WAREHOUSECODE = "warehouseCode"; | |
| 294 | - | |
| 295 | - public static final String COL_INVENTORYDETAILID = "inventoryDetailId"; | |
| 296 | - | |
| 297 | - public static final String COL_LOCATIONCODE = "locationCode"; | |
| 298 | - | |
| 299 | - public static final String COL_CONTAINERCODE = "containerCode"; | |
| 300 | - | |
| 301 | - public static final String COL_MATERIALCODE = "materialCode"; | |
| 302 | - | |
| 303 | - public static final String COL_MATERIALNAME = "materialName"; | |
| 304 | - | |
| 305 | - public static final String COL_MATERIALSPEC = "materialSpec"; | |
| 306 | - | |
| 307 | - public static final String COL_MATERIALUNIT = "materialUnit"; | |
| 308 | - | |
| 309 | - public static final String COL_COMPANYCODE = "companyCode"; | |
| 310 | - | |
| 311 | - public static final String COL_INVENTORYSTS = "inventorySts"; | |
| 312 | - | |
| 313 | - public static final String COL_SYSTEMQTY = "systemQty"; | |
| 314 | - | |
| 315 | - public static final String COL_COUNTEDQTY = "countedQty"; | |
| 316 | - | |
| 317 | - public static final String COL_ADJUSTQTY = "adjustQty"; | |
| 318 | - | |
| 319 | - public static final String COL_REJECTIONNOTE = "rejectionNote"; | |
| 320 | - | |
| 321 | - public static final String COL_COUNTEDBY = "countedBy"; | |
| 322 | 281 | |
| 323 | - public static final String COL_COUNTEDAT = "countedAt"; | |
| 324 | - | |
| 325 | - public static final String COL_ASSIGNEDTO = "assignedTo"; | |
| 326 | - | |
| 327 | - public static final String COL_ASSIGNEDAT = "assignedAt"; | |
| 328 | - | |
| 329 | - public static final String COL_COMPLETEDBY = "completedBy"; | |
| 330 | - | |
| 331 | - public static final String COL_COMPLETEDAT = "completedAt"; | |
| 332 | - | |
| 333 | - public static final String COL_ENABLESTATUS = "enableStatus"; | |
| 334 | - | |
| 335 | - public static final String COL_CREATED = "created"; | |
| 336 | - | |
| 337 | - public static final String COL_CREATEDBY = "createdBy"; | |
| 338 | - | |
| 339 | - public static final String COL_LASTUPDATED = "lastUpdated"; | |
| 340 | - | |
| 341 | - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy"; | |
| 342 | - | |
| 343 | - public static final String COL_VERSION = "version"; | |
| 344 | - | |
| 345 | - public static final String COL_USERDEF1 = "userDef1"; | |
| 346 | - | |
| 347 | - public static final String COL_USERDEF2 = "userDef2"; | |
| 282 | + /** | |
| 283 | + * 盘点主单号 | |
| 284 | + * */ | |
| 285 | + @TableField(value = "cycleCountHeadId") | |
| 286 | + @ApiModelProperty(value = "盘点主单号") | |
| 287 | + private Integer cycleCountHeadId; | |
| 348 | 288 | |
| 349 | - public static final String COL_USERDEF3 = "userDef3"; | |
| 350 | 289 | |
| 351 | - public static final String COL_PROCESSSTAMP = "processStamp"; | |
| 352 | 290 | |
| 353 | - public static final String COL_BATCH = "batch"; | |
| 354 | 291 | |
| 355 | - public static final String COL_LOT = "lot"; | |
| 292 | + private static final long serialVersionUID = 1L; | |
| 356 | 293 | |
| 357 | - public static final String COL_PROJECTNO = "projectNo"; | |
| 358 | 294 | |
| 359 | 295 | /** |
| 360 | 296 | * 获取ID |
| ... | ... | @@ -665,19 +601,14 @@ public class CycleCountDetail implements Serializable { |
| 665 | 601 | /** |
| 666 | 602 | * 获取调整数量 |
| 667 | 603 | * |
| 668 | - * @return adjustQty - 调整数量 | |
| 604 | + * @return gapQty- 调整数量 | |
| 669 | 605 | */ |
| 670 | - public Long getAdjustQty() { | |
| 671 | - return adjustQty; | |
| 606 | + public Long getGapQty() { | |
| 607 | + return gapQty; | |
| 672 | 608 | } |
| 673 | 609 | |
| 674 | - /** | |
| 675 | - * 设置调整数量 | |
| 676 | - * | |
| 677 | - * @param adjustQty 调整数量 | |
| 678 | - */ | |
| 679 | - public void setAdjustQty(Long adjustQty) { | |
| 680 | - this.adjustQty = adjustQty; | |
| 610 | + public void setGapQty(Long gapQty) { | |
| 611 | + this.gapQty = gapQty; | |
| 681 | 612 | } |
| 682 | 613 | |
| 683 | 614 | /** |
| ... | ... | @@ -1039,4 +970,12 @@ public class CycleCountDetail implements Serializable { |
| 1039 | 970 | public void setProjectNo(String projectNo) { |
| 1040 | 971 | this.projectNo = projectNo; |
| 1041 | 972 | } |
| 973 | + | |
| 974 | + public Integer getCycleCountHeadId() { | |
| 975 | + return cycleCountHeadId; | |
| 976 | + } | |
| 977 | + | |
| 978 | + public void setCycleCountHeadId(Integer cycleCountHeadId) { | |
| 979 | + this.cycleCountHeadId = cycleCountHeadId; | |
| 980 | + } | |
| 1042 | 981 | } |
| 1043 | 982 | \ No newline at end of file |
| ... | ... |
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
| ... | ... | @@ -68,10 +68,13 @@ public class CycleCountHeaderController extends BaseController { |
| 68 | 68 | |
| 69 | 69 | lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountHeader::getCreated, createdBegin) |
| 70 | 70 | .le(StringUtils.isNotEmpty(createdEnd), CycleCountHeader::getCreated, createdEnd)//创建时间范围 |
| 71 | - .eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库 | |
| 72 | - | |
| 73 | - | |
| 74 | - | |
| 71 | + //.eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库 | |
| 72 | + .eq(StringUtils.isNotEmpty(cycleCountHeader.getSourceCode()),CycleCountHeader::getSourceCode,cycleCountHeader.getSourceCode())//源盘点单号 | |
| 73 | + .eq(cycleCountHeader.getId() != null, CycleCountHeader::getId,cycleCountHeader.getId())//ID | |
| 74 | + .eq(StringUtils.isNotEmpty(cycleCountHeader.getMasterCode()),CycleCountHeader::getMasterCode, cycleCountHeader.getMasterCode())//盘点主表编号 | |
| 75 | + .eq(cycleCountHeader.getCountOrderId() != null, CycleCountHeader::getCountOrderId, cycleCountHeader.getCountOrderId())//原始盘点ID | |
| 76 | + .eq(cycleCountHeader.getStatusCyc() != null, CycleCountHeader::getStatusCyc, cycleCountHeader.getStatusCyc()) //盘点单状态 | |
| 77 | + .eq(cycleCountHeader.getCountType() != null ,CycleCountHeader::getCountType, cycleCountHeader.getCountType())//盘点类型 | |
| 75 | 78 | .orderByDesc(CycleCountHeader::getId); |
| 76 | 79 | |
| 77 | 80 | if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ |
| ... | ... |
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
| ... | ... | @@ -6,48 +6,80 @@ |
| 6 | 6 | <div class="row"> |
| 7 | 7 | <div class="col-sm-12"> |
| 8 | 8 | <div class="col-sm-12 select-info"> |
| 9 | - <div class="select-list" th:object="${header}"> | |
| 9 | + <div class="select-list"> | |
| 10 | 10 | <ul> |
| 11 | 11 | <li> |
| 12 | 12 | <form id="cycleHeader-form"> |
| 13 | - 盘点单id：<input type="text" id="headId" name="headId" th:value="*{id}" readonly="readonly"> | |
| 13 | + 盘点主ID：<input type="text" id="cycleCountHeadId" name="cycleCountHeadId" /> | |
| 14 | 14 | </form> |
| 15 | 15 | </li> |
| 16 | 16 | <li> |
| 17 | - 货主编码：<input id="companyCode" type="text" name="companyCode" th:value="*{companyCode}" readonly="readonly"/> | |
| 17 | + 货主编码：<input id="companyCode" type="text" name="companyCode" /> | |
| 18 | 18 | </li> |
| 19 | 19 | <li> |
| 20 | - 盘点单编码：<input id="code" type="text" name="code" th:value="*{code}" readonly="readonly"/> | |
| 20 | + 库位：<input id="locationCode" type="text" name="locationCode" /> | |
| 21 | 21 | </li> |
| 22 | 22 | <li> |
| 23 | - 源盘点单号：<input id="sourceCode" type="text" name="type" th:value="*{sourceCode}" readonly="readonly"> | |
| 23 | + 容器：<input id="containerCode" type="text" name="containerCode" /> | |
| 24 | 24 | </li> |
| 25 | 25 | <li> |
| 26 | - <!--入库类型：<input type="text" name="sourceCode"/>--> | |
| 27 | - 盘点类型：<input id="type" type="text" name="type" th:value="*{typeLabel}" readonly="readonly"> | |
| 26 | + 库存明细ID：<input id = "inventoryDetailId" type="text" name="inventoryDetailId" /> | |
| 28 | 27 | </li> |
| 29 | 28 | <li> |
| 30 | - <!--头 状 态：<input type="text" name="firstStatus"/>--> | |
| 31 | - 状态：<input id = "status" type="text" name="status" th:value="*{statusLabel}" readonly="readonly"> | |
| 29 | + 物料编码：<input id="materialCode" type="text" name="materialCode" /> | |
| 32 | 30 | </li> |
| 33 | 31 | <li> |
| 34 | - 创建时间：<input id="created" type="text" name="created" th:value="*{created}" readonly="readonly"> | |
| 35 | - | |
| 32 | + 物料名称：<input id="materialName" type="text" name="materialName" /> | |
| 36 | 33 | </li> |
| 37 | 34 | <li> |
| 38 | - 创建人：<input id="createdBy" type="text" name="createdBy" th:value="*{createdBy}" readonly="readonly"> | |
| 35 | + 物料规格：<input id="materialSpec" type="text" name="materialSpec" /> | |
| 39 | 36 | </li> |
| 40 | 37 | <li> |
| 41 | - 最后更新时间：<input id="lastUpdated" type="text" name="lastUpdated" th:value="*{lastUpdated}" readonly="readonly"> | |
| 42 | - | |
| 38 | + 任务主表：<input id="taskHeaderId" type="text" name="taskHeaderId" /> | |
| 39 | + </li> | |
| 40 | + <li> | |
| 41 | + 库存状态： | |
| 42 | + <select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}"> | |
| 43 | + <option value="">所有</option> | |
| 44 | + <option th:each="e : ${inventoryStatus}" th:text="${e['dictLabel']}" | |
| 45 | + th:value="${e['dictValue']}"></option> | |
| 46 | + </select> | |
| 47 | + </li> | |
| 48 | + <li> | |
| 49 | + 盘点明细状态：<select name="enableStatus" | |
| 50 | + th:with="lastStatus=${@dict.getType('cyclecountStatus')}"> | |
| 51 | + <option value="">所有</option> | |
| 52 | + <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}" | |
| 53 | + th:value="${e['dictValue']}"></option> | |
| 54 | + </select> | |
| 55 | + </li> | |
| 56 | + <li> | |
| 57 | + 批次：<input id="batch" type="text" name="batch" /> | |
| 58 | + </li> | |
| 59 | + <li> | |
| 60 | + 批号：<input id="lot" type="text" name="lot" /> | |
| 61 | + </li> | |
| 62 | + <li> | |
| 63 | + 项目号：<input id="projectNo" type="text" name="projectNo" /> | |
| 64 | + </li> | |
| 65 | + <li class="time"> | |
| 66 | + <label>创建时间： </label> | |
| 67 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" | |
| 68 | + name="params[createdBegin]"/> | |
| 69 | + <span>-</span> | |
| 70 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" | |
| 71 | + name="params[createdEnd]"/> | |
| 72 | + </li> | |
| 73 | + <li> | |
| 74 | + 创建人：<input id="createdBy" type="text" name="createdBy" /> | |
| 75 | + </li> | |
| 76 | + <li> | |
| 77 | + 完成人：<input id="completedBy" type="text" name="completedBy"/> | |
| 43 | 78 | </li> |
| 44 | 79 | <li> |
| 45 | - 最后更新人：<input id="lastUpdatedBy" type="text" name="lastUpdatedBy" th:value="*{lastUpdatedBy}" readonly="readonly"> | |
| 80 | + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i | |
| 81 | + class="fa fa-search"></i> 搜索</a> | |
| 46 | 82 | </li> |
| 47 | - <!--<li>--> | |
| 48 | - <!--<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i--> | |
| 49 | - <!--class="fa fa-search"></i> 搜索</a>--> | |
| 50 | - <!--</li>--> | |
| 51 | 83 | </ul> |
| 52 | 84 | </div> |
| 53 | 85 | </div> |
| ... | ... | @@ -56,14 +88,6 @@ |
| 56 | 88 | shiro:hasPermission="inventory:cycleCountDetail:add"> |
| 57 | 89 | <i class="fa fa-plus"></i> 新增 |
| 58 | 90 | </a> |
| 59 | - <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="comfirmAllWithNoGapQty()" | |
| 60 | - shiro:hasPermission="inventoryHeader:cycleCountDetail:confirmAll"> | |
| 61 | - <i class="fa fa-vcard"></i> 全部无差异确认 | |
| 62 | - </a> | |
| 63 | - <a class="btn btn-outline btn-danger btn-rounded" onclick="comfirmRemainWithNoGapQty()" | |
| 64 | - shiro:hasPermission="inventoryHeader:cycleCountDetail:confirmRemain"> | |
| 65 | - <i class="fa fa-vcard"></i> 剩余无差异确认 | |
| 66 | - </a>--> | |
| 67 | 91 | <a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()" |
| 68 | 92 | shiro:hasPermission="inventory:cyclecountDetail:cyclecountRepeat"> |
| 69 | 93 | <i class="fa fa-vcard"></i> 差异复盘 |
| ... | ... | @@ -89,10 +113,10 @@ |
| 89 | 113 | var removeFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:remove')}]]; |
| 90 | 114 | var confirmFlag=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:confirm')}]]; |
| 91 | 115 | var createTaskFalg=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:createTask')}]]; |
| 92 | - var prefix = ctx + "inventory/cyclecountDetail"; | |
| 93 | - var prefix_head = ctx + "inventory/cyclecountHeader"; | |
| 116 | + var prefix = ctx + "inventory/cycleCountDetail"; | |
| 117 | + var prefix_head = ctx + "inventory/cycleCountHeader"; | |
| 94 | 118 | var remove_url= prefix + "/remove"; |
| 95 | - var datas = [[${@dict.getType('cyclecountDetailStatus')}]]; | |
| 119 | + var datas = [[${@dict.getType('cyclecountStatus')}]]; | |
| 96 | 120 | var inventoryStatus=[[${@dict.getType('inventoryStatus')}]]; |
| 97 | 121 | var created ; |
| 98 | 122 | |
| ... | ... | @@ -115,63 +139,67 @@ |
| 115 | 139 | }, |
| 116 | 140 | { |
| 117 | 141 | field: 'id', |
| 118 | - title: 'id', | |
| 142 | + title: '明细ID', | |
| 119 | 143 | sortable:true |
| 120 | 144 | }, |
| 121 | 145 | { |
| 122 | - field: 'code', | |
| 123 | - title: '盘点单编码', | |
| 124 | - sortable:false | |
| 146 | + field: 'cycleCountHeadId', | |
| 147 | + title: '盘点主单ID', | |
| 148 | + }, | |
| 149 | + { | |
| 150 | + field: 'warehouseCode', | |
| 151 | + title: '仓库', | |
| 152 | + }, | |
| 153 | + { | |
| 154 | + field: 'countId', | |
| 155 | + title: '盘点内部号', | |
| 156 | + visible: false | |
| 157 | + }, | |
| 158 | + { | |
| 159 | + field: 'round', | |
| 160 | + title: '盘点次数', | |
| 161 | + visible: false | |
| 162 | + }, | |
| 163 | + { | |
| 164 | + field: 'taskHeaderId', | |
| 165 | + title: '任务ID', | |
| 166 | + visible: false | |
| 167 | + }, | |
| 168 | + { | |
| 169 | + field: 'taskDetailId', | |
| 170 | + title: '任务明细ID', | |
| 171 | + visible: false | |
| 125 | 172 | }, |
| 126 | 173 | { |
| 127 | 174 | field: 'companyCode', |
| 128 | - title: '货主' | |
| 175 | + title: '货主', | |
| 176 | + visible: true | |
| 129 | 177 | }, |
| 130 | - // { | |
| 131 | - // field: 'locationId', | |
| 132 | - // title: '库位id' | |
| 133 | - // }, | |
| 134 | 178 | { |
| 135 | 179 | field: 'locationCode', |
| 136 | 180 | title: '库位编码', |
| 137 | - sortable:true | |
| 138 | 181 | }, |
| 139 | 182 | { |
| 140 | 183 | field: 'containerCode', |
| 141 | 184 | title: '容器编号', |
| 142 | - sortable:true | |
| 185 | + | |
| 143 | 186 | }, |
| 144 | - // { | |
| 145 | - // field: 'materialId', | |
| 146 | - // title: '物料Id' | |
| 147 | - // }, | |
| 148 | - /*{ | |
| 187 | + { | |
| 149 | 188 | field: 'materialCode', |
| 150 | - title: '存货编码', | |
| 151 | - sortable:true | |
| 152 | - },*/ | |
| 189 | + title: '物料编码', | |
| 190 | + }, | |
| 153 | 191 | { |
| 154 | 192 | field: 'materialName', |
| 155 | 193 | title: '物料名称', |
| 156 | - sortable:true | |
| 157 | 194 | }, |
| 158 | 195 | { |
| 159 | - field: 'materialSpecification', | |
| 196 | + field: 'materialSpec', | |
| 160 | 197 | title: '物料规格', |
| 161 | - sortable:true | |
| 162 | 198 | }, |
| 163 | 199 | { |
| 164 | - field: 'receiptCode', | |
| 165 | - title: '入库单编码' | |
| 200 | + field: 'materialUnit', | |
| 201 | + title: '物料单位', | |
| 166 | 202 | }, |
| 167 | - // { | |
| 168 | - // field: 'receiptId', | |
| 169 | - // title: '入库单id' | |
| 170 | - // }, | |
| 171 | - // { | |
| 172 | - // field: 'receiptDetailId', | |
| 173 | - // title: '入库单明细id' | |
| 174 | - // }, | |
| 175 | 203 | { |
| 176 | 204 | field: 'batch', |
| 177 | 205 | title: '批次', |
| ... | ... | @@ -183,25 +211,18 @@ |
| 183 | 211 | sortable:true |
| 184 | 212 | }, |
| 185 | 213 | { |
| 186 | - field: 'project', | |
| 214 | + field: 'projectNo', | |
| 187 | 215 | title: '项目号', |
| 188 | 216 | sortable:true |
| 189 | 217 | }, |
| 218 | + | |
| 190 | 219 | { |
| 191 | - field: 'manufactureDate', | |
| 192 | - title: '生产日期' | |
| 193 | - }, | |
| 194 | - { | |
| 195 | - field: 'expirationDate', | |
| 196 | - title: '失效日期' | |
| 197 | - }, | |
| 198 | - { | |
| 199 | - field: 'inventoryStatus', | |
| 220 | + field: 'inventorySts', | |
| 200 | 221 | title: '库存状态', |
| 201 | 222 | formatter: function(value, row, index) { |
| 202 | 223 | return $.table.selectDictLabel(inventoryStatus, value); |
| 203 | 224 | }, |
| 204 | - sortable:true | |
| 225 | + | |
| 205 | 226 | }, |
| 206 | 227 | { |
| 207 | 228 | field: 'systemQty', |
| ... | ... | @@ -216,6 +237,34 @@ |
| 216 | 237 | field: 'gapQty' |
| 217 | 238 | }, |
| 218 | 239 | { |
| 240 | + field: 'rejectionNote', | |
| 241 | + title: '失败原因' | |
| 242 | + }, | |
| 243 | + { | |
| 244 | + field: 'countedBy', | |
| 245 | + title: '盘点创建人' | |
| 246 | + }, | |
| 247 | + { | |
| 248 | + field: 'countedAt', | |
| 249 | + title: '盘点创建日期' | |
| 250 | + }, | |
| 251 | + { | |
| 252 | + field: 'assignedTo', | |
| 253 | + title: '指派用户' | |
| 254 | + }, | |
| 255 | + { | |
| 256 | + field: 'assignedAt', | |
| 257 | + title: '指派时间' | |
| 258 | + }, | |
| 259 | + { | |
| 260 | + field: 'completedBy', | |
| 261 | + title: '完成用户' | |
| 262 | + }, | |
| 263 | + { | |
| 264 | + field: 'completedAt', | |
| 265 | + title: '完成时间' | |
| 266 | + }, | |
| 267 | + { | |
| 219 | 268 | field: 'created', |
| 220 | 269 | title: '创建时间' |
| 221 | 270 | }, |
| ... | ... | @@ -232,11 +281,7 @@ |
| 232 | 281 | title: '更新用户' |
| 233 | 282 | }, |
| 234 | 283 | { |
| 235 | - field: 'fromSource', | |
| 236 | - title: '来源' | |
| 237 | - }, | |
| 238 | - { | |
| 239 | - field: 'status', | |
| 284 | + field: 'enableStatus', | |
| 240 | 285 | title: '盘点明细状态', |
| 241 | 286 | formatter: function(value, row, index) { |
| 242 | 287 | return $.table.selectDictLabel(datas, value); |
| ... | ... | @@ -244,9 +289,14 @@ |
| 244 | 289 | sortable:true |
| 245 | 290 | }, |
| 246 | 291 | { |
| 247 | - field: 'isCreateTask', | |
| 248 | - title: '盘点任务' | |
| 292 | + field: 'processStamp', | |
| 293 | + title: '处理标记' | |
| 294 | + }, | |
| 295 | + { | |
| 296 | + field: 'version', | |
| 297 | + title: '数据版本' | |
| 249 | 298 | }, |
| 299 | + | |
| 250 | 300 | // { |
| 251 | 301 | // field: 'userDef1', |
| 252 | 302 | // title: '自定义字段1' |
| ... | ... | @@ -280,15 +330,15 @@ |
| 280 | 330 | }); |
| 281 | 331 | |
| 282 | 332 | function update() { |
| 283 | - var url = location.search; //获取url中"?"符后的字串 | |
| 333 | + let url = location.search; //获取url中"?"符后的字串 | |
| 284 | 334 | if (url.indexOf("?") != -1) { //判断是否有参数 |
| 285 | - var str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串 | |
| 286 | - strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔） | |
| 335 | + let str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串 | |
| 336 | + let strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔） | |
| 287 | 337 | $.ajax({ |
| 288 | 338 | url: prefix + "/list", |
| 289 | 339 | type:"post", |
| 290 | 340 | data:{ |
| 291 | - code:strs[1] | |
| 341 | + cycleCountHeadId:strs[1] | |
| 292 | 342 | }, |
| 293 | 343 | success:function (res) { |
| 294 | 344 | $("#bootstrap-table").bootstrapTable('removeAll'); |
| ... | ... | @@ -297,36 +347,27 @@ |
| 297 | 347 | $("#bootstrap-table").bootstrapTable('insertRow', {index:i,row:res.data[i]}); |
| 298 | 348 | } |
| 299 | 349 | } |
| 300 | - }) | |
| 350 | + }); | |
| 351 | + return false | |
| 301 | 352 | } |
| 302 | 353 | $.ajax({ |
| 303 | - url:prefix_head+ "/getHeader", | |
| 354 | + url: prefix + "/list", | |
| 304 | 355 | type:"post", |
| 305 | - data:{ | |
| 306 | - id:$('#headId').val() | |
| 307 | - }, | |
| 308 | - success:function (value) { | |
| 309 | - if (value.data) { | |
| 310 | - $('#code').val(value.data.code); | |
| 311 | - $('#type').val(value.data.typeLabel); | |
| 312 | - $('#status').val(value.data.statusLabel); | |
| 313 | - $('#created').val(value.data.created); | |
| 314 | - var text_val=$('#created').val(); | |
| 315 | - $('#created').val(text_val.replace("T"," ")); | |
| 316 | - $('#createdBy').val(value.data.createdBy); | |
| 317 | - $('#lastUpdated').val(value.data.lastUpdated); | |
| 318 | - var text_val_t=$('#lastUpdated').val(); | |
| 319 | - $('#lastUpdated').val(text_val_t.replace("T"," ")); | |
| 320 | - $('#lastUpdatedBy').val(value.data.lastUpdatedBy); | |
| 356 | + data:{}, | |
| 357 | + success:function (res) { | |
| 358 | + $("#bootstrap-table").bootstrapTable('removeAll'); | |
| 359 | + // $("#bootstrap-table").bootstrapTable('append', res.data); | |
| 360 | + for (var i = 0; i < res.data.length; i++) { | |
| 361 | + $("#bootstrap-table").bootstrapTable('insertRow', {index:i,row:res.data[i]}); | |
| 321 | 362 | } |
| 322 | 363 | } |
| 323 | 364 | }) |
| 324 | 365 | } |
| 325 | 366 | function add() { |
| 326 | - var headId = $('#headId').val(); | |
| 367 | + var cycleCountHeadId = $('#cycleCountHeadId').val(); | |
| 327 | 368 | var companyCode = $('#companyCode').val(); |
| 328 | - if(headId !=null && headId!="" && headId!=undefined && companyCode !=null && companyCode!="" && companyCode!=undefined ){ | |
| 329 | - open("添加盘点明细", prefix+"/add?headId=" + headId + "&companyCode=" + companyCode); | |
| 369 | + if(cycleCountHeadId !=null && cycleCountHeadId!="" && cycleCountHeadId!=undefined && companyCode !=null && companyCode!="" && companyCode!=undefined ){ | |
| 370 | + open("添加盘点明细", prefix+"/add?cycleCountHeadId=" + cycleCountHeadId + "&companyCode=" + companyCode); | |
| 330 | 371 | } |
| 331 | 372 | } |
| 332 | 373 | function remove(id) { |
| ... | ... | @@ -351,11 +392,11 @@ |
| 351 | 392 | } |
| 352 | 393 | /**盘点补货*/ |
| 353 | 394 | function addGoods() { |
| 354 | - var headId = $('#headId').val(); | |
| 395 | + var headId = $('#cycleCountHeadId').val(); | |
| 355 | 396 | var companyCode = $('#companyCode').val(); |
| 356 | - var code = $('#code').val(); | |
| 397 | + //var code = $('#code').val(); | |
| 357 | 398 | // var url = prefix+"/addGoods"; |
| 358 | - $.modal.open("盘点补货",prefix+"/addGoods?headId=" + headId + "&companyCode=" + companyCode + "&code=" + code); | |
| 399 | + $.modal.open("盘点补货",prefix+"/addGoods?headId=" + cycleCountHeadId + "&companyCode=" + companyCode ); | |
| 359 | 400 | } |
| 360 | 401 | // |
| 361 | 402 | |
| ... | ... | @@ -520,7 +561,7 @@ |
| 520 | 561 | function comfirmAllWithNoGapQty() { |
| 521 | 562 | $.modal.confirm("确认全部无差异登记么？注意这会覆盖先前登记的信息。", function() { |
| 522 | 563 | var url = prefix + "/comfirmAllWithNoGapQty"; |
| 523 | - var data = { "headId": $('#headId').val() }; | |
| 564 | + var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() }; | |
| 524 | 565 | postInner(url, data); |
| 525 | 566 | }); |
| 526 | 567 | } |
| ... | ... | @@ -531,7 +572,7 @@ |
| 531 | 572 | function comfirmRemainWithNoGapQty() { |
| 532 | 573 | $.modal.confirm("确认剩余无差异登记么？", function() { |
| 533 | 574 | var url = prefix + "/comfirmRemainWithNoGapQty"; |
| 534 | - var data = { "headId": $('#headId').val() }; | |
| 575 | + var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() }; | |
| 535 | 576 | postInner(url, data); |
| 536 | 577 | }); |
| 537 | 578 | } |
| ... | ... | @@ -549,7 +590,7 @@ |
| 549 | 590 | function createCyclecountWithGapQty() { |
| 550 | 591 | $.modal.confirm("确认进行差异复盘么？该操作会将有差异的明细重新生成一个新的盘点单。", function() { |
| 551 | 592 | var url = prefix + "/createCyclecountWithGapQty"; |
| 552 | - var data = { "headId": $('#headId').val() }; | |
| 593 | + var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() }; | |
| 553 | 594 | postInner(url, data); |
| 554 | 595 | }); |
| 555 | 596 | } |
| ... | ... | @@ -558,7 +599,7 @@ |
| 558 | 599 | function adjust() { |
| 559 | 600 | $.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！", function() { |
| 560 | 601 | var url = prefix + "/adjust"; |
| 561 | - var data = { "headId": $('#headId').val() }; | |
| 602 | + var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() }; | |
| 562 | 603 | postInner(url,data); |
| 563 | 604 | }); |
| 564 | 605 | } |
| ... | ... | @@ -592,7 +633,7 @@ |
| 592 | 633 | function outcheckAll() { |
| 593 | 634 | $.modal.confirm("确认进行盘点任务生成么？注意，这将会使未生成盘点任务的明细生成盘点任务！", function() { |
| 594 | 635 | var url = prefix + "/createCyccountTaskByHeadId"; |
| 595 | - var data = { "headId": $('#headId').val() }; | |
| 636 | + var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() }; | |
| 596 | 637 | postInner(url,data); |
| 597 | 638 | }); |
| 598 | 639 | } |
| ... | ... |
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
| ... | ... | @@ -25,14 +25,19 @@ |
| 25 | 25 | <div class="select-list"> |
| 26 | 26 | <ul> |
| 27 | 27 | <li> |
| 28 | - 盘点单号：<input type="text" name="code"/> | |
| 28 | + 盘点主单ID：<input type="text" name="id"/> | |
| 29 | 29 | </li> |
| 30 | 30 | <li> |
| 31 | 31 | 源盘点单号：<input type="text" name="sourceCode"/> |
| 32 | 32 | </li> |
| 33 | 33 | <li> |
| 34 | - <!--头 状 态：<input type="text" name="firstStatus"/>--> | |
| 35 | - 盘点单类型：<select name="type" | |
| 34 | + 盘点主表编号：<input type="text" name="masterCode"/> | |
| 35 | + </li> | |
| 36 | + <li> | |
| 37 | + 原始盘点ID：<input type="text" name="countOrderId"/> | |
| 38 | + </li> | |
| 39 | + <li> | |
| 40 | + 盘点单类型：<select name="countType" | |
| 36 | 41 | th:with="firstStatus=${@dict.getType('cyclecountType')}"> |
| 37 | 42 | <option value="">所有</option> |
| 38 | 43 | <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}" |
| ... | ... | @@ -40,8 +45,7 @@ |
| 40 | 45 | </select> |
| 41 | 46 | </li> |
| 42 | 47 | <li> |
| 43 | - <!--尾 状 态：<input type="text" name="lastStatus"/>--> | |
| 44 | - 盘点单状态：<select name="status" | |
| 48 | + 盘点单状态：<select name="statusCyc" | |
| 45 | 49 | th:with="lastStatus=${@dict.getType('cyclecountStatus')}"> |
| 46 | 50 | <option value="">所有</option> |
| 47 | 51 | <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}" |
| ... | ... | @@ -270,15 +274,18 @@ |
| 270 | 274 | }] |
| 271 | 275 | }; |
| 272 | 276 | $.table.init(options); |
| 273 | - $("#myTab li:eq(1)").one('click', (function () { | |
| 274 | - var cyc_id = $("#bootstrap-table tr:eq(1) td:eq(1)").text(); | |
| 275 | - var cyc_code = $("#bootstrap-table tr:eq(1) td:eq(2)").text(); | |
| 276 | - detail(cyc_id, cyc_code); | |
| 277 | - })); | |
| 277 | + $("#myTab li:eq(1)").click(function () { | |
| 278 | + // var cyc_id = $("#bootstrap-table tr:eq(1) td:eq(1)").text(); | |
| 279 | + // var cyc_code = $("#bootstrap-table tr:eq(1) td:eq(2)").text(); | |
| 280 | + detail(); | |
| 281 | + }); | |
| 278 | 282 | }); |
| 279 | 283 | |
| 280 | - function detail(id, code) { | |
| 281 | - var url = ctx + "inventory/cycleCountDetail?code=" + code; | |
| 284 | + function detail(id) { | |
| 285 | + let url = ctx + "inventory/cycleCountDetail"; | |
| 286 | + if (id) { | |
| 287 | + url = ctx + "inventory/cycleCountDetail?id=" + id; | |
| 288 | + } | |
| 282 | 289 | $("#tabDetail").children().remove(); |
| 283 | 290 | $("#myTab li").removeClass("active"); |
| 284 | 291 | var height = $(document).height() - 100 + 'px'; |
| ... | ... |