Commit 751bd7c05128d9737e5290c7831c16fde7c48aa4
1 parent
9314d555
代码错误，导包
Showing
8 changed files
with
464 additions
and
42 deletions
.idea/workspace.xml
| ... | ... | @@ -2,41 +2,17 @@ |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | 4 | <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java" afterDir="false" /> | |
| 6 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/domain/MaterialMultiple.java" afterDir="false" /> | |
| 7 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/mapper/MaterialMultipleMapper.java" afterDir="false" /> | |
| 8 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleService.java" afterDir="false" /> | |
| 9 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleServiceImpl.java" afterDir="false" /> | |
| 10 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java" afterDir="false" /> | |
| 11 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/domain/MaterialUnit.java" afterDir="false" /> | |
| 12 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitService.java" afterDir="false" /> | |
| 13 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitServiceImpl.java" afterDir="false" /> | |
| 14 | - <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMultipleMapper.xml" afterDir="false" /> | |
| 15 | - <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" /> | |
| 16 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 17 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" /> | |
| 18 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/domain/MaterialUnit.java" beforeDir="false" /> | |
| 19 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/mapper/MaterialUnitMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/mapper/MaterialUnitMapper.java" afterDir="false" /> | |
| 20 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java" beforeDir="false" /> | |
| 21 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java" beforeDir="false" /> | |
| 6 | + <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> | |
| 22 | 7 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" /> |
| 23 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" beforeDir="false" /> | |
| 24 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java" afterDir="false" /> | |
| 25 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" afterDir="false" /> | |
| 26 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" afterDir="false" /> | |
| 27 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" /> | |
| 28 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" /> | |
| 29 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" afterDir="false" /> | |
| 30 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" /> | |
| 31 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" /> | |
| 8 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" afterDir="false" /> | |
| 9 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" afterDir="false" /> | |
| 32 | 10 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" afterDir="false" /> |
| 33 | 11 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" afterDir="false" /> |
| 34 | 12 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" afterDir="false" /> |
| 35 | 13 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" afterDir="false" /> |
| 36 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialUnitMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialUnitMapper.xml" afterDir="false" /> | |
| 37 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml" beforeDir="false" /> | |
| 38 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" /> | |
| 39 | 14 | </list> |
| 15 | + <ignored path="$PROJECT_DIR$/target/" /> | |
| 40 | 16 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 41 | 17 | <option name="SHOW_DIALOG" value="false" /> |
| 42 | 18 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| ... | ... | @@ -73,6 +49,47 @@ |
| 73 | 49 | </expand> |
| 74 | 50 | <select /> |
| 75 | 51 | </component> |
| 52 | + <component name="FileEditorManager"> | |
| 53 | + <leaf> | |
| 54 | + <file pinned="false" current-in-tab="false"> | |
| 55 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
| 56 | + <provider selected="true" editor-type-id="text-editor"> | |
| 57 | + <state relative-caret-position="-148"> | |
| 58 | + <caret line="54" column="4" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" /> | |
| 59 | + </state> | |
| 60 | + </provider> | |
| 61 | + </entry> | |
| 62 | + </file> | |
| 63 | + <file pinned="false" current-in-tab="false"> | |
| 64 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java"> | |
| 65 | + <provider selected="true" editor-type-id="text-editor"> | |
| 66 | + <state relative-caret-position="195"> | |
| 67 | + <caret line="106" column="22" selection-start-line="106" selection-start-column="12" selection-end-line="106" selection-end-column="22" /> | |
| 68 | + </state> | |
| 69 | + </provider> | |
| 70 | + </entry> | |
| 71 | + </file> | |
| 72 | + <file pinned="false" current-in-tab="true"> | |
| 73 | + <entry file="file://$PROJECT_DIR$/pom.xml"> | |
| 74 | + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" /> | |
| 75 | + <provider selected="true" editor-type-id="text-editor"> | |
| 76 | + <state relative-caret-position="264"> | |
| 77 | + <caret line="355" column="69" selection-start-line="355" selection-start-column="69" selection-end-line="355" selection-end-column="69" /> | |
| 78 | + </state> | |
| 79 | + </provider> | |
| 80 | + </entry> | |
| 81 | + </file> | |
| 82 | + <file pinned="false" current-in-tab="false"> | |
| 83 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java"> | |
| 84 | + <provider selected="true" editor-type-id="text-editor"> | |
| 85 | + <state relative-caret-position="140"> | |
| 86 | + <caret line="16" column="36" selection-start-line="16" selection-start-column="36" selection-end-line="16" selection-end-column="36" /> | |
| 87 | + </state> | |
| 88 | + </provider> | |
| 89 | + </entry> | |
| 90 | + </file> | |
| 91 | + </leaf> | |
| 92 | + </component> | |
| 76 | 93 | <component name="FileTemplateManagerImpl"> |
| 77 | 94 | <option name="RECENT_TEMPLATES"> |
| 78 | 95 | <list> |
| ... | ... | @@ -83,6 +100,11 @@ |
| 83 | 100 | </list> |
| 84 | 101 | </option> |
| 85 | 102 | </component> |
| 103 | + <component name="FindInProjectRecents"> | |
| 104 | + <findStrings> | |
| 105 | + <find>configuration</find> | |
| 106 | + </findStrings> | |
| 107 | + </component> | |
| 86 | 108 | <component name="Git.Settings"> |
| 87 | 109 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 88 | 110 | <option name="RECENT_BRANCH_BY_REPOSITORY"> |
| ... | ... | @@ -90,6 +112,25 @@ |
| 90 | 112 | <entry key="$PROJECT_DIR$" value="master" /> |
| 91 | 113 | </map> |
| 92 | 114 | </option> |
| 115 | + <option name="RESET_MODE" value="HARD" /> | |
| 116 | + </component> | |
| 117 | + <component name="IdeDocumentHistory"> | |
| 118 | + <option name="CHANGED_PATHS"> | |
| 119 | + <list> | |
| 120 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" /> | |
| 121 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" /> | |
| 122 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" /> | |
| 123 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" /> | |
| 124 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" /> | |
| 125 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" /> | |
| 126 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" /> | |
| 127 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" /> | |
| 128 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" /> | |
| 129 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" /> | |
| 130 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" /> | |
| 131 | + <option value="$PROJECT_DIR$/pom.xml" /> | |
| 132 | + </list> | |
| 133 | + </option> | |
| 93 | 134 | </component> |
| 94 | 135 | <component name="IgnoredFileRootStore"> |
| 95 | 136 | <option name="generatedRoots"> |
| ... | ... | @@ -98,10 +139,215 @@ |
| 98 | 139 | </set> |
| 99 | 140 | </option> |
| 100 | 141 | </component> |
| 142 | + <component name="ProjectFrameBounds"> | |
| 143 | + <option name="x" value="-1928" /> | |
| 144 | + <option name="y" value="-8" /> | |
| 145 | + <option name="width" value="1936" /> | |
| 146 | + <option name="height" value="1056" /> | |
| 147 | + </component> | |
| 101 | 148 | <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> |
| 102 | 149 | <component name="ProjectLevelVcsManager"> |
| 103 | 150 | <ConfirmationsSetting value="2" id="Add" /> |
| 104 | 151 | </component> |
| 152 | + <component name="ProjectView"> | |
| 153 | + <navigator proportions="" version="1"> | |
| 154 | + <foldersAlwaysOnTop value="true" /> | |
| 155 | + </navigator> | |
| 156 | + <panes> | |
| 157 | + <pane id="PackagesPane" /> | |
| 158 | + <pane id="Scope" /> | |
| 159 | + <pane id="ProjectPane"> | |
| 160 | + <subPane> | |
| 161 | + <expand> | |
| 162 | + <path> | |
| 163 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 164 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 165 | + </path> | |
| 166 | + <path> | |
| 167 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 168 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 169 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 170 | + </path> | |
| 171 | + <path> | |
| 172 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 173 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 174 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 175 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 176 | + </path> | |
| 177 | + <path> | |
| 178 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 179 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 180 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 181 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 182 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 183 | + </path> | |
| 184 | + <path> | |
| 185 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 186 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 187 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 188 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 189 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 190 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 191 | + </path> | |
| 192 | + <path> | |
| 193 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 194 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 195 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 196 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 197 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 198 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 199 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 200 | + </path> | |
| 201 | + <path> | |
| 202 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 203 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 204 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 205 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 206 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 207 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 208 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 209 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 210 | + </path> | |
| 211 | + <path> | |
| 212 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 213 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 214 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 215 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 216 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 217 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 218 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 219 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 220 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 221 | + </path> | |
| 222 | + <path> | |
| 223 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 224 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 225 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 226 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 227 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 228 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 229 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 230 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 231 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 232 | + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 233 | + </path> | |
| 234 | + <path> | |
| 235 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 236 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 237 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 238 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 239 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 240 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 241 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 242 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 243 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 244 | + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 245 | + <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 246 | + </path> | |
| 247 | + <path> | |
| 248 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 249 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 250 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 251 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 252 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 253 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 254 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 255 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 256 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 257 | + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 258 | + <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 259 | + </path> | |
| 260 | + <path> | |
| 261 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 262 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 263 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 264 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 265 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 266 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 267 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 268 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 269 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 270 | + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 271 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 272 | + </path> | |
| 273 | + <path> | |
| 274 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 275 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 276 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 277 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 278 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 279 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 280 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 281 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 282 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 283 | + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
| 284 | + </path> | |
| 285 | + <path> | |
| 286 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 287 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 288 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 289 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 290 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 291 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 292 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 293 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 294 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 295 | + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" /> | |
| 296 | + <item name="service" type="462c0819:PsiDirectoryNode" /> | |
| 297 | + </path> | |
| 298 | + <path> | |
| 299 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 300 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 301 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 302 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 303 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 304 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 305 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 306 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 307 | + <item name="monitor" type="462c0819:PsiDirectoryNode" /> | |
| 308 | + </path> | |
| 309 | + <path> | |
| 310 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 311 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 312 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 313 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 314 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 315 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 316 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 317 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 318 | + <item name="monitor" type="462c0819:PsiDirectoryNode" /> | |
| 319 | + <item name="logExecption" type="462c0819:PsiDirectoryNode" /> | |
| 320 | + </path> | |
| 321 | + <path> | |
| 322 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 323 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 324 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 325 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 326 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 327 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 328 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 329 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 330 | + <item name="monitor" type="462c0819:PsiDirectoryNode" /> | |
| 331 | + <item name="logExecption" type="462c0819:PsiDirectoryNode" /> | |
| 332 | + <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 333 | + </path> | |
| 334 | + <path> | |
| 335 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 336 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 337 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 338 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 339 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 340 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 341 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 342 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 343 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
| 344 | + </path> | |
| 345 | + </expand> | |
| 346 | + <select /> | |
| 347 | + </subPane> | |
| 348 | + </pane> | |
| 349 | + </panes> | |
| 350 | + </component> | |
| 105 | 351 | <component name="PropertiesComponent"> |
| 106 | 352 | <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> |
| 107 | 353 | <property name="DatabaseDriversLRU" value="mysql" /> |
| ... | ... | @@ -128,6 +374,11 @@ |
| 128 | 374 | <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> |
| 129 | 375 | </component> |
| 130 | 376 | <component name="RecentsManager"> |
| 377 | + <key name="MoveFile.RECENT_KEYS"> | |
| 378 | + <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" /> | |
| 379 | + <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
| 380 | + <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
| 381 | + </key> | |
| 131 | 382 | <key name="CopyFile.RECENT_KEYS"> |
| 132 | 383 | <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> |
| 133 | 384 | <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" /> |
| ... | ... | @@ -135,11 +386,6 @@ |
| 135 | 386 | <recent name="E:\code\wms2\target\classes\static\file" /> |
| 136 | 387 | <recent name="E:\code\wms2\src\main\resources\static\file" /> |
| 137 | 388 | </key> |
| 138 | - <key name="MoveFile.RECENT_KEYS"> | |
| 139 | - <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" /> | |
| 140 | - <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
| 141 | - <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
| 142 | - </key> | |
| 143 | 389 | </component> |
| 144 | 390 | <component name="RunDashboard"> |
| 145 | 391 | <option name="configurationTypes"> |
| ... | ... | @@ -157,12 +403,14 @@ |
| 157 | 403 | </RuleState> |
| 158 | 404 | </list> |
| 159 | 405 | </option> |
| 406 | + <option name="contentProportion" value="0.052489176" /> | |
| 160 | 407 | </component> |
| 161 | 408 | <component name="RunManager"> |
| 162 | 409 | <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> |
| 163 | - <module name="huaheng" /> | |
| 410 | + <module name="wms2" /> | |
| 164 | 411 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
| 165 | - <option name="ALTERNATIVE_JRE_PATH" /> | |
| 412 | + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> | |
| 413 | + <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" /> | |
| 166 | 414 | <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
| 167 | 415 | <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
| 168 | 416 | <method v="2"> |
| ... | ... | @@ -332,6 +580,51 @@ |
| 332 | 580 | <option name="localTasksCounter" value="15" /> |
| 333 | 581 | <servers /> |
| 334 | 582 | </component> |
| 583 | + <component name="TodoView"> | |
| 584 | + <todo-panel id="selected-file"> | |
| 585 | + <is-autoscroll-to-source value="true" /> | |
| 586 | + </todo-panel> | |
| 587 | + <todo-panel id="all"> | |
| 588 | + <are-packages-shown value="true" /> | |
| 589 | + <is-autoscroll-to-source value="true" /> | |
| 590 | + </todo-panel> | |
| 591 | + </component> | |
| 592 | + <component name="ToolWindowManager"> | |
| 593 | + <frame x="-1928" y="-8" width="1936" height="1056" extended-state="0" /> | |
| 594 | + <editor active="true" /> | |
| 595 | + <layout> | |
| 596 | + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.25" /> | |
| 597 | + <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 598 | + <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 599 | + <window_info id="Designer" order="3" /> | |
| 600 | + <window_info id="UI Designer" order="4" /> | |
| 601 | + <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" /> | |
| 602 | + <window_info anchor="bottom" id="Message" order="0" /> | |
| 603 | + <window_info anchor="bottom" id="Find" order="1" /> | |
| 604 | + <window_info anchor="bottom" id="Run" order="2" /> | |
| 605 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | |
| 606 | + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
| 607 | + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | |
| 608 | + <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" /> | |
| 609 | + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
| 610 | + <window_info anchor="bottom" id="Version Control" order="8" weight="0.54989153" /> | |
| 611 | + <window_info anchor="bottom" id="Run Dashboard" order="9" weight="0.5780911" /> | |
| 612 | + <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" /> | |
| 613 | + <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" /> | |
| 614 | + <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" /> | |
| 615 | + <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" /> | |
| 616 | + <window_info anchor="bottom" id="Messages" order="14" visible="true" weight="0.15292841" /> | |
| 617 | + <window_info anchor="bottom" id="MyBatis Log" order="15" /> | |
| 618 | + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | |
| 619 | + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | |
| 620 | + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | |
| 621 | + <window_info anchor="right" id="Palette" order="3" /> | |
| 622 | + <window_info anchor="right" id="Maven" order="4" /> | |
| 623 | + <window_info anchor="right" id="Bean Validation" order="5" /> | |
| 624 | + <window_info anchor="right" id="Database" order="6" /> | |
| 625 | + <window_info anchor="right" id="Palette	" order="7" /> | |
| 626 | + </layout> | |
| 627 | + </component> | |
| 335 | 628 | <component name="TypeScriptGeneratedFilesManager"> |
| 336 | 629 | <option name="version" value="1" /> |
| 337 | 630 | </component> |
| ... | ... | @@ -341,7 +634,20 @@ |
| 341 | 634 | <entry key="MAIN"> |
| 342 | 635 | <value> |
| 343 | 636 | <State> |
| 344 | - <option name="COLUMN_ORDER" /> | |
| 637 | + <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
| 638 | + <collection /> | |
| 639 | + </option> | |
| 640 | + <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
| 641 | + <collection /> | |
| 642 | + </option> | |
| 643 | + <option name="COLUMN_ORDER"> | |
| 644 | + <list> | |
| 645 | + <option value="0" /> | |
| 646 | + <option value="1" /> | |
| 647 | + <option value="2" /> | |
| 648 | + <option value="3" /> | |
| 649 | + </list> | |
| 650 | + </option> | |
| 345 | 651 | </State> |
| 346 | 652 | </value> |
| 347 | 653 | </entry> |
| ... | ... | @@ -377,7 +683,8 @@ |
| 377 | 683 | <MESSAGE value="添加承运商" /> |
| 378 | 684 | <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" /> |
| 379 | 685 | <MESSAGE value="添加仓库配置" /> |
| 380 | - <option name="LAST_COMMIT_MESSAGE" value="添加仓库配置" /> | |
| 686 | + <MESSAGE value="代码错误，库存导包" /> | |
| 687 | + <option name="LAST_COMMIT_MESSAGE" value="代码错误，库存导包" /> | |
| 381 | 688 | </component> |
| 382 | 689 | <component name="XDebuggerManager"> |
| 383 | 690 | <breakpoint-manager> |
| ... | ... | @@ -385,19 +692,126 @@ |
| 385 | 692 | <line-breakpoint enabled="true" type="java-line"> |
| 386 | 693 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url> |
| 387 | 694 | <line>302</line> |
| 695 | + <properties /> | |
| 388 | 696 | <option name="timeStamp" value="12" /> |
| 389 | 697 | </line-breakpoint> |
| 390 | 698 | <line-breakpoint enabled="true" type="java-line"> |
| 391 | 699 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url> |
| 392 | 700 | <line>66</line> |
| 701 | + <properties /> | |
| 393 | 702 | <option name="timeStamp" value="24" /> |
| 394 | 703 | </line-breakpoint> |
| 395 | 704 | <line-breakpoint enabled="true" type="java-line"> |
| 396 | 705 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url> |
| 397 | 706 | <line>26</line> |
| 707 | + <properties /> | |
| 398 | 708 | <option name="timeStamp" value="25" /> |
| 399 | 709 | </line-breakpoint> |
| 400 | 710 | </breakpoints> |
| 401 | 711 | </breakpoint-manager> |
| 402 | 712 | </component> |
| 713 | + <component name="editorHistoryManager"> | |
| 714 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java"> | |
| 715 | + <provider selected="true" editor-type-id="text-editor"> | |
| 716 | + <state relative-caret-position="100"> | |
| 717 | + <caret line="8" column="91" lean-forward="true" selection-start-line="8" selection-start-column="91" selection-end-line="8" selection-end-column="91" /> | |
| 718 | + </state> | |
| 719 | + </provider> | |
| 720 | + </entry> | |
| 721 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java"> | |
| 722 | + <provider selected="true" editor-type-id="text-editor"> | |
| 723 | + <state relative-caret-position="100"> | |
| 724 | + <caret line="8" column="94" selection-start-line="8" selection-start-column="94" selection-end-line="8" selection-end-column="94" /> | |
| 725 | + </state> | |
| 726 | + </provider> | |
| 727 | + </entry> | |
| 728 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java"> | |
| 729 | + <provider selected="true" editor-type-id="text-editor"> | |
| 730 | + <state relative-caret-position="100"> | |
| 731 | + <caret line="7" column="66" selection-start-line="7" selection-start-column="66" selection-end-line="7" selection-end-column="66" /> | |
| 732 | + </state> | |
| 733 | + </provider> | |
| 734 | + </entry> | |
| 735 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java"> | |
| 736 | + <provider selected="true" editor-type-id="text-editor"> | |
| 737 | + <state relative-caret-position="100"> | |
| 738 | + <caret line="5" column="67" lean-forward="true" selection-start-line="5" selection-start-column="67" selection-end-line="5" selection-end-column="67" /> | |
| 739 | + <folding> | |
| 740 | + <element signature="imports" expanded="true" /> | |
| 741 | + </folding> | |
| 742 | + </state> | |
| 743 | + </provider> | |
| 744 | + </entry> | |
| 745 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java"> | |
| 746 | + <provider selected="true" editor-type-id="text-editor"> | |
| 747 | + <state relative-caret-position="140"> | |
| 748 | + <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" /> | |
| 749 | + </state> | |
| 750 | + </provider> | |
| 751 | + </entry> | |
| 752 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java"> | |
| 753 | + <provider selected="true" editor-type-id="text-editor"> | |
| 754 | + <state relative-caret-position="300"> | |
| 755 | + <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> | |
| 756 | + </state> | |
| 757 | + </provider> | |
| 758 | + </entry> | |
| 759 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java"> | |
| 760 | + <provider selected="true" editor-type-id="text-editor"> | |
| 761 | + <state relative-caret-position="120"> | |
| 762 | + <caret line="88" column="70" selection-start-line="88" selection-start-column="70" selection-end-line="88" selection-end-column="70" /> | |
| 763 | + </state> | |
| 764 | + </provider> | |
| 765 | + </entry> | |
| 766 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java"> | |
| 767 | + <provider selected="true" editor-type-id="text-editor"> | |
| 768 | + <state relative-caret-position="128"> | |
| 769 | + <caret line="106" column="27" selection-start-line="106" selection-start-column="27" selection-end-line="106" selection-end-column="27" /> | |
| 770 | + </state> | |
| 771 | + </provider> | |
| 772 | + </entry> | |
| 773 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java"> | |
| 774 | + <provider selected="true" editor-type-id="text-editor"> | |
| 775 | + <state relative-caret-position="92"> | |
| 776 | + <caret line="127" column="62" lean-forward="true" selection-start-line="127" selection-start-column="62" selection-end-line="127" selection-end-column="62" /> | |
| 777 | + </state> | |
| 778 | + </provider> | |
| 779 | + </entry> | |
| 780 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
| 781 | + <provider selected="true" editor-type-id="text-editor"> | |
| 782 | + <state relative-caret-position="-148"> | |
| 783 | + <caret line="54" column="4" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" /> | |
| 784 | + </state> | |
| 785 | + </provider> | |
| 786 | + </entry> | |
| 787 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java"> | |
| 788 | + <provider selected="true" editor-type-id="text-editor"> | |
| 789 | + <state relative-caret-position="140"> | |
| 790 | + <caret line="16" column="36" selection-start-line="16" selection-start-column="36" selection-end-line="16" selection-end-column="36" /> | |
| 791 | + </state> | |
| 792 | + </provider> | |
| 793 | + </entry> | |
| 794 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java"> | |
| 795 | + <provider selected="true" editor-type-id="text-editor"> | |
| 796 | + <state relative-caret-position="-4806"> | |
| 797 | + <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" /> | |
| 798 | + </state> | |
| 799 | + </provider> | |
| 800 | + </entry> | |
| 801 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java"> | |
| 802 | + <provider selected="true" editor-type-id="text-editor"> | |
| 803 | + <state relative-caret-position="195"> | |
| 804 | + <caret line="106" column="22" selection-start-line="106" selection-start-column="12" selection-end-line="106" selection-end-column="22" /> | |
| 805 | + </state> | |
| 806 | + </provider> | |
| 807 | + </entry> | |
| 808 | + <entry file="file://$PROJECT_DIR$/pom.xml"> | |
| 809 | + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" /> | |
| 810 | + <provider selected="true" editor-type-id="text-editor"> | |
| 811 | + <state relative-caret-position="264"> | |
| 812 | + <caret line="355" column="69" selection-start-line="355" selection-start-column="69" selection-end-line="355" selection-end-column="69" /> | |
| 813 | + </state> | |
| 814 | + </provider> | |
| 815 | + </entry> | |
| 816 | + </component> | |
| 403 | 817 | </project> |
| 404 | 818 | \ No newline at end of file |
| ... | ... |
src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
| ... | ... | @@ -17,6 +17,7 @@ import com.huaheng.framework.web.page.TableSupport; |
| 17 | 17 | import com.huaheng.pc.general.company.service.CompanyService; |
| 18 | 18 | import com.huaheng.pc.general.warehouse.service.WarehouseService; |
| 19 | 19 | import com.huaheng.pc.general.warehouse.domain.Warehouse; |
| 20 | +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; | |
| 20 | 21 | import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; |
| 21 | 22 | import com.huaheng.pc.system.dict.service.IDictDataService; |
| 22 | 23 | import com.huaheng.pc.system.dict.service.IDictTypeService; |
| ... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
| ... | ... | @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; |
| 7 | 7 | import io.swagger.annotations.ApiModel; |
| 8 | 8 | import io.swagger.annotations.ApiModelProperty; |
| 9 | 9 | import java.io.Serializable; |
| 10 | +import java.math.BigDecimal; | |
| 10 | 11 | import java.util.Date; |
| 11 | 12 | import lombok.Data; |
| 12 | 13 | |
| ... | ... | @@ -89,21 +90,21 @@ public class InventoryDetail implements Serializable { |
| 89 | 90 | */ |
| 90 | 91 | @TableField(value = "qty") |
| 91 | 92 | @ApiModelProperty(value="在库数量") |
| 92 | - private Long qty; | |
| 93 | + private BigDecimal qty; | |
| 93 | 94 | |
| 94 | 95 | /** |
| 95 | 96 | * 任务数量 |
| 96 | 97 | */ |
| 97 | 98 | @TableField(value = "taskQty") |
| 98 | 99 | @ApiModelProperty(value="任务数量") |
| 99 | - private Long taskQty; | |
| 100 | + private BigDecimal taskQty; | |
| 100 | 101 | |
| 101 | 102 | /** |
| 102 | 103 | * 冻结数量 |
| 103 | 104 | */ |
| 104 | 105 | @TableField(value = "lockedQty") |
| 105 | 106 | @ApiModelProperty(value="冻结数量") |
| 106 | - private Long lockedQty; | |
| 107 | + private BigDecimal lockedQty; | |
| 107 | 108 | |
| 108 | 109 | /** |
| 109 | 110 | * 库存状态 |
| ... | ... |
src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java
| ... | ... | @@ -9,10 +9,12 @@ import io.swagger.annotations.ApiModelProperty; |
| 9 | 9 | import java.io.Serializable; |
| 10 | 10 | import java.util.Date; |
| 11 | 11 | import lombok.Data; |
| 12 | +import lombok.EqualsAndHashCode; | |
| 12 | 13 | |
| 13 | 14 | @ApiModel(value="com.huaheng.pc.monitor.logExecption.domain.LogExecption") |
| 14 | 15 | @Data |
| 15 | 16 | @TableName(value = "log_execption") |
| 17 | +@EqualsAndHashCode(callSuper = false) | |
| 16 | 18 | public class LogExecption extends RuntimeException implements Serializable { |
| 17 | 19 | /** |
| 18 | 20 | * 主键，自增字段 |
| ... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
| ... | ... | @@ -9,6 +9,7 @@ import com.huaheng.pc.general.location.domain.Location; |
| 9 | 9 | import com.huaheng.pc.general.location.service.LocationService; |
| 10 | 10 | import com.huaheng.pc.general.material.domain.Material; |
| 11 | 11 | import com.huaheng.pc.general.material.service.MaterialService; |
| 12 | +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
| 12 | 13 | import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; |
| 13 | 14 | import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail; |
| 14 | 15 | import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService; |
| ... | ... |
src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java
| ... | ... | @@ -9,6 +9,7 @@ import com.huaheng.framework.web.controller.BaseController; |
| 9 | 9 | import com.huaheng.framework.web.domain.AjaxResult; |
| 10 | 10 | import com.huaheng.framework.web.page.TableDataInfo; |
| 11 | 11 | import com.huaheng.pc.general.material.service.MaterialServiceImpl; |
| 12 | +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
| 12 | 13 | import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; |
| 13 | 14 | import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService; |
| 14 | 15 | import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel; |
| ... | ... |
src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
| 1 | 1 | package com.huaheng.pc.shipment.shippingCombination.service; |
| 2 | 2 | |
| 3 | 3 | |
| 4 | +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | |
| 4 | 5 | import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch; |
| 5 | 6 | import com.huaheng.pc.shipment.shippingCombination.mapper.ShippingCombinationMapper; |
| 6 | 7 | import org.springframework.stereotype.Service; |
| ... | ... | @@ -17,8 +18,8 @@ public class ShippingCombinationService { |
| 17 | 18 | |
| 18 | 19 | |
| 19 | 20 | public List<InventoryDetail> getInventorys(ShippingSearch search) { |
| 20 | - List<InventoryDetail> list = shippingCombinationMapper.getInventorys(search); | |
| 21 | - return list; | |
| 21 | + // List<InventoryDetail> list = shippingCombinationMapper.getInventorys(search); | |
| 22 | + return null; | |
| 22 | 23 | } |
| 23 | 24 | |
| 24 | 25 | } |
| ... | ... |