wms / wms_henanqingyuan · Commits

Commit f38a60813d77999338b7fb925ee3c4bba8f931e4

Authored by wangyanxiong
1 parent 2baec6f8

xml

Inline Side-by-side
Showing 1 changed file with 229 additions and 2 deletions
.idea/workspace.xml
  View file @f38a608
@@ -57,6 +57,58 @@ @@ -57,6 +57,58 @@
57 </expand> 57 </expand>
58 <select /> 58 <select />
59 </component> 59 </component>
  60 + <component name="FileEditorManager">
  61 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  62 + <file pinned="false" current-in-tab="false">
  63 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state relative-caret-position="1710">
  66 + <caret line="117" column="47" selection-start-line="117" selection-start-column="47" selection-end-line="117" selection-end-column="47" />
  67 + </state>
  68 + </provider>
  69 + </entry>
  70 + </file>
  71 + <file pinned="false" current-in-tab="false">
  72 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  73 + <provider selected="true" editor-type-id="text-editor">
  74 + <state relative-caret-position="456">
  75 + <caret line="31" column="24" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
  76 + </state>
  77 + </provider>
  78 + </entry>
  79 + </file>
  80 + <file pinned="false" current-in-tab="true">
  81 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  82 + <provider selected="true" editor-type-id="text-editor">
  83 + <state relative-caret-position="-1824">
  84 + <caret line="339" column="44" selection-start-line="339" selection-start-column="29" selection-end-line="339" selection-end-column="44" />
  85 + <folding>
  86 + <element signature="imports" expanded="true" />
  87 + </folding>
  88 + </state>
  89 + </provider>
  90 + </entry>
  91 + </file>
  92 + <file pinned="false" current-in-tab="false">
  93 + <entry file="file://$PROJECT_DIR$/pom.xml">
  94 + <provider selected="true" editor-type-id="text-editor">
  95 + <state relative-caret-position="532">
  96 + <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="51" />
  97 + </state>
  98 + </provider>
  99 + </entry>
  100 + </file>
  101 + <file pinned="false" current-in-tab="false">
  102 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
  103 + <provider selected="true" editor-type-id="text-editor">
  104 + <state relative-caret-position="1444">
  105 + <caret line="76" column="89" selection-start-line="76" selection-start-column="70" selection-end-line="76" selection-end-column="89" />
  106 + </state>
  107 + </provider>
  108 + </entry>
  109 + </file>
  110 + </leaf>
  111 + </component>
60 <component name="FileTemplateManagerImpl"> 112 <component name="FileTemplateManagerImpl">
61 <option name="RECENT_TEMPLATES"> 113 <option name="RECENT_TEMPLATES">
62 <list> 114 <list>
@@ -97,6 +149,122 @@ @@ -97,6 +149,122 @@
97 <component name="ProjectLevelVcsManager"> 149 <component name="ProjectLevelVcsManager">
98 <ConfirmationsSetting value="2" id="Add" /> 150 <ConfirmationsSetting value="2" id="Add" />
99 </component> 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="task" 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="task" type="462c0819:PsiDirectoryNode" />
  232 + <item name="taskHeader" 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="task" type="462c0819:PsiDirectoryNode" />
  244 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  245 + <item name="service" 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="resources" type="462c0819:PsiDirectoryNode" />
  253 + </path>
  254 + <path>
  255 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  256 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  257 + <item name="src" type="462c0819:PsiDirectoryNode" />
  258 + <item name="main" type="462c0819:PsiDirectoryNode" />
  259 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  260 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  261 + </path>
  262 + </expand>
  263 + <select />
  264 + </subPane>
  265 + </pane>
  266 + </panes>
  267 + </component>
100 <component name="PropertiesComponent"> 268 <component name="PropertiesComponent">
101 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> 269 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
102 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 270 <property name="DefaultHtmlFileTemplate" value="HTML File" />
@@ -164,7 +332,7 @@ @@ -164,7 +332,7 @@
164 </component> 332 </component>
165 <component name="TaskManager"> 333 <component name="TaskManager">
166 <task active="true" id="Default" summary="Default task"> 334 <task active="true" id="Default" summary="Default task">
167 - <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" /> 335 + <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />
168 <created>1566977677142</created> 336 <created>1566977677142</created>
169 <option name="number" value="Default" /> 337 <option name="number" value="Default" />
170 <option name="presentableId" value="Default" /> 338 <option name="presentableId" value="Default" />
@@ -174,6 +342,7 @@ @@ -174,6 +342,7 @@
174 <workItem from="1567038752582" duration="12361000" /> 342 <workItem from="1567038752582" duration="12361000" />
175 <workItem from="1567057373550" duration="15293000" /> 343 <workItem from="1567057373550" duration="15293000" />
176 <workItem from="1567125196953" duration="16752000" /> 344 <workItem from="1567125196953" duration="16752000" />
  345 + <workItem from="1567643852002" duration="245000" />
177 </task> 346 </task>
178 <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单"> 347 <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
179 <created>1566983055587</created> 348 <created>1566983055587</created>
@@ -234,6 +403,49 @@ @@ -234,6 +403,49 @@
234 <option name="localTasksCounter" value="9" /> 403 <option name="localTasksCounter" value="9" />
235 <servers /> 404 <servers />
236 </component> 405 </component>
  406 + <component name="TimeTrackingManager">
  407 + <option name="totallyTimeSpent" value="2000" />
  408 + </component>
  409 + <component name="ToolWindowManager">
  410 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  411 + <editor active="true" />
  412 + <layout>
  413 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28016084" />
  414 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  415 + <window_info id="Designer" order="2" />
  416 + <window_info id="Image Layers" order="3" />
  417 + <window_info id="Capture Tool" order="4" />
  418 + <window_info id="UI Designer" order="5" />
  419 + <window_info id="Favorites" order="6" side_tool="true" />
  420 + <window_info id="Web" order="7" side_tool="true" />
  421 + <window_info anchor="bottom" id="Message" order="0" />
  422 + <window_info anchor="bottom" id="Find" order="1" />
  423 + <window_info anchor="bottom" id="Run" order="2" />
  424 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  425 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  426 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  427 + <window_info anchor="bottom" id="TODO" order="6" />
  428 + <window_info anchor="bottom" id="Spring" order="7" />
  429 + <window_info anchor="bottom" id="Terminal" order="8" />
  430 + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
  431 + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50067025" side_tool="true" weight="0.22946176" />
  432 + <window_info anchor="bottom" id="Messages" order="11" weight="0.18696883" />
  433 + <window_info anchor="bottom" id="Java Enterprise" order="12" />
  434 + <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
  435 + <window_info anchor="bottom" id="Version Control" order="14" weight="0.3286119" />
  436 + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.22946176" />
  437 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  438 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  439 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  440 + <window_info anchor="right" id="Maven" order="3" />
  441 + <window_info anchor="right" id="Palette" order="4" />
  442 + <window_info anchor="right" id="Capture Analysis" order="5" />
  443 + <window_info anchor="right" id="Database" order="6" />
  444 + <window_info anchor="right" id="Palette&#9;" order="7" />
  445 + <window_info anchor="right" id="Theme Preview" order="8" />
  446 + <window_info anchor="right" id="Bean Validation" order="9" />
  447 + </layout>
  448 + </component>
237 <component name="TypeScriptGeneratedFilesManager"> 449 <component name="TypeScriptGeneratedFilesManager">
238 <option name="version" value="1" /> 450 <option name="version" value="1" />
239 </component> 451 </component>
@@ -243,6 +455,12 @@ @@ -243,6 +455,12 @@
243 <entry key="MAIN"> 455 <entry key="MAIN">
244 <value> 456 <value>
245 <State> 457 <State>
  458 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  459 + <collection />
  460 + </option>
  461 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  462 + <collection />
  463 + </option>
246 <option name="COLUMN_ORDER" /> 464 <option name="COLUMN_ORDER" />
247 </State> 465 </State>
248 </value> 466 </value>
@@ -265,7 +483,6 @@ @@ -265,7 +483,6 @@
265 </option> 483 </option>
266 </component> 484 </component>
267 <component name="VcsManagerConfiguration"> 485 <component name="VcsManagerConfiguration">
268 - <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />  
269 <MESSAGE value="盘点明细页面" /> 486 <MESSAGE value="盘点明细页面" />
270 <MESSAGE value="入库单添加时添加流程标记，审核入库单" /> 487 <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
271 <MESSAGE value="添加入库单历史" /> 488 <MESSAGE value="添加入库单历史" />
@@ -286,51 +503,61 @@ @@ -286,51 +503,61 @@
286 <line-breakpoint type="java-line"> 503 <line-breakpoint type="java-line">
287 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url> 504 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
288 <line>5</line> 505 <line>5</line>
  506 + <properties />
289 <option name="timeStamp" value="1" /> 507 <option name="timeStamp" value="1" />
290 </line-breakpoint> 508 </line-breakpoint>
291 <line-breakpoint type="java-line"> 509 <line-breakpoint type="java-line">
292 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url> 510 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
293 <line>60</line> 511 <line>60</line>
  512 + <properties />
294 <option name="timeStamp" value="4" /> 513 <option name="timeStamp" value="4" />
295 </line-breakpoint> 514 </line-breakpoint>
296 <line-breakpoint enabled="true" type="java-line"> 515 <line-breakpoint enabled="true" type="java-line">
297 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url> 516 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
298 <line>49</line> 517 <line>49</line>
  518 + <properties />
299 <option name="timeStamp" value="16" /> 519 <option name="timeStamp" value="16" />
300 </line-breakpoint> 520 </line-breakpoint>
301 <line-breakpoint enabled="true" type="java-line"> 521 <line-breakpoint enabled="true" type="java-line">
302 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> 522 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
303 <line>216</line> 523 <line>216</line>
  524 + <properties />
304 <option name="timeStamp" value="19" /> 525 <option name="timeStamp" value="19" />
305 </line-breakpoint> 526 </line-breakpoint>
306 <line-breakpoint enabled="true" type="java-line"> 527 <line-breakpoint enabled="true" type="java-line">
307 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> 528 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
308 <line>241</line> 529 <line>241</line>
  530 + <properties />
309 <option name="timeStamp" value="20" /> 531 <option name="timeStamp" value="20" />
310 </line-breakpoint> 532 </line-breakpoint>
311 <line-breakpoint enabled="true" type="java-line"> 533 <line-breakpoint enabled="true" type="java-line">
312 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> 534 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
313 <line>163</line> 535 <line>163</line>
  536 + <properties />
314 <option name="timeStamp" value="22" /> 537 <option name="timeStamp" value="22" />
315 </line-breakpoint> 538 </line-breakpoint>
316 <line-breakpoint enabled="true" type="java-line"> 539 <line-breakpoint enabled="true" type="java-line">
317 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> 540 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
318 <line>181</line> 541 <line>181</line>
  542 + <properties />
319 <option name="timeStamp" value="23" /> 543 <option name="timeStamp" value="23" />
320 </line-breakpoint> 544 </line-breakpoint>
321 <line-breakpoint enabled="true" type="java-line"> 545 <line-breakpoint enabled="true" type="java-line">
322 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url> 546 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
323 <line>92</line> 547 <line>92</line>
  548 + <properties />
324 <option name="timeStamp" value="24" /> 549 <option name="timeStamp" value="24" />
325 </line-breakpoint> 550 </line-breakpoint>
326 <line-breakpoint enabled="true" type="java-line"> 551 <line-breakpoint enabled="true" type="java-line">
327 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url> 552 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url>
328 <line>31</line> 553 <line>31</line>
  554 + <properties />
329 <option name="timeStamp" value="26" /> 555 <option name="timeStamp" value="26" />
330 </line-breakpoint> 556 </line-breakpoint>
331 <line-breakpoint enabled="true" type="java-line"> 557 <line-breakpoint enabled="true" type="java-line">
332 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url> 558 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
333 <line>47</line> 559 <line>47</line>
  560 + <properties />
334 <option name="timeStamp" value="37" /> 561 <option name="timeStamp" value="37" />
335 </line-breakpoint> 562 </line-breakpoint>
336 </breakpoints> 563 </breakpoints>