wms / wms_ningbohuazhang · Commits

Commit f18c3861c34c286cc8a29a5e542dbc725754fefe

Authored by mahuandong
2 parents b4ccc95d b43fa4b6

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

Inline Side-by-side
Showing 6 changed files with 453 additions and 107 deletions
.idea/workspace.xml
  View file @f18c386
... ... @@ -2,62 +2,41 @@
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/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="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/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" afterDir="false" />
8   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/edit.html" afterDir="false" />
12   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html" afterDir="false" />
13   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.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" />
14 10 </list>
  11 + <ignored path="$PROJECT_DIR$/target/" />
  12 + <ignored path="$PROJECT_DIR$/out/" />
15 13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16 14 <option name="SHOW_DIALOG" value="false" />
17 15 <option name="HIGHLIGHT_CONFLICTS" value="true" />
18 16 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
19 17 <option name="LAST_RESOLUTION" value="IGNORE" />
20 18 </component>
21   - <component name="DatabaseView">
22   - <option name="SHOW_INTERMEDIATE" value="false" />
23   - <option name="GROUP_DATA_SOURCES" value="true" />
24   - <option name="GROUP_SCHEMA" value="true" />
25   - <option name="GROUP_CONTENTS" value="false" />
26   - <option name="SORT_POSITIONED" value="false" />
27   - <option name="SHOW_EMPTY_GROUPS" value="false" />
28   - <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
29   - <option name="HIDDEN_KINDS">
30   - <set />
31   - </option>
32   - <expand>
33   - <path>
34   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
35   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
36   - </path>
37   - <path>
38   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
39   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
40   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
41   - </path>
42   - <path>
43   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
44   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
45   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
46   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
47   - </path>
48   - <path>
49   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
50   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
51   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
52   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
53   - <item name="receipt_detail: table" type="285a2a93:MysqlImplModel$Table" />
54   - </path>
55   - </expand>
56   - <select />
  19 + <component name="FileEditorManager">
  20 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
57 21 </component>
58 22 <component name="Git.Settings">
59 23 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
60 24 </component>
  25 + <component name="IdeDocumentHistory">
  26 + <option name="CHANGED_PATHS">
  27 + <list>
  28 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" />
  29 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
  30 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
  31 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
  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" />
  37 + </list>
  38 + </option>
  39 + </component>
61 40 <component name="MavenImportPreferences">
62 41 <option name="importingSettings">
63 42 <MavenImportingSettings>
... ... @@ -65,26 +44,196 @@
65 44 </MavenImportingSettings>
66 45 </option>
67 46 </component>
68   - <component name="ProjectId" id="1Q1y4tYTyweiwdscwK3upUzvcvp" />
  47 + <component name="MavenProjectNavigator">
  48 + <treeState>
  49 + <expand>
  50 + <path>
  51 + <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
  52 + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
  53 + </path>
  54 + </expand>
  55 + <select />
  56 + </treeState>
  57 + </component>
  58 + <component name="ProjectFrameBounds" extendedState="6">
  59 + <option name="x" value="-9" />
  60 + <option name="y" value="-9" />
  61 + <option name="width" value="1938" />
  62 + <option name="height" value="1048" />
  63 + </component>
69 64 <component name="ProjectLevelVcsManager">
70 65 <ConfirmationsSetting value="2" id="Add" />
71 66 </component>
  67 + <component name="ProjectView">
  68 + <navigator proportions="" version="1">
  69 + <foldersAlwaysOnTop value="true" />
  70 + </navigator>
  71 + <panes>
  72 + <pane id="PackagesPane" />
  73 + <pane id="ProjectPane">
  74 + <subPane>
  75 + <expand>
  76 + <path>
  77 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  78 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  79 + </path>
  80 + <path>
  81 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  82 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  83 + <item name="src" type="462c0819:PsiDirectoryNode" />
  84 + </path>
  85 + <path>
  86 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  87 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  88 + <item name="src" type="462c0819:PsiDirectoryNode" />
  89 + <item name="main" type="462c0819:PsiDirectoryNode" />
  90 + </path>
  91 + <path>
  92 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  93 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  94 + <item name="src" type="462c0819:PsiDirectoryNode" />
  95 + <item name="main" type="462c0819:PsiDirectoryNode" />
  96 + <item name="java" type="462c0819:PsiDirectoryNode" />
  97 + </path>
  98 + <path>
  99 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  100 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  101 + <item name="src" type="462c0819:PsiDirectoryNode" />
  102 + <item name="main" type="462c0819:PsiDirectoryNode" />
  103 + <item name="java" type="462c0819:PsiDirectoryNode" />
  104 + <item name="com" type="462c0819:PsiDirectoryNode" />
  105 + </path>
  106 + <path>
  107 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  108 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  109 + <item name="src" type="462c0819:PsiDirectoryNode" />
  110 + <item name="main" type="462c0819:PsiDirectoryNode" />
  111 + <item name="java" type="462c0819:PsiDirectoryNode" />
  112 + <item name="com" type="462c0819:PsiDirectoryNode" />
  113 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  114 + </path>
  115 + <path>
  116 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  117 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  118 + <item name="src" type="462c0819:PsiDirectoryNode" />
  119 + <item name="main" type="462c0819:PsiDirectoryNode" />
  120 + <item name="java" type="462c0819:PsiDirectoryNode" />
  121 + <item name="com" type="462c0819:PsiDirectoryNode" />
  122 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  123 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  124 + </path>
  125 + <path>
  126 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  127 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  128 + <item name="src" type="462c0819:PsiDirectoryNode" />
  129 + <item name="main" type="462c0819:PsiDirectoryNode" />
  130 + <item name="java" type="462c0819:PsiDirectoryNode" />
  131 + <item name="com" type="462c0819:PsiDirectoryNode" />
  132 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  133 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  134 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  135 + </path>
  136 + <path>
  137 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  138 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  139 + <item name="src" type="462c0819:PsiDirectoryNode" />
  140 + <item name="main" type="462c0819:PsiDirectoryNode" />
  141 + <item name="java" type="462c0819:PsiDirectoryNode" />
  142 + <item name="com" type="462c0819:PsiDirectoryNode" />
  143 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  144 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  145 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  146 + <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
  147 + </path>
  148 + <path>
  149 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  150 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  151 + <item name="src" type="462c0819:PsiDirectoryNode" />
  152 + <item name="main" type="462c0819:PsiDirectoryNode" />
  153 + <item name="java" type="462c0819:PsiDirectoryNode" />
  154 + <item name="com" type="462c0819:PsiDirectoryNode" />
  155 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  156 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  157 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  158 + <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
  159 + </path>
  160 + <path>
  161 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  162 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  163 + <item name="src" type="462c0819:PsiDirectoryNode" />
  164 + <item name="main" type="462c0819:PsiDirectoryNode" />
  165 + <item name="resources" 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 + <item name="main" type="462c0819:PsiDirectoryNode" />
  172 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  173 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  174 + </path>
  175 + <path>
  176 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  177 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  178 + <item name="src" type="462c0819:PsiDirectoryNode" />
  179 + <item name="main" type="462c0819:PsiDirectoryNode" />
  180 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  181 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  182 + <item name="inventory" 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="resources" type="462c0819:PsiDirectoryNode" />
  190 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  191 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  192 + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
  193 + </path>
  194 + <path>
  195 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  196 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  197 + <item name="src" type="462c0819:PsiDirectoryNode" />
  198 + <item name="main" type="462c0819:PsiDirectoryNode" />
  199 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  200 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  201 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  202 + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
  203 + </path>
  204 + <path>
  205 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  206 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  207 + <item name="src" type="462c0819:PsiDirectoryNode" />
  208 + <item name="main" type="462c0819:PsiDirectoryNode" />
  209 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  210 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  211 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  212 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  213 + </path>
  214 + <path>
  215 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  216 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  217 + <item name="src" type="462c0819:PsiDirectoryNode" />
  218 + <item name="main" type="462c0819:PsiDirectoryNode" />
  219 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  220 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  221 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  222 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  223 + </path>
  224 + </expand>
  225 + <select />
  226 + </subPane>
  227 + </pane>
  228 + <pane id="Scope" />
  229 + </panes>
  230 + </component>
72 231 <component name="PropertiesComponent">
73   - <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
74 232 <property name="RequestMappingsPanelOrder0" value="0" />
75 233 <property name="RequestMappingsPanelOrder1" value="1" />
76 234 <property name="RequestMappingsPanelWidth0" value="75" />
77 235 <property name="RequestMappingsPanelWidth1" value="75" />
78 236 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
79   - <property name="WebServerToolWindowFactoryState" value="false" />
80   - <property name="aspect.path.notification.shown" value="true" />
81   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
82   - <property name="node.js.detected.package.eslint" value="true" />
83   - <property name="node.js.detected.package.tslint" value="true" />
84   - <property name="node.js.path.for.package.eslint" value="project" />
85   - <property name="node.js.path.for.package.tslint" value="project" />
86   - <property name="node.js.selected.package.eslint" value="(autodetect)" />
87   - <property name="node.js.selected.package.tslint" value="(autodetect)" />
88 237 </component>
89 238 <component name="RunDashboard">
90 239 <option name="ruleStates">
... ... @@ -100,11 +249,9 @@
100 249 </component>
101 250 <component name="RunManager">
102 251 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
103   - <module name="huaheng" />
  252 + <module name="wms2" />
104 253 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
105 254 <option name="ALTERNATIVE_JRE_PATH" />
106   - <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
107   - <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
108 255 <method v="2">
109 256 <option name="Make" enabled="true" />
110 257 </method>
... ... @@ -113,24 +260,39 @@
113 260 <component name="SvnConfiguration">
114 261 <configuration />
115 262 </component>
116   - <component name="TaskManager">
117   - <task id="LOCAL-00001" summary="入库和入库明细单据修改">
118   - <created>1566902280355</created>
119   - <option name="number" value="00001" />
120   - <option name="presentableId" value="LOCAL-00001" />
121   - <option name="project" value="LOCAL" />
122   - <updated>1566902280355</updated>
123   - </task>
124   - <task active="true" id="Default" summary="Default task">
125   - <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
126   - <created>1566952208669</created>
127   - <option name="number" value="Default" />
128   - <option name="presentableId" value="Default" />
129   - <updated>1566952208669</updated>
130   - <workItem from="1566952212611" duration="6469000" />
131   - </task>
132   - <option name="localTasksCounter" value="2" />
133   - <servers />
  263 + <component name="ToolWindowManager">
  264 + <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
  265 + <layout>
  266 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3324397" />
  267 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  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" />
  272 + <window_info anchor="bottom" id="Message" order="0" />
  273 + <window_info anchor="bottom" id="Find" order="1" />
  274 + <window_info anchor="bottom" id="Run" order="2" />
  275 + <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.07365439" />
  276 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  277 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  278 + <window_info anchor="bottom" id="TODO" order="6" />
  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" />
  287 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  288 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  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&#9;" order="7" />
  295 + </layout>
134 296 </component>
135 297 <component name="TypeScriptGeneratedFilesManager">
136 298 <option name="version" value="1" />
... ... @@ -141,15 +303,201 @@
141 303 <entry key="MAIN">
142 304 <value>
143 305 <State>
144   - <option name="COLUMN_ORDER" />
  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>
145 320 </State>
146 321 </value>
147 322 </entry>
148 323 </map>
149 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>
150 339 </component>
151 340 <component name="VcsManagerConfiguration">
152   - <MESSAGE value="入库和入库明细单据修改" />
153   - <option name="LAST_COMMIT_MESSAGE" value="入库和入库明细单据修改" />
  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>
  356 + <component name="editorHistoryManager">
  357 + <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
  358 + <provider selected="true" editor-type-id="text-editor" />
  359 + </entry>
  360 + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml" />
  361 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
  362 + <provider selected="true" editor-type-id="text-editor">
  363 + <state relative-caret-position="287">
  364 + <caret line="607" column="5" lean-forward="true" selection-start-line="607" selection-start-column="5" selection-end-line="607" selection-end-column="5" />
  365 + <folding>
  366 + <element signature="e#11035#11036#0" expanded="true" />
  367 + <element signature="e#11064#11065#0" expanded="true" />
  368 + <element signature="e#17291#17292#0" expanded="true" />
  369 + <element signature="e#17330#17331#0" expanded="true" />
  370 + <element signature="e#17395#17396#0" expanded="true" />
  371 + <element signature="e#17451#17452#0" expanded="true" />
  372 + </folding>
  373 + </state>
  374 + </provider>
  375 + </entry>
  376 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  377 + <provider selected="true" editor-type-id="text-editor">
  378 + <state relative-caret-position="176">
  379 + <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
  380 + </state>
  381 + </provider>
  382 + </entry>
  383 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
  384 + <provider selected="true" editor-type-id="text-editor">
  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" />
  387 + </state>
  388 + </provider>
  389 + </entry>
  390 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml">
  391 + <provider selected="true" editor-type-id="text-editor">
  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" />
  394 + </state>
  395 + </provider>
  396 + </entry>
  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">
  433 + <provider selected="true" editor-type-id="text-editor">
  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" />
  471 + </state>
  472 + </provider>
  473 + </entry>
  474 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
  475 + <provider selected="true" editor-type-id="text-editor">
  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" />
  499 + </state>
  500 + </provider>
  501 + </entry>
154 502 </component>
155 503 </project>
156 504 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java 0 → 100644
  View file @f18c386
  1 +package com.huaheng.pc.inventory.adjustHeader.controller;
  2 +
  3 +import com.huaheng.framework.web.controller.BaseController;
  4 +import org.springframework.stereotype.Controller;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +
  7 +@Controller
  8 +@RequestMapping("/inventory/adjustHeader")
  9 +public class adjustHeaderController extends BaseController {
  10 +
  11 +
  12 +
  13 +
  14 +
  15 +
  16 +}
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
  View file @f18c386
... ... @@ -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
  View file @f18c386
... ... @@ -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
  View file @f18c386
... ... @@ -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
  View file @f18c386
... ... @@ -274,10 +274,6 @@
274 274 visible:false
275 275 },
276 276 {
277   - field : 'lastCycleCountDate',
278   - title : '上次盘点日期'
279   - },
280   - {
281 277 field : 'processStamp',
282 278 title : '处理标记',
283 279 visible:false
... ...