wms / wms_tianjinggelinmei · Commits

Commit ff359b8025e64a22af5f4669a2ca1003b99b12c9

Authored by mahuandong
2 parents 3c1bf24f dbe0e856

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 7 changed files with 647 additions and 80 deletions
.idea/workspace.xml
  View file @ff359b8
... ... @@ -3,11 +3,13 @@
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.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/shipment/shippingCombination/controller/ShippingCombinationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" />
10 11 </list>
  12 + <ignored path="$PROJECT_DIR$/target/" />
11 13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 14 <option name="SHOW_DIALOG" value="false" />
13 15 <option name="HIGHLIGHT_CONFLICTS" value="true" />
... ... @@ -41,34 +43,95 @@
41 43 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
42 44 <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
43 45 </path>
44   - <path>
45   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
46   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
47   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
48   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
49   - <item name="material_multiple: table" type="285a2a93:MysqlImplModel$Table" />
50   - </path>
51 46 </expand>
52 47 <select />
53 48 </component>
  49 + <component name="FileEditorManager">
  50 + <leaf>
  51 + <file pinned="false" current-in-tab="false">
  52 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  53 + <provider selected="true" editor-type-id="text-editor">
  54 + <state relative-caret-position="51">
  55 + <caret line="72" selection-start-line="72" selection-end-line="72" />
  56 + </state>
  57 + </provider>
  58 + </entry>
  59 + </file>
  60 + <file pinned="false" current-in-tab="false">
  61 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  62 + <provider selected="true" editor-type-id="text-editor">
  63 + <state relative-caret-position="234">
  64 + <caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
  65 + </state>
  66 + </provider>
  67 + </entry>
  68 + </file>
  69 + <file pinned="false" current-in-tab="true">
  70 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  71 + <provider selected="true" editor-type-id="text-editor">
  72 + <state relative-caret-position="328">
  73 + <caret line="92" column="18" lean-forward="true" selection-start-line="92" selection-start-column="18" selection-end-line="92" selection-end-column="18" />
  74 + </state>
  75 + </provider>
  76 + </entry>
  77 + </file>
  78 + <file pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  80 + <provider selected="true" editor-type-id="text-editor">
  81 + <state relative-caret-position="252">
  82 + <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
  83 + </state>
  84 + </provider>
  85 + </entry>
  86 + </file>
  87 + </leaf>
  88 + </component>
54 89 <component name="FileTemplateManagerImpl">
55 90 <option name="RECENT_TEMPLATES">
56 91 <list>
57 92 <option value="FxmlFile" />
58 93 <option value="Interface" />
59   - <option value="Class" />
60 94 <option value="HTML File" />
  95 + <option value="Class" />
61 96 </list>
62 97 </option>
63 98 </component>
  99 + <component name="FindInProjectRecents">
  100 + <findStrings>
  101 + <find>configuration</find>
  102 + </findStrings>
  103 + </component>
64 104 <component name="Git.Settings">
  105 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
65 106 <option name="RECENT_BRANCH_BY_REPOSITORY">
66 107 <map>
67 108 <entry key="$PROJECT_DIR$" value="master" />
68 109 </map>
69 110 </option>
70   - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
71   - <option name="RESET_MODE" value="MIXED" />
  111 + <option name="RESET_MODE" value="HARD" />
  112 + </component>
  113 + <component name="IdeDocumentHistory">
  114 + <option name="CHANGED_PATHS">
  115 + <list>
  116 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
  117 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
  118 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
  119 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
  120 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
  121 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
  122 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
  123 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
  124 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
  125 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
  126 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
  127 + <option value="$PROJECT_DIR$/pom.xml" />
  128 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
  129 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
  130 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
  131 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
  132 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
  133 + </list>
  134 + </option>
72 135 </component>
73 136 <component name="IgnoredFileRootStore">
74 137 <option name="generatedRoots">
... ... @@ -77,10 +140,262 @@
77 140 </set>
78 141 </option>
79 142 </component>
  143 + <component name="ProjectFrameBounds" extendedState="6">
  144 + <option name="x" value="-9" />
  145 + <option name="y" value="-9" />
  146 + <option name="width" value="1938" />
  147 + <option name="height" value="1048" />
  148 + </component>
80 149 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
81 150 <component name="ProjectLevelVcsManager">
82 151 <ConfirmationsSetting value="2" id="Add" />
83 152 </component>
  153 + <component name="ProjectView">
  154 + <navigator proportions="" version="1">
  155 + <foldersAlwaysOnTop value="true" />
  156 + </navigator>
  157 + <panes>
  158 + <pane id="PackagesPane" />
  159 + <pane id="Scope" />
  160 + <pane id="ProjectPane">
  161 + <subPane>
  162 + <expand>
  163 + <path>
  164 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  165 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  166 + </path>
  167 + <path>
  168 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  169 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  170 + <item name="src" type="462c0819:PsiDirectoryNode" />
  171 + </path>
  172 + <path>
  173 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  174 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  175 + <item name="src" type="462c0819:PsiDirectoryNode" />
  176 + <item name="main" type="462c0819:PsiDirectoryNode" />
  177 + </path>
  178 + <path>
  179 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  180 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  181 + <item name="src" type="462c0819:PsiDirectoryNode" />
  182 + <item name="main" type="462c0819:PsiDirectoryNode" />
  183 + <item name="java" type="462c0819:PsiDirectoryNode" />
  184 + </path>
  185 + <path>
  186 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  187 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  188 + <item name="src" type="462c0819:PsiDirectoryNode" />
  189 + <item name="main" type="462c0819:PsiDirectoryNode" />
  190 + <item name="java" type="462c0819:PsiDirectoryNode" />
  191 + <item name="com" type="462c0819:PsiDirectoryNode" />
  192 + </path>
  193 + <path>
  194 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  195 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  196 + <item name="src" type="462c0819:PsiDirectoryNode" />
  197 + <item name="main" type="462c0819:PsiDirectoryNode" />
  198 + <item name="java" type="462c0819:PsiDirectoryNode" />
  199 + <item name="com" type="462c0819:PsiDirectoryNode" />
  200 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  201 + </path>
  202 + <path>
  203 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  204 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  205 + <item name="src" type="462c0819:PsiDirectoryNode" />
  206 + <item name="main" type="462c0819:PsiDirectoryNode" />
  207 + <item name="java" type="462c0819:PsiDirectoryNode" />
  208 + <item name="com" type="462c0819:PsiDirectoryNode" />
  209 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  210 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  211 + </path>
  212 + <path>
  213 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  214 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  215 + <item name="src" type="462c0819:PsiDirectoryNode" />
  216 + <item name="main" type="462c0819:PsiDirectoryNode" />
  217 + <item name="java" type="462c0819:PsiDirectoryNode" />
  218 + <item name="com" type="462c0819:PsiDirectoryNode" />
  219 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  220 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  221 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  222 + </path>
  223 + <path>
  224 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  225 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  226 + <item name="src" type="462c0819:PsiDirectoryNode" />
  227 + <item name="main" type="462c0819:PsiDirectoryNode" />
  228 + <item name="java" type="462c0819:PsiDirectoryNode" />
  229 + <item name="com" type="462c0819:PsiDirectoryNode" />
  230 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  231 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  232 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  233 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  234 + </path>
  235 + <path>
  236 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  237 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  238 + <item name="src" type="462c0819:PsiDirectoryNode" />
  239 + <item name="main" type="462c0819:PsiDirectoryNode" />
  240 + <item name="java" type="462c0819:PsiDirectoryNode" />
  241 + <item name="com" type="462c0819:PsiDirectoryNode" />
  242 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  243 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  244 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  245 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  246 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  247 + </path>
  248 + <path>
  249 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  250 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  251 + <item name="src" type="462c0819:PsiDirectoryNode" />
  252 + <item name="main" type="462c0819:PsiDirectoryNode" />
  253 + <item name="java" type="462c0819:PsiDirectoryNode" />
  254 + <item name="com" type="462c0819:PsiDirectoryNode" />
  255 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  256 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  257 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  258 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  259 + <item name="domain" type="462c0819:PsiDirectoryNode" />
  260 + </path>
  261 + <path>
  262 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  263 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  264 + <item name="src" type="462c0819:PsiDirectoryNode" />
  265 + <item name="main" type="462c0819:PsiDirectoryNode" />
  266 + <item name="java" type="462c0819:PsiDirectoryNode" />
  267 + <item name="com" type="462c0819:PsiDirectoryNode" />
  268 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  269 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  270 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  271 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  272 + <item name="service" type="462c0819:PsiDirectoryNode" />
  273 + </path>
  274 + <path>
  275 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  276 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  277 + <item name="src" type="462c0819:PsiDirectoryNode" />
  278 + <item name="main" type="462c0819:PsiDirectoryNode" />
  279 + <item name="java" type="462c0819:PsiDirectoryNode" />
  280 + <item name="com" type="462c0819:PsiDirectoryNode" />
  281 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  282 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  283 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  284 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  285 + </path>
  286 + <path>
  287 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  288 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  289 + <item name="src" type="462c0819:PsiDirectoryNode" />
  290 + <item name="main" type="462c0819:PsiDirectoryNode" />
  291 + <item name="java" type="462c0819:PsiDirectoryNode" />
  292 + <item name="com" type="462c0819:PsiDirectoryNode" />
  293 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  294 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  295 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  296 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  297 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  298 + </path>
  299 + <path>
  300 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  301 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  302 + <item name="src" type="462c0819:PsiDirectoryNode" />
  303 + <item name="main" type="462c0819:PsiDirectoryNode" />
  304 + <item name="java" type="462c0819:PsiDirectoryNode" />
  305 + <item name="com" type="462c0819:PsiDirectoryNode" />
  306 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  307 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  308 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  309 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  310 + <item name="domain" type="462c0819:PsiDirectoryNode" />
  311 + </path>
  312 + <path>
  313 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  314 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  315 + <item name="src" type="462c0819:PsiDirectoryNode" />
  316 + <item name="main" type="462c0819:PsiDirectoryNode" />
  317 + <item name="java" type="462c0819:PsiDirectoryNode" />
  318 + <item name="com" type="462c0819:PsiDirectoryNode" />
  319 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  320 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  321 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  322 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  323 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
  324 + </path>
  325 + <path>
  326 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  327 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  328 + <item name="src" type="462c0819:PsiDirectoryNode" />
  329 + <item name="main" type="462c0819:PsiDirectoryNode" />
  330 + <item name="java" type="462c0819:PsiDirectoryNode" />
  331 + <item name="com" type="462c0819:PsiDirectoryNode" />
  332 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  333 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  334 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  335 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  336 + <item name="service" type="462c0819:PsiDirectoryNode" />
  337 + </path>
  338 + <path>
  339 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  340 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  341 + <item name="src" type="462c0819:PsiDirectoryNode" />
  342 + <item name="main" type="462c0819:PsiDirectoryNode" />
  343 + <item name="java" type="462c0819:PsiDirectoryNode" />
  344 + <item name="com" type="462c0819:PsiDirectoryNode" />
  345 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  346 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  347 + <item name="system" type="462c0819:PsiDirectoryNode" />
  348 + </path>
  349 + <path>
  350 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  351 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  352 + <item name="src" type="462c0819:PsiDirectoryNode" />
  353 + <item name="main" type="462c0819:PsiDirectoryNode" />
  354 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  355 + </path>
  356 + <path>
  357 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  358 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  359 + <item name="src" type="462c0819:PsiDirectoryNode" />
  360 + <item name="main" type="462c0819:PsiDirectoryNode" />
  361 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  362 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  363 + </path>
  364 + <path>
  365 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  366 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  367 + <item name="src" type="462c0819:PsiDirectoryNode" />
  368 + <item name="main" type="462c0819:PsiDirectoryNode" />
  369 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  370 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  371 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  372 + </path>
  373 + <path>
  374 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  375 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  376 + <item name="src" type="462c0819:PsiDirectoryNode" />
  377 + <item name="main" type="462c0819:PsiDirectoryNode" />
  378 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  379 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  380 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  381 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  382 + </path>
  383 + <path>
  384 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  385 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  386 + <item name="src" type="462c0819:PsiDirectoryNode" />
  387 + <item name="main" type="462c0819:PsiDirectoryNode" />
  388 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  389 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  390 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  391 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  392 + </path>
  393 + </expand>
  394 + <select />
  395 + </subPane>
  396 + </pane>
  397 + </panes>
  398 + </component>
84 399 <component name="PropertiesComponent">
85 400 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
86 401 <property name="DatabaseDriversLRU" value="mysql" />
... ... @@ -107,6 +422,11 @@
107 422 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
108 423 </component>
109 424 <component name="RecentsManager">
  425 + <key name="MoveFile.RECENT_KEYS">
  426 + <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
  427 + <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
  428 + <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
  429 + </key>
110 430 <key name="CopyFile.RECENT_KEYS">
111 431 <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
112 432 <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
... ... @@ -114,11 +434,6 @@
114 434 <recent name="E:\code\wms2\target\classes\static\file" />
115 435 <recent name="E:\code\wms2\src\main\resources\static\file" />
116 436 </key>
117   - <key name="MoveFile.RECENT_KEYS">
118   - <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
119   - <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
120   - <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
121   - </key>
122 437 </component>
123 438 <component name="RunDashboard">
124 439 <option name="configurationTypes">
... ... @@ -136,12 +451,14 @@
136 451 </RuleState>
137 452 </list>
138 453 </option>
  454 + <option name="contentProportion" value="0.052489176" />
139 455 </component>
140 456 <component name="RunManager">
141 457 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
142   - <module name="huaheng" />
  458 + <module name="wms2" />
143 459 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
144   - <option name="ALTERNATIVE_JRE_PATH" />
  460 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
  461 + <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
145 462 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
146 463 <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
147 464 <method v="2">
... ... @@ -165,7 +482,7 @@
165 482 <expand>
166 483 <path>
167 484 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
168   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@72c56f54" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  485 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
169 486 </path>
170 487 </expand>
171 488 <select />
... ... @@ -208,7 +525,7 @@
208 525 <workItem from="1565833342181" duration="13946000" />
209 526 <workItem from="1565936336169" duration="3845000" />
210 527 <workItem from="1565941296716" duration="6217000" />
211   - <workItem from="1566175534262" duration="21374000" />
  528 + <workItem from="1566175534262" duration="11146000" />
212 529 </task>
213 530 <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
214 531 <created>1565226427512</created>
... ... @@ -308,44 +625,54 @@
308 625 <option name="project" value="LOCAL" />
309 626 <updated>1566176469173</updated>
310 627 </task>
311   - <task id="LOCAL-00015" summary="添加物料单位，重新生成库存主表和库存明细表">
312   - <created>1566192821310</created>
313   - <option name="number" value="00015" />
314   - <option name="presentableId" value="LOCAL-00015" />
315   - <option name="project" value="LOCAL" />
316   - <updated>1566192821310</updated>
317   - </task>
318   - <task id="LOCAL-00016" summary="库存明细service 导包">
319   - <created>1566193184820</created>
320   - <option name="number" value="00016" />
321   - <option name="presentableId" value="LOCAL-00016" />
322   - <option name="project" value="LOCAL" />
323   - <updated>1566193184820</updated>
324   - </task>
325   - <task id="LOCAL-00017" summary="import">
326   - <created>1566193432010</created>
327   - <option name="number" value="00017" />
328   - <option name="presentableId" value="LOCAL-00017" />
329   - <option name="project" value="LOCAL" />
330   - <updated>1566193432010</updated>
331   - </task>
332   - <task id="LOCAL-00018" summary=" 添加物料转换controller">
333   - <created>1566196020084</created>
334   - <option name="number" value="00018" />
335   - <option name="presentableId" value="LOCAL-00018" />
336   - <option name="project" value="LOCAL" />
337   - <updated>1566196020084</updated>
338   - </task>
339   - <task id="LOCAL-00019" summary=" 添加物料单位、物料单位转换页面">
340   - <created>1566204167761</created>
341   - <option name="number" value="00019" />
342   - <option name="presentableId" value="LOCAL-00019" />
343   - <option name="project" value="LOCAL" />
344   - <updated>1566204167761</updated>
345   - </task>
346   - <option name="localTasksCounter" value="20" />
  628 + <option name="localTasksCounter" value="15" />
347 629 <servers />
348 630 </component>
  631 + <component name="TodoView">
  632 + <todo-panel id="selected-file">
  633 + <is-autoscroll-to-source value="true" />
  634 + </todo-panel>
  635 + <todo-panel id="all">
  636 + <are-packages-shown value="true" />
  637 + <is-autoscroll-to-source value="true" />
  638 + </todo-panel>
  639 + </component>
  640 + <component name="ToolWindowManager">
  641 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  642 + <editor active="true" />
  643 + <layout>
  644 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.31434315" />
  645 + <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
  646 + <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
  647 + <window_info id="Designer" order="3" />
  648 + <window_info id="UI Designer" order="4" />
  649 + <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
  650 + <window_info anchor="bottom" id="Message" order="0" />
  651 + <window_info anchor="bottom" id="Find" order="1" />
  652 + <window_info anchor="bottom" id="Run" order="2" />
  653 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  654 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  655 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  656 + <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" />
  657 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  658 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.43342775" />
  659 + <window_info anchor="bottom" id="Run Dashboard" order="9" visible="true" weight="0.12747875" />
  660 + <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
  661 + <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
  662 + <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
  663 + <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
  664 + <window_info anchor="bottom" id="Messages" order="14" weight="0.3186969" />
  665 + <window_info anchor="bottom" id="MyBatis Log" order="15" />
  666 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  667 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  668 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  669 + <window_info anchor="right" id="Palette" order="3" />
  670 + <window_info anchor="right" id="Maven" order="4" />
  671 + <window_info anchor="right" id="Bean Validation" order="5" />
  672 + <window_info anchor="right" id="Database" order="6" />
  673 + <window_info anchor="right" id="Palette&#9;" order="7" />
  674 + </layout>
  675 + </component>
349 676 <component name="TypeScriptGeneratedFilesManager">
350 677 <option name="version" value="1" />
351 678 </component>
... ... @@ -355,7 +682,20 @@
355 682 <entry key="MAIN">
356 683 <value>
357 684 <State>
358   - <option name="COLUMN_ORDER" />
  685 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  686 + <collection />
  687 + </option>
  688 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  689 + <collection />
  690 + </option>
  691 + <option name="COLUMN_ORDER">
  692 + <list>
  693 + <option value="0" />
  694 + <option value="1" />
  695 + <option value="2" />
  696 + <option value="3" />
  697 + </list>
  698 + </option>
359 699 </State>
360 700 </value>
361 701 </entry>
... ... @@ -391,12 +731,9 @@
391 731 <MESSAGE value="添加承运商" />
392 732 <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
393 733 <MESSAGE value="添加仓库配置" />
394   - <MESSAGE value="添加物料单位，重新生成库存主表和库存明细表" />
395   - <MESSAGE value="库存明细service 导包" />
396   - <MESSAGE value="import" />
397   - <MESSAGE value=" 添加物料转换controller" />
398   - <MESSAGE value=" 添加物料单位、物料单位转换页面" />
399   - <option name="LAST_COMMIT_MESSAGE" value=" 添加物料单位、物料单位转换页面" />
  734 + <MESSAGE value="代码错误，库存导包" />
  735 + <MESSAGE value="代码错误，导包" />
  736 + <option name="LAST_COMMIT_MESSAGE" value="代码错误，导包" />
400 737 </component>
401 738 <component name="XDebuggerManager">
402 739 <breakpoint-manager>
... ... @@ -404,19 +741,224 @@
404 741 <line-breakpoint enabled="true" type="java-line">
405 742 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
406 743 <line>302</line>
  744 + <properties />
407 745 <option name="timeStamp" value="12" />
408 746 </line-breakpoint>
409 747 <line-breakpoint enabled="true" type="java-line">
410 748 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
411 749 <line>66</line>
  750 + <properties />
412 751 <option name="timeStamp" value="24" />
413 752 </line-breakpoint>
414 753 <line-breakpoint enabled="true" type="java-line">
415 754 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
416 755 <line>26</line>
  756 + <properties />
417 757 <option name="timeStamp" value="25" />
418 758 </line-breakpoint>
419 759 </breakpoints>
420 760 </breakpoint-manager>
  761 + <watches-manager>
  762 + <configuration name="SpringBootApplicationConfigurationType">
  763 + <watch expression="receiptTotal" />
  764 + <watch expression="this.h" custom="java.lang.reflect.Proxy" />
  765 + <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
  766 + </configuration>
  767 + </watches-manager>
  768 + </component>
  769 + <component name="editorHistoryManager">
  770 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  771 + <provider selected="true" editor-type-id="text-editor">
  772 + <state relative-caret-position="100">
  773 + <caret line="8" column="91" lean-forward="true" selection-start-line="8" selection-start-column="91" selection-end-line="8" selection-end-column="91" />
  774 + </state>
  775 + </provider>
  776 + </entry>
  777 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
  778 + <provider selected="true" editor-type-id="text-editor">
  779 + <state relative-caret-position="100">
  780 + <caret line="8" column="94" selection-start-line="8" selection-start-column="94" selection-end-line="8" selection-end-column="94" />
  781 + </state>
  782 + </provider>
  783 + </entry>
  784 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
  785 + <provider selected="true" editor-type-id="text-editor">
  786 + <state relative-caret-position="100">
  787 + <caret line="7" column="66" selection-start-line="7" selection-start-column="66" selection-end-line="7" selection-end-column="66" />
  788 + </state>
  789 + </provider>
  790 + </entry>
  791 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
  792 + <provider selected="true" editor-type-id="text-editor">
  793 + <state relative-caret-position="100">
  794 + <caret line="5" column="67" lean-forward="true" selection-start-line="5" selection-start-column="67" selection-end-line="5" selection-end-column="67" />
  795 + <folding>
  796 + <element signature="imports" expanded="true" />
  797 + </folding>
  798 + </state>
  799 + </provider>
  800 + </entry>
  801 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java">
  802 + <provider selected="true" editor-type-id="text-editor">
  803 + <state relative-caret-position="140">
  804 + <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
  805 + </state>
  806 + </provider>
  807 + </entry>
  808 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java">
  809 + <provider selected="true" editor-type-id="text-editor">
  810 + <state relative-caret-position="300">
  811 + <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
  812 + </state>
  813 + </provider>
  814 + </entry>
  815 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
  816 + <provider selected="true" editor-type-id="text-editor">
  817 + <state relative-caret-position="120">
  818 + <caret line="88" column="70" selection-start-line="88" selection-start-column="70" selection-end-line="88" selection-end-column="70" />
  819 + </state>
  820 + </provider>
  821 + </entry>
  822 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java">
  823 + <provider selected="true" editor-type-id="text-editor">
  824 + <state relative-caret-position="128">
  825 + <caret line="106" column="27" selection-start-line="106" selection-start-column="27" selection-end-line="106" selection-end-column="27" />
  826 + </state>
  827 + </provider>
  828 + </entry>
  829 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java">
  830 + <provider selected="true" editor-type-id="text-editor">
  831 + <state relative-caret-position="92">
  832 + <caret line="127" column="62" lean-forward="true" selection-start-line="127" selection-start-column="62" selection-end-line="127" selection-end-column="62" />
  833 + </state>
  834 + </provider>
  835 + </entry>
  836 + <entry file="file://$PROJECT_DIR$/pom.xml">
  837 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  838 + <provider selected="true" editor-type-id="text-editor">
  839 + <state relative-caret-position="892">
  840 + <caret line="354" column="67" selection-start-line="354" selection-start-column="67" selection-end-line="354" selection-end-column="67" />
  841 + </state>
  842 + </provider>
  843 + </entry>
  844 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java">
  845 + <provider selected="true" editor-type-id="text-editor">
  846 + <state relative-caret-position="-1032">
  847 + <caret line="15" column="35" lean-forward="true" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
  848 + </state>
  849 + </provider>
  850 + </entry>
  851 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.class">
  852 + <provider selected="true" editor-type-id="text-editor">
  853 + <state relative-caret-position="68">
  854 + <caret line="38" selection-start-line="38" selection-end-line="38" />
  855 + </state>
  856 + </provider>
  857 + </entry>
  858 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
  859 + <provider selected="true" editor-type-id="text-editor">
  860 + <state relative-caret-position="105">
  861 + <caret line="104" selection-start-line="104" selection-end-line="104" />
  862 + </state>
  863 + </provider>
  864 + </entry>
  865 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
  866 + <provider selected="true" editor-type-id="text-editor">
  867 + <state relative-caret-position="100">
  868 + <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
  869 + </state>
  870 + </provider>
  871 + </entry>
  872 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
  873 + <provider selected="true" editor-type-id="text-editor">
  874 + <state relative-caret-position="126">
  875 + <caret line="107" selection-start-line="107" selection-end-line="107" />
  876 + </state>
  877 + </provider>
  878 + </entry>
  879 + <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/LinkedHashMap.java">
  880 + <provider selected="true" editor-type-id="text-editor">
  881 + <state relative-caret-position="-376">
  882 + <caret line="163" column="24" lean-forward="true" selection-start-line="163" selection-start-column="24" selection-end-line="163" selection-end-column="24" />
  883 + </state>
  884 + </provider>
  885 + </entry>
  886 + <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd">
  887 + <provider selected="true" editor-type-id="text-editor">
  888 + <state relative-caret-position="124">
  889 + <caret line="172" column="27" lean-forward="true" selection-start-line="172" selection-start-column="27" selection-end-line="172" selection-end-column="27" />
  890 + </state>
  891 + </provider>
  892 + </entry>
  893 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/report/ExcelReportMapper.xml">
  894 + <provider selected="true" editor-type-id="text-editor">
  895 + <state relative-caret-position="300">
  896 + <caret line="94" column="16" lean-forward="true" selection-start-line="94" selection-start-column="16" selection-end-line="94" selection-end-column="16" />
  897 + </state>
  898 + </provider>
  899 + </entry>
  900 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
  901 + <provider selected="true" editor-type-id="text-editor">
  902 + <state relative-caret-position="253">
  903 + <caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" />
  904 + </state>
  905 + </provider>
  906 + </entry>
  907 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
  908 + <provider selected="true" editor-type-id="text-editor">
  909 + <state relative-caret-position="-220">
  910 + <caret line="114" column="7" lean-forward="true" selection-start-line="114" selection-start-column="7" selection-end-line="114" selection-end-column="7" />
  911 + </state>
  912 + </provider>
  913 + </entry>
  914 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
  915 + <provider selected="true" editor-type-id="text-editor">
  916 + <state relative-caret-position="580">
  917 + <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
  918 + </state>
  919 + </provider>
  920 + </entry>
  921 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
  922 + <provider selected="true" editor-type-id="text-editor">
  923 + <state relative-caret-position="275">
  924 + <caret line="302" column="20" selection-start-line="302" selection-start-column="20" selection-end-line="302" selection-end-column="20" />
  925 + </state>
  926 + </provider>
  927 + </entry>
  928 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  929 + <provider selected="true" editor-type-id="text-editor">
  930 + <state relative-caret-position="234">
  931 + <caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
  932 + </state>
  933 + </provider>
  934 + </entry>
  935 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/mapper/ExcelReportMapper.java">
  936 + <provider selected="true" editor-type-id="text-editor">
  937 + <state relative-caret-position="100">
  938 + <caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
  939 + </state>
  940 + </provider>
  941 + </entry>
  942 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  943 + <provider selected="true" editor-type-id="text-editor">
  944 + <state relative-caret-position="51">
  945 + <caret line="72" selection-start-line="72" selection-end-line="72" />
  946 + </state>
  947 + </provider>
  948 + </entry>
  949 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  950 + <provider selected="true" editor-type-id="text-editor">
  951 + <state relative-caret-position="252">
  952 + <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
  953 + </state>
  954 + </provider>
  955 + </entry>
  956 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  957 + <provider selected="true" editor-type-id="text-editor">
  958 + <state relative-caret-position="328">
  959 + <caret line="92" column="18" lean-forward="true" selection-start-line="92" selection-start-column="18" selection-end-line="92" selection-end-column="18" />
  960 + </state>
  961 + </provider>
  962 + </entry>
421 963 </component>
422 964 </project>
423 965 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @ff359b8
... ... @@ -67,6 +67,7 @@ public class InventoryDetailController extends BaseController
67 67 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),InventoryDetail::getCreated, createdBegin)
68 68 .le(StringUtils.isNotEmpty(createdEnd), InventoryDetail::getCreated, createdEnd)//创建时间范围
69 69 .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库
  70 + .eq(inventoryDetail.getInventoryHeaderId() != null,InventoryDetail::getInventoryHeaderId,inventoryDetail.getInventoryHeaderId()) //ID
70 71 .eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
71 72 .eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
72 73 .eq(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()),InventoryDetail::getCompanyCode,inventoryDetail.getCompanyCode())//货主
... ... @@ -75,8 +76,8 @@ public class InventoryDetailController extends BaseController
75 76 .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
76 77 .eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
77 78 .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
78   - //入库单编码
79   - //入库单明细ID
  79 + .eq(StringUtils.isNotEmpty(inventoryDetail.getReceiptCode()),InventoryDetail::getReceiptCode,inventoryDetail.getReceiptCode())//入库单编码
  80 + .eq(inventoryDetail.getReceiptDetailId() != null,InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId()) // 入库单明细ID
80 81 .orderByDesc(InventoryDetail::getId);
81 82  
82 83 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java
  View file @ff359b8
... ... @@ -108,9 +108,9 @@ public class InventoryHeader implements Serializable {
108 108 /**
109 109 * 锁定 1：锁定
110 110 */
111   - @TableField(value = "lock")
  111 + @TableField(value = "locking")
112 112 @ApiModelProperty(value="锁定 1：锁定")
113   - private Integer lock;
  113 + private Integer locking;
114 114  
115 115 /**
116 116 * 锁定备注
... ...
src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
  View file @ff359b8
... ... @@ -100,8 +100,8 @@ public class IndexController extends BaseController
100 100 " UNION \n" +
101 101 "SELECT COUNT(*) 'a' FROM shipment_header WHERE DATEDIFF(NOW(), created)=0 " + condition +
102 102 ") t";
103   - String receiptTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' FROM receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND d.`status` > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
104   - String shipmentTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' from shipment_container_detail d JOIN shipment_container_header h on d.shippingContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND h.enable > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
  103 + String receiptTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' FROM receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND d.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
  104 + String shipmentTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' from shipment_container_detail d JOIN shipment_container_header h on d.shippingContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND h.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
105 105 String inventoryTotal = "SELECT IFNULL(SUM(totalQty),0) 'total' from inventory_header where 1=1 " + condition;
106 106 String materialCount = "SELECT count(DISTINCT materialSkuQty) 'total' from inventory_header WHERE 1=1" + condition;
107 107 String taskUncompletedTotal = "SELECT COUNT(*) 'total' from task_detail WHERE enable < 40 " + condition;
... ...
src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml
  View file @ff359b8
... ... @@ -16,7 +16,7 @@
16 16 <result column="projectNos" jdbcType="VARCHAR" property="projectNos" />
17 17 <result column="batchs" jdbcType="VARCHAR" property="batchs" />
18 18 <result column="lots" jdbcType="VARCHAR" property="lots" />
19   - <result column="lock" jdbcType="INTEGER" property="lock" />
  19 + <result column="locking" jdbcType="INTEGER" property="locking" />
20 20 <result column="lockRemark" jdbcType="VARCHAR" property="lockRemark" />
21 21 <result column="enable" jdbcType="INTEGER" property="enable" />
22 22 <result column="created" jdbcType="TIMESTAMP" property="created" />
... ... @@ -31,8 +31,8 @@
31 31 <sql id="Base_Column_List">
32 32 <!--@mbg.generated-->
33 33 id, warehouseCode, locationCode, containerCode, containerStatus, companyCode, materialSkuQty,
34   - totalWeight, totalQty, totalLines, projectNos, batchs, lots, `lock`, lockRemark,
35   - `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
  34 + totalWeight, totalQty, totalLines, projectNos, batchs, lots, locking, lockRemark,
  35 + enable, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
36 36 userDef3
37 37 </sql>
38 38 </mapper>
39 39 \ No newline at end of file
... ...
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
  View file @ff359b8
... ... @@ -66,13 +66,11 @@
66 66 </div>
67 67 <div th:include="include :: footer"></div>
68 68 <script th:inline="javascript">
69   - var editFlag = [[${@permission.hasPermi('inventory:inventory:edit')}]];
70   - var removeFlag = [[${@permission.hasPermi('inventory:inventory:remove')}]];
71 69 var prefix = ctx + "inventory/inventoryDetail"
72 70 var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
73 71 $(function () {
74 72 var options = {
75   - url: prefix + "/inventoryDetailLook",
  73 + // url: prefix + "/inventoryDetailLook",
76 74 createUrl: prefix + "/add",
77 75 updateUrl: prefix + "/edit/{id}",
78 76 removeUrl: prefix + "/remove",
... ... @@ -272,8 +270,34 @@
272 270 ]
273 271 };
274 272 $.table.init(options);
  273 + update();
275 274 });
276 275  
  276 +
  277 + function update() {
  278 + let url = location.search; //获取url中"?"符后的字串
  279 + let str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
  280 + let strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
  281 + // if (url.indexOf("?") != -1) { //判断是否有参数
  282 + $.ajax({
  283 + url: prefix + "/inventoryDetailLook",
  284 + type:"post",
  285 + data:{
  286 + inventoryHeaderId:strs[1]||null
  287 + },
  288 + success:function (res) {
  289 + $("#bootstrap-table").bootstrapTable('removeAll');
  290 + // $("#bootstrap-table").bootstrapTable('append', res.data);
  291 + for (let i = 0; i < res.data.length; i++) {
  292 + $("#bootstrap-table").bootstrapTable('insertRow', {index:i,row:res.data[i]});
  293 +
  294 + }
  295 + }
  296 + })
  297 + // }
  298 + }
  299 +
  300 +
277 301 function localSubmit(url, type, dataType, data) {
278 302 $.modal.loading("正在处理中，请稍后...");
279 303 var config = {
... ...
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
  View file @ff359b8
... ... @@ -97,7 +97,7 @@
97 97 },
98 98 {
99 99 field : 'id',
100   - title : '库存头ID',
  100 + title : '头ID',
101 101 sortable:true
102 102 },
103 103 {
... ... @@ -207,7 +207,7 @@
207 207 function detail(id) {
208 208 let url= ctx + "inventory/inventoryDetail"; //明细网页地址
209 209 if (id){
210   - url = ctx +"inventoryDetail/inventoryDetail?id="+id;
  210 + url = ctx +"inventory/inventoryDetail?inventoryHeaderId()="+id;
211 211 }
212 212 $("#tabDetail").children().remove();
213 213 $("#myTab li").removeClass("active");
... ...