Commit a27c843d58aca1b3022e53d17c4f59c3f72ba4b6
1 parent
69529786
增加调整，盘点修复错误
Showing
5 changed files
with
210 additions
and
161 deletions
.idea/workspace.xml
| ... | ... | @@ -2,67 +2,22 @@ |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | 4 | <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment=""> |
| 5 | - <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" /> | |
| 6 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" /> | |
| 6 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" afterDir="false" /> | |
| 7 | + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" afterDir="false" /> | |
| 8 | + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" afterDir="false" /> | |
| 9 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" afterDir="false" /> | |
| 12 | 10 | </list> |
| 13 | 11 | <ignored path="$PROJECT_DIR$/target/" /> |
| 12 | + <ignored path="$PROJECT_DIR$/out/" /> | |
| 13 | + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | |
| 14 | 14 | <option name="SHOW_DIALOG" value="false" /> |
| 15 | 15 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| 16 | 16 | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
| 17 | 17 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
| 18 | 18 | </component> |
| 19 | 19 | <component name="FileEditorManager"> |
| 20 | - <leaf> | |
| 21 | - <file pinned="false" current-in-tab="false"> | |
| 22 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 23 | - <provider selected="true" editor-type-id="text-editor"> | |
| 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" /> | |
| 26 | - </state> | |
| 27 | - </provider> | |
| 28 | - </entry> | |
| 29 | - </file> | |
| 30 | - <file pinned="false" current-in-tab="false"> | |
| 31 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 32 | - <provider selected="true" editor-type-id="text-editor"> | |
| 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" /> | |
| 35 | - </state> | |
| 36 | - </provider> | |
| 37 | - </entry> | |
| 38 | - </file> | |
| 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"> | |
| 41 | - <provider selected="true" editor-type-id="text-editor"> | |
| 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" /> | |
| 44 | - </state> | |
| 45 | - </provider> | |
| 46 | - </entry> | |
| 47 | - </file> | |
| 48 | - <file pinned="false" current-in-tab="true"> | |
| 49 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html"> | |
| 50 | - <provider selected="true" editor-type-id="text-editor"> | |
| 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" /> | |
| 53 | - <folding> | |
| 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" /> | |
| 60 | - </folding> | |
| 61 | - </state> | |
| 62 | - </provider> | |
| 63 | - </entry> | |
| 64 | - </file> | |
| 65 | - </leaf> | |
| 20 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> | |
| 66 | 21 | </component> |
| 67 | 22 | <component name="Git.Settings"> |
| 68 | 23 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| ... | ... | @@ -75,6 +30,10 @@ |
| 75 | 30 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" /> |
| 76 | 31 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" /> |
| 77 | 32 | <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" /> |
| 33 | + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" /> | |
| 34 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" /> | |
| 35 | + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" /> | |
| 36 | + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" /> | |
| 78 | 37 | </list> |
| 79 | 38 | </option> |
| 80 | 39 | </component> |
| ... | ... | @@ -110,7 +69,6 @@ |
| 110 | 69 | <foldersAlwaysOnTop value="true" /> |
| 111 | 70 | </navigator> |
| 112 | 71 | <panes> |
| 113 | - <pane id="Scope" /> | |
| 114 | 72 | <pane id="PackagesPane" /> |
| 115 | 73 | <pane id="ProjectPane"> |
| 116 | 74 | <subPane> |
| ... | ... | @@ -185,33 +143,7 @@ |
| 185 | 143 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 186 | 144 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 187 | 145 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 188 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 189 | - </path> | |
| 190 | - <path> | |
| 191 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 192 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 193 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 194 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 195 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 196 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 197 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 198 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 199 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 200 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 201 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 202 | - </path> | |
| 203 | - <path> | |
| 204 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 205 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 206 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 207 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 208 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 209 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 210 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 211 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 212 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 213 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 214 | - <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
| 146 | + <item name="adjustDetail" type="462c0819:PsiDirectoryNode" /> | |
| 215 | 147 | </path> |
| 216 | 148 | <path> |
| 217 | 149 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -223,20 +155,14 @@ |
| 223 | 155 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 224 | 156 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 225 | 157 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 226 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 158 | + <item name="adjustHeader" type="462c0819:PsiDirectoryNode" /> | |
| 227 | 159 | </path> |
| 228 | 160 | <path> |
| 229 | 161 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| 230 | 162 | <item name="wms2" type="462c0819:PsiDirectoryNode" /> |
| 231 | 163 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
| 232 | 164 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 233 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 234 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 235 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 236 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 237 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 238 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 239 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 165 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 240 | 166 | </path> |
| 241 | 167 | <path> |
| 242 | 168 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -244,6 +170,7 @@ |
| 244 | 170 | <item name="src" type="462c0819:PsiDirectoryNode" /> |
| 245 | 171 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 246 | 172 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 173 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 247 | 174 | </path> |
| 248 | 175 | <path> |
| 249 | 176 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -252,6 +179,7 @@ |
| 252 | 179 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 253 | 180 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 254 | 181 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 182 | + <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 255 | 183 | </path> |
| 256 | 184 | <path> |
| 257 | 185 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -261,6 +189,7 @@ |
| 261 | 189 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 262 | 190 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 263 | 191 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 192 | + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 264 | 193 | </path> |
| 265 | 194 | <path> |
| 266 | 195 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -270,7 +199,7 @@ |
| 270 | 199 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 271 | 200 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 272 | 201 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 273 | - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" /> | |
| 202 | + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 274 | 203 | </path> |
| 275 | 204 | <path> |
| 276 | 205 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -280,7 +209,7 @@ |
| 280 | 209 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 281 | 210 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 282 | 211 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 283 | - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" /> | |
| 212 | + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 284 | 213 | </path> |
| 285 | 214 | <path> |
| 286 | 215 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -290,12 +219,13 @@ |
| 290 | 219 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 291 | 220 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 292 | 221 | <item name="inventory" type="462c0819:PsiDirectoryNode" /> |
| 293 | - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" /> | |
| 222 | + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" /> | |
| 294 | 223 | </path> |
| 295 | 224 | </expand> |
| 296 | 225 | <select /> |
| 297 | 226 | </subPane> |
| 298 | 227 | </pane> |
| 228 | + <pane id="Scope" /> | |
| 299 | 229 | </panes> |
| 300 | 230 | </component> |
| 301 | 231 | <component name="PropertiesComponent"> |
| ... | ... | @@ -331,49 +261,103 @@ |
| 331 | 261 | <configuration /> |
| 332 | 262 | </component> |
| 333 | 263 | <component name="ToolWindowManager"> |
| 334 | - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | |
| 264 | + <frame x="-7" y="-7" width="1550" height="838" extended-state="7" /> | |
| 335 | 265 | <layout> |
| 336 | - <window_info id="Web" side_tool="true" /> | |
| 337 | - <window_info id="Designer" /> | |
| 338 | - <window_info id="UI Designer" /> | |
| 339 | - <window_info id="Favorites" side_tool="true" /> | |
| 340 | - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2855228" /> | |
| 266 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3324397" /> | |
| 341 | 267 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 342 | - <window_info anchor="bottom" id="Docker" show_stripe_button="false" /> | |
| 343 | - <window_info anchor="bottom" id="Database Changes" /> | |
| 344 | - <window_info anchor="bottom" id="Version Control" /> | |
| 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" /> | |
| 268 | + <window_info id="Web" order="2" side_tool="true" /> | |
| 269 | + <window_info id="Designer" order="3" /> | |
| 270 | + <window_info id="UI Designer" order="4" /> | |
| 271 | + <window_info id="Favorites" order="5" side_tool="true" /> | |
| 350 | 272 | <window_info anchor="bottom" id="Message" order="0" /> |
| 351 | 273 | <window_info anchor="bottom" id="Find" order="1" /> |
| 352 | 274 | <window_info anchor="bottom" id="Run" order="2" /> |
| 353 | - <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.08073654" /> | |
| 275 | + <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.07365439" /> | |
| 354 | 276 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| 355 | 277 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 356 | 278 | <window_info anchor="bottom" id="TODO" order="6" /> |
| 357 | - <window_info anchor="right" id="Palette" /> | |
| 358 | - <window_info anchor="right" id="Maven" weight="0.097184986" /> | |
| 359 | - <window_info anchor="right" id="Bean Validation" /> | |
| 360 | - <window_info anchor="right" id="Palette	" /> | |
| 361 | - <window_info anchor="right" id="Database" /> | |
| 279 | + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | |
| 280 | + <window_info anchor="bottom" id="Version Control" order="8" weight="0.42776203" /> | |
| 281 | + <window_info anchor="bottom" id="Database Changes" order="9" /> | |
| 282 | + <window_info anchor="bottom" id="Spring" order="10" /> | |
| 283 | + <window_info anchor="bottom" id="MyBatis Log" order="11" /> | |
| 284 | + <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" /> | |
| 285 | + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" /> | |
| 286 | + <window_info anchor="bottom" id="Java Enterprise" order="14" /> | |
| 362 | 287 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 363 | 288 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| 364 | 289 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| 290 | + <window_info anchor="right" id="Palette" order="3" /> | |
| 291 | + <window_info anchor="right" id="Database" order="4" /> | |
| 292 | + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" /> | |
| 293 | + <window_info anchor="right" id="Bean Validation" order="6" /> | |
| 294 | + <window_info anchor="right" id="Palette	" order="7" /> | |
| 365 | 295 | </layout> |
| 366 | 296 | </component> |
| 367 | 297 | <component name="TypeScriptGeneratedFilesManager"> |
| 368 | 298 | <option name="version" value="1" /> |
| 369 | 299 | </component> |
| 300 | + <component name="Vcs.Log.Tabs.Properties"> | |
| 301 | + <option name="TAB_STATES"> | |
| 302 | + <map> | |
| 303 | + <entry key="MAIN"> | |
| 304 | + <value> | |
| 305 | + <State> | |
| 306 | + <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
| 307 | + <collection /> | |
| 308 | + </option> | |
| 309 | + <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
| 310 | + <collection /> | |
| 311 | + </option> | |
| 312 | + <option name="COLUMN_ORDER"> | |
| 313 | + <list> | |
| 314 | + <option value="0" /> | |
| 315 | + <option value="1" /> | |
| 316 | + <option value="2" /> | |
| 317 | + <option value="3" /> | |
| 318 | + </list> | |
| 319 | + </option> | |
| 320 | + </State> | |
| 321 | + </value> | |
| 322 | + </entry> | |
| 323 | + </map> | |
| 324 | + </option> | |
| 325 | + <option name="RECENT_FILTERS"> | |
| 326 | + <map> | |
| 327 | + <entry key="Branch"> | |
| 328 | + <value> | |
| 329 | + <list /> | |
| 330 | + </value> | |
| 331 | + </entry> | |
| 332 | + <entry key="User"> | |
| 333 | + <value> | |
| 334 | + <list /> | |
| 335 | + </value> | |
| 336 | + </entry> | |
| 337 | + </map> | |
| 338 | + </option> | |
| 339 | + </component> | |
| 340 | + <component name="VcsManagerConfiguration"> | |
| 341 | + <MESSAGE value="盘点明细页面" /> | |
| 342 | + <option name="LAST_COMMIT_MESSAGE" value="盘点明细页面" /> | |
| 343 | + </component> | |
| 344 | + <component name="XDebuggerManager"> | |
| 345 | + <breakpoint-manager> | |
| 346 | + <breakpoints> | |
| 347 | + <line-breakpoint enabled="true" type="java-line"> | |
| 348 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url> | |
| 349 | + <line>5</line> | |
| 350 | + <properties /> | |
| 351 | + <option name="timeStamp" value="1" /> | |
| 352 | + </line-breakpoint> | |
| 353 | + </breakpoints> | |
| 354 | + </breakpoint-manager> | |
| 355 | + </component> | |
| 370 | 356 | <component name="editorHistoryManager"> |
| 371 | 357 | <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> |
| 372 | 358 | <provider selected="true" editor-type-id="text-editor" /> |
| 373 | 359 | </entry> |
| 374 | - <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml"> | |
| 375 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 376 | - </entry> | |
| 360 | + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml" /> | |
| 377 | 361 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java"> |
| 378 | 362 | <provider selected="true" editor-type-id="text-editor"> |
| 379 | 363 | <state relative-caret-position="287"> |
| ... | ... | @@ -396,39 +380,122 @@ |
| 396 | 380 | </state> |
| 397 | 381 | </provider> |
| 398 | 382 | </entry> |
| 399 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 383 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html"> | |
| 400 | 384 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | |
| 385 | + <state relative-caret-position="368"> | |
| 386 | + <caret line="274" column="23" selection-start-line="274" selection-start-column="23" selection-end-line="274" selection-end-column="23" /> | |
| 403 | 387 | </state> |
| 404 | 388 | </provider> |
| 405 | 389 | </entry> |
| 406 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 390 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml"> | |
| 407 | 391 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | |
| 392 | + <state relative-caret-position="880"> | |
| 393 | + <caret line="44" column="53" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" /> | |
| 410 | 394 | </state> |
| 411 | 395 | </provider> |
| 412 | 396 | </entry> |
| 413 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> | |
| 397 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/mapper/InventoryTransactionMapper.java"> | |
| 398 | + <provider selected="true" editor-type-id="text-editor"> | |
| 399 | + <state relative-caret-position="80"> | |
| 400 | + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | |
| 401 | + </state> | |
| 402 | + </provider> | |
| 403 | + </entry> | |
| 404 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java"> | |
| 405 | + <provider selected="true" editor-type-id="text-editor"> | |
| 406 | + <state relative-caret-position="4068"> | |
| 407 | + <caret line="278" column="32" lean-forward="true" selection-start-line="278" selection-start-column="32" selection-end-line="278" selection-end-column="32" /> | |
| 408 | + </state> | |
| 409 | + </provider> | |
| 410 | + </entry> | |
| 411 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java"> | |
| 412 | + <provider selected="true" editor-type-id="text-editor"> | |
| 413 | + <state relative-caret-position="80"> | |
| 414 | + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | |
| 415 | + </state> | |
| 416 | + </provider> | |
| 417 | + </entry> | |
| 418 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml"> | |
| 419 | + <provider selected="true" editor-type-id="text-editor"> | |
| 420 | + <state relative-caret-position="-68"> | |
| 421 | + <caret line="2" selection-start-line="2" selection-end-line="2" /> | |
| 422 | + </state> | |
| 423 | + </provider> | |
| 424 | + </entry> | |
| 425 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java"> | |
| 426 | + <provider selected="true" editor-type-id="text-editor"> | |
| 427 | + <state relative-caret-position="140"> | |
| 428 | + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> | |
| 429 | + </state> | |
| 430 | + </provider> | |
| 431 | + </entry> | |
| 432 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java"> | |
| 414 | 433 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | |
| 434 | + <state relative-caret-position="80"> | |
| 435 | + <caret line="5" selection-start-line="5" selection-end-line="5" /> | |
| 436 | + </state> | |
| 437 | + </provider> | |
| 438 | + </entry> | |
| 439 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml"> | |
| 440 | + <provider selected="true" editor-type-id="text-editor"> | |
| 441 | + <state relative-caret-position="40"> | |
| 442 | + <caret line="2" selection-start-line="2" selection-end-line="2" /> | |
| 443 | + </state> | |
| 444 | + </provider> | |
| 445 | + </entry> | |
| 446 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java"> | |
| 447 | + <provider selected="true" editor-type-id="text-editor"> | |
| 448 | + <state relative-caret-position="80"> | |
| 449 | + <caret line="5" selection-start-line="5" selection-end-line="5" /> | |
| 450 | + </state> | |
| 451 | + </provider> | |
| 452 | + </entry> | |
| 453 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml"> | |
| 454 | + <provider selected="true" editor-type-id="text-editor"> | |
| 455 | + <state relative-caret-position="40"> | |
| 456 | + <caret line="2" selection-start-line="2" selection-end-line="2" /> | |
| 457 | + </state> | |
| 458 | + </provider> | |
| 459 | + </entry> | |
| 460 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java"> | |
| 461 | + <provider selected="true" editor-type-id="text-editor"> | |
| 462 | + <state relative-caret-position="80"> | |
| 463 | + <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | |
| 464 | + </state> | |
| 465 | + </provider> | |
| 466 | + </entry> | |
| 467 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml"> | |
| 468 | + <provider selected="true" editor-type-id="text-editor"> | |
| 469 | + <state relative-caret-position="960"> | |
| 470 | + <caret line="48" column="60" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" /> | |
| 417 | 471 | </state> |
| 418 | 472 | </provider> |
| 419 | 473 | </entry> |
| 420 | 474 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html"> |
| 421 | 475 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | |
| 424 | - <folding> | |
| 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" /> | |
| 431 | - </folding> | |
| 476 | + <state relative-caret-position="8402"> | |
| 477 | + <caret line="639" column="9" lean-forward="true" selection-start-line="639" selection-start-column="9" selection-end-line="639" selection-end-column="9" /> | |
| 478 | + </state> | |
| 479 | + </provider> | |
| 480 | + </entry> | |
| 481 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java"> | |
| 482 | + <provider selected="true" editor-type-id="text-editor"> | |
| 483 | + <state relative-caret-position="-218"> | |
| 484 | + <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> | |
| 485 | + </state> | |
| 486 | + </provider> | |
| 487 | + </entry> | |
| 488 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 489 | + <provider selected="true" editor-type-id="text-editor"> | |
| 490 | + <state relative-caret-position="146"> | |
| 491 | + <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" /> | |
| 492 | + </state> | |
| 493 | + </provider> | |
| 494 | + </entry> | |
| 495 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html"> | |
| 496 | + <provider selected="true" editor-type-id="text-editor"> | |
| 497 | + <state relative-caret-position="564"> | |
| 498 | + <caret line="46" column="36" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" /> | |
| 432 | 499 | </state> |
| 433 | 500 | </provider> |
| 434 | 501 | </entry> |
| ... | ... |
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
| ... | ... | @@ -208,13 +208,6 @@ public class InventoryTransaction implements Serializable { |
| 208 | 208 | private String lockCode; |
| 209 | 209 | |
| 210 | 210 | /** |
| 211 | - * 上次盘点日期 | |
| 212 | - */ | |
| 213 | - @TableField(value = "lastCycleCountDate") | |
| 214 | - @ApiModelProperty(value="上次盘点日期") | |
| 215 | - private Date lastCycleCountDate; | |
| 216 | - | |
| 217 | - /** | |
| 218 | 211 | * 创建时间 |
| 219 | 212 | */ |
| 220 | 213 | @TableField(value = "created") |
| ... | ... | @@ -285,4 +278,6 @@ public class InventoryTransaction implements Serializable { |
| 285 | 278 | @ApiModelProperty(value = "供应商编码") |
| 286 | 279 | private String supplierCode; |
| 287 | 280 | |
| 281 | + | |
| 282 | + | |
| 288 | 283 | } |
| 289 | 284 | \ No newline at end of file |
| ... | ... |
src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" /> |
| 21 | 21 | <result column="systemQty" jdbcType="DECIMAL" property="systemQty" /> |
| 22 | 22 | <result column="countedQty" jdbcType="DECIMAL" property="countedQty" /> |
| 23 | - <result column="adjustQty" jdbcType="DECIMAL" property="adjustQty" /> | |
| 23 | + <result column="gapQty" jdbcType="DECIMAL" property="gapQty" /> | |
| 24 | 24 | <result column="rejectionNote" jdbcType="VARCHAR" property="rejectionNote" /> |
| 25 | 25 | <result column="countedBy" jdbcType="VARCHAR" property="countedBy" /> |
| 26 | 26 | <result column="countedAt" jdbcType="TIMESTAMP" property="countedAt" /> |
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | <!--@mbg.generated--> |
| 47 | 47 | id, countId, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId, |
| 48 | 48 | locationCode, containerCode, materialCode, materialName, materialSpec, materialUnit, |
| 49 | - companyCode, inventorySts, systemQty, countedQty, adjustQty, rejectionNote, countedBy, | |
| 49 | + companyCode, inventorySts, systemQty, countedQty, gapQty, rejectionNote, countedBy, | |
| 50 | 50 | countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created, |
| 51 | 51 | createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp, |
| 52 | 52 | batch, lot, projectNo |
| ... | ... |
src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml
| ... | ... | @@ -13,10 +13,10 @@ |
| 13 | 13 | <result column="materialName" jdbcType="VARCHAR" property="materialName" /> |
| 14 | 14 | <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" /> |
| 15 | 15 | <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" /> |
| 16 | - <result column="qty" jdbcType="INTEGER" property="qty" /> | |
| 16 | + <result column="taskQty" jdbcType="INTEGER" property="taskQty" /> | |
| 17 | 17 | <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" /> |
| 18 | 18 | <result column="referCode" jdbcType="VARCHAR" property="referCode" /> |
| 19 | - <result column="referId" jdbcType="VARCHAR" property="referId" /> | |
| 19 | + <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" /> | |
| 20 | 20 | <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" /> |
| 21 | 21 | <result column="batch" jdbcType="VARCHAR" property="batch" /> |
| 22 | 22 | <result column="lot" jdbcType="VARCHAR" property="lot" /> |
| ... | ... | @@ -30,31 +30,22 @@ |
| 30 | 30 | <result column="attribute1" jdbcType="VARCHAR" property="attribute1" /> |
| 31 | 31 | <result column="attribute2" jdbcType="VARCHAR" property="attribute2" /> |
| 32 | 32 | <result column="attribute3" jdbcType="VARCHAR" property="attribute3" /> |
| 33 | - <result column="attribute4" jdbcType="VARCHAR" property="attribute4" /> | |
| 34 | 33 | <result column="lockCode" jdbcType="VARCHAR" property="lockCode" /> |
| 35 | - <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" /> | |
| 36 | 34 | <result column="created" jdbcType="TIMESTAMP" property="created" /> |
| 37 | 35 | <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> |
| 38 | - <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> | |
| 39 | - <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" /> | |
| 40 | 36 | <result column="version" jdbcType="INTEGER" property="version" /> |
| 41 | 37 | <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> |
| 42 | 38 | <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> |
| 43 | 39 | <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> |
| 44 | - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> | |
| 45 | - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" /> | |
| 46 | - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" /> | |
| 47 | - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" /> | |
| 48 | - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" /> | |
| 49 | 40 | <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> |
| 50 | 41 | </resultMap> |
| 51 | 42 | <sql id="Base_Column_List"> |
| 52 | 43 | <!--@mbg.generated--> |
| 53 | 44 | id, warehouseCode, companyCode, locationCode, containerCode, transactionType, materialCode, |
| 54 | - materialName, materialSpec, materialUnit, qty, inventorySts, referCode, referId, | |
| 45 | + materialName, materialSpec, materialUnit, taskQty, inventorySts, referCode, referDetailId, | |
| 55 | 46 | referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, expirationDate, |
| 56 | - agingDate, attributeId, attribute1, attribute2, attribute3, attribute4, lockCode, | |
| 57 | - lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, | |
| 58 | - userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp | |
| 47 | + agingDate, attributeId, attribute1, attribute2, attribute3, lockCode, | |
| 48 | + created, createdBy, version, userDef1, | |
| 49 | + userDef2, userDef3, processStamp | |
| 59 | 50 | </sql> |
| 60 | 51 | </mapper> |
| 61 | 52 | \ No newline at end of file |
| ... | ... |
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html