diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 974dd65..a120b62 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,62 +2,41 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <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" />
- <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" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
- <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" />
- <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" />
- <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" />
- <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
</list>
+ <ignored path="$PROJECT_DIR$/target/" />
+ <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="false" />
- <option name="GROUP_DATA_SOURCES" value="true" />
- <option name="GROUP_SCHEMA" value="true" />
- <option name="GROUP_CONTENTS" value="false" />
- <option name="SORT_POSITIONED" value="false" />
- <option name="SHOW_EMPTY_GROUPS" value="false" />
- <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
- <option name="HIDDEN_KINDS">
- <set />
- </option>
- <expand>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- <item name="receipt_detail: table" type="285a2a93:MysqlImplModel$Table" />
- </path>
- </expand>
- <select />
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml" />
+ </list>
+ </option>
+ </component>
<component name="MavenImportPreferences">
<option name="importingSettings">
<MavenImportingSettings>
@@ -65,26 +44,196 @@
</MavenImportingSettings>
</option>
</component>
- <component name="ProjectId" id="1Q1y4tYTyweiwdscwK3upUzvcvp" />
+ <component name="MavenProjectNavigator">
+ <treeState>
+ <expand>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ </path>
+ </expand>
+ <select />
+ </treeState>
+ </component>
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-9" />
+ <option name="y" value="-9" />
+ <option name="width" value="1938" />
+ <option name="height" value="1048" />
+ </component>
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="PackagesPane" />
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="Scope" />
+ </panes>
+ </component>
<component name="PropertiesComponent">
- <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
- <property name="node.js.detected.package.eslint" value="true" />
- <property name="node.js.detected.package.tslint" value="true" />
- <property name="node.js.path.for.package.eslint" value="project" />
- <property name="node.js.path.for.package.tslint" value="project" />
- <property name="node.js.selected.package.eslint" value="(autodetect)" />
- <property name="node.js.selected.package.tslint" value="(autodetect)" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -100,11 +249,9 @@
</component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="huaheng" />
+ <module name="wms2" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
- <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -113,24 +260,39 @@
<component name="SvnConfiguration">
<configuration />
</component>
- <component name="TaskManager">
- <task id="LOCAL-00001" summary="入库和入库明细单据修改">
- <created>1566902280355</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1566902280355</updated>
- </task>
- <task active="true" id="Default" summary="Default task">
- <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
- <created>1566952208669</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1566952208669</updated>
- <workItem from="1566952212611" duration="6469000" />
- </task>
- <option name="localTasksCounter" value="2" />
- <servers />
+ <component name="ToolWindowManager">
+ <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
+ <layout>
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3324397" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info id="Web" order="2" side_tool="true" />
+ <window_info id="Designer" order="3" />
+ <window_info id="UI Designer" order="4" />
+ <window_info id="Favorites" order="5" side_tool="true" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.07365439" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="8" weight="0.42776203" />
+ <window_info anchor="bottom" id="Database Changes" order="9" />
+ <window_info anchor="bottom" id="Spring" order="10" />
+ <window_info anchor="bottom" id="MyBatis Log" order="11" />
+ <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+ <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
+ <window_info anchor="bottom" id="Java Enterprise" order="14" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Palette" order="3" />
+ <window_info anchor="right" id="Database" order="4" />
+ <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
+ <window_info anchor="right" id="Bean Validation" order="6" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ </layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@@ -141,15 +303,201 @@
<entry key="MAIN">
<value>
<State>
- <option name="COLUMN_ORDER" />
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
</map>
</option>
+ <option name="RECENT_FILTERS">
+ <map>
+ <entry key="Branch">
+ <value>
+ <list />
+ </value>
+ </entry>
+ <entry key="User">
+ <value>
+ <list />
+ </value>
+ </entry>
+ </map>
+ </option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="入库和入库明细单据修改" />
- <option name="LAST_COMMIT_MESSAGE" value="入库和入库明细单据修改" />
+ <MESSAGE value="盘点明细页面" />
+ <option name="LAST_COMMIT_MESSAGE" value="盘点明细页面" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager>
+ <breakpoints>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
+ <line>5</line>
+ <properties />
+ <option name="timeStamp" value="1" />
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="287">
+ <caret line="607" column="5" lean-forward="true" selection-start-line="607" selection-start-column="5" selection-end-line="607" selection-end-column="5" />
+ <folding>
+ <element signature="e#11035#11036#0" expanded="true" />
+ <element signature="e#11064#11065#0" expanded="true" />
+ <element signature="e#17291#17292#0" expanded="true" />
+ <element signature="e#17330#17331#0" expanded="true" />
+ <element signature="e#17395#17396#0" expanded="true" />
+ <element signature="e#17451#17452#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="176">
+ <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="368">
+ <caret line="274" column="23" selection-start-line="274" selection-start-column="23" selection-end-line="274" selection-end-column="23" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="880">
+ <caret line="44" column="53" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/mapper/InventoryTransactionMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="80">
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="4068">
+ <caret line="278" column="32" lean-forward="true" selection-start-line="278" selection-start-column="32" selection-end-line="278" selection-end-column="32" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="80">
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-68">
+ <caret line="2" selection-start-line="2" selection-end-line="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="140">
+ <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="80">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="40">
+ <caret line="2" selection-start-line="2" selection-end-line="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="80">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="40">
+ <caret line="2" selection-start-line="2" selection-end-line="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="80">
+ <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="960">
+ <caret line="48" column="60" selection-start-line="48" selection-start-column="60" selection-end-line="48" selection-end-column="60" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="8402">
+ <caret line="639" column="9" lean-forward="true" selection-start-line="639" selection-start-column="9" selection-end-line="639" selection-end-column="9" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-218">
+ <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="146">
+ <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="564">
+ <caret line="46" column="36" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java b/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
new file mode 100644
index 0000000..c3471f8
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
@@ -0,0 +1,16 @@
+package com.huaheng.pc.inventory.adjustHeader.controller;
+
+import com.huaheng.framework.web.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/inventory/adjustHeader")
+public class adjustHeaderController extends BaseController {
+
+
+
+
+
+
+}
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
index 86fb3e4..4a7b368 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
@@ -208,13 +208,6 @@ public class InventoryTransaction implements Serializable {
private String lockCode;
/**
- * 上次盘点日期
- */
- @TableField(value = "lastCycleCountDate")
- @ApiModelProperty(value="上次盘点日期")
- private Date lastCycleCountDate;
-
- /**
* 创建时间
*/
@TableField(value = "created")
@@ -285,4 +278,6 @@ public class InventoryTransaction implements Serializable {
@ApiModelProperty(value = "供应商编码")
private String supplierCode;
+
+
}
\ No newline at end of file
diff --git a/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml b/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
index 98db6ea..03621cd 100644
--- a/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
+++ b/src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
@@ -20,7 +20,7 @@
<result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
<result column="systemQty" jdbcType="DECIMAL" property="systemQty" />
<result column="countedQty" jdbcType="DECIMAL" property="countedQty" />
- <result column="adjustQty" jdbcType="DECIMAL" property="adjustQty" />
+ <result column="gapQty" jdbcType="DECIMAL" property="gapQty" />
<result column="rejectionNote" jdbcType="VARCHAR" property="rejectionNote" />
<result column="countedBy" jdbcType="VARCHAR" property="countedBy" />
<result column="countedAt" jdbcType="TIMESTAMP" property="countedAt" />
@@ -46,7 +46,7 @@
<!--@mbg.generated-->
id, countId, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId,
locationCode, containerCode, materialCode, materialName, materialSpec, materialUnit,
- companyCode, inventorySts, systemQty, countedQty, adjustQty, rejectionNote, countedBy,
+ companyCode, inventorySts, systemQty, countedQty, gapQty, rejectionNote, countedBy,
countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created,
createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp,
batch, lot, projectNo
diff --git a/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml b/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml
index fc76b82..fa36cde 100644
--- a/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml
+++ b/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml
@@ -13,10 +13,10 @@
<result column="materialName" jdbcType="VARCHAR" property="materialName" />
<result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
<result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
- <result column="qty" jdbcType="INTEGER" property="qty" />
+ <result column="taskQty" jdbcType="INTEGER" property="taskQty" />
<result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
<result column="referCode" jdbcType="VARCHAR" property="referCode" />
- <result column="referId" jdbcType="VARCHAR" property="referId" />
+ <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" />
<result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" />
<result column="batch" jdbcType="VARCHAR" property="batch" />
<result column="lot" jdbcType="VARCHAR" property="lot" />
@@ -30,31 +30,22 @@
<result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
<result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
<result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
- <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
<result column="lockCode" jdbcType="VARCHAR" property="lockCode" />
- <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" />
<result column="created" jdbcType="TIMESTAMP" property="created" />
<result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
- <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
- <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
<result column="version" jdbcType="INTEGER" property="version" />
<result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
<result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
<result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
- <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, warehouseCode, companyCode, locationCode, containerCode, transactionType, materialCode,
- materialName, materialSpec, materialUnit, qty, inventorySts, referCode, referId,
+ materialName, materialSpec, materialUnit, taskQty, inventorySts, referCode, referDetailId,
referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, expirationDate,
- agingDate, attributeId, attribute1, attribute2, attribute3, attribute4, lockCode,
- lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1,
- userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+ agingDate, attributeId, attribute1, attribute2, attribute3, lockCode,
+ created, createdBy, version, userDef1,
+ userDef2, userDef3, processStamp
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
index 183bd63..5482699 100644
--- a/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
+++ b/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
@@ -274,10 +274,6 @@
visible:false
},
{
- field : 'lastCycleCountDate',
- title : '上次盘点日期'
- },
- {
field : 'processStamp',
title : '处理标记',
visible:false