From 542f1efbda2eff388457159b4b69ee9a069571d9 Mon Sep 17 00:00:00 2001
From: mahuandong <752432958@qq.com>
Date: Thu, 29 Aug 2019 08:39:25 +0800
Subject: [PATCH] 修复入库历史controller冲突
---
.idea/MyBatisCodeHelperDatasource.xml | 24 +++++++++++++++++-------
.idea/compiler.xml | 2 +-
.idea/workspace.xml | 743 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java | 2 +-
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java | 2 +-
5 files changed, 74 insertions(+), 699 deletions(-)
diff --git a/.idea/MyBatisCodeHelperDatasource.xml b/.idea/MyBatisCodeHelperDatasource.xml
index 26774c4..a481756 100644
--- a/.idea/MyBatisCodeHelperDatasource.xml
+++ b/.idea/MyBatisCodeHelperDatasource.xml
@@ -5,9 +5,9 @@
<ProjectProfile>
<option name="addSerializeUid" value="true" />
<option name="generateService" value="true" />
- <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
+ <option name="javaMapperPackage" value="com.huaheng.pc.config.materialType.mapper" />
<option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
- <option name="javaModelPackage" value="com.huaheng.pc.inventory.adjust.domain" />
+ <option name="javaModelPackage" value="com.huaheng.pc.config.materialType.domain" />
<option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
<option name="lastDatabaseCrudChooseModuleName" value="huaheng" />
<option name="moduleNameToPackageAndPathMap">
@@ -29,13 +29,13 @@
<entry key="huaheng">
<value>
<UserPackageAndPathInfoByModule>
- <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
+ <option name="javaMapperPackage" value="com.huaheng.pc.config.materialType.mapper" />
<option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
- <option name="javaModelPacakge" value="com.huaheng.pc.inventory.adjust.domain" />
+ <option name="javaModelPacakge" value="com.huaheng.pc.config.materialType.domain" />
<option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
- <option name="javaServicePackage" value="com.huaheng.pc.inventory.adjust.service" />
+ <option name="javaServicePackage" value="com.huaheng.pc.config.materialType.service" />
<option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
- <option name="xmlPackage" value="inventory" />
+ <option name="xmlPackage" value="config" />
<option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
</UserPackageAndPathInfoByModule>
</value>
@@ -265,6 +265,16 @@
</TableGenerateConfig>
</value>
</entry>
+ <entry key="wms_v2:material_type">
+ <value>
+ <TableGenerateConfig>
+ <option name="generatedKey" value="id" />
+ <option name="javaModelName" value="MaterialType" />
+ <option name="moduleName" value="huaheng" />
+ <option name="useActualColumnName" value="true" />
+ </TableGenerateConfig>
+ </value>
+ </entry>
<entry key="wms_v2:material_unit">
<value>
<TableGenerateConfig>
@@ -551,7 +561,7 @@
<option name="useLomBokOnModel" value="true" />
<option name="useSwagger" value="true" />
<option name="userMybatisPlus" value="true" />
- <option name="xmlMapperPackage" value="inventory" />
+ <option name="xmlMapperPackage" value="config" />
<option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
</ProjectProfile>
</option>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5f0c02f..0bcc71b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,8 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
- <module name="huaheng" />
<module name="wms2" />
+ <module name="huaheng" />
</profile>
</annotationProcessing>
</component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3b28b25..c6d693e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="盘点">
+ <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" />
<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/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java" afterDir="false" />
</list>
- <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -46,69 +46,25 @@
<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="location: table" type="285a2a93:MysqlImplModel$Table" />
+ <item name="receipt_detail: table" type="285a2a93:MysqlImplModel$Table" />
+ </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_header: table" type="285a2a93:MysqlImplModel$Table" />
+ </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="status_flow_detail: table" type="285a2a93:MysqlImplModel$Table" />
</path>
</expand>
<select />
</component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1710">
- <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1467">
- <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="257">
- <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="8379">
- <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
@@ -118,64 +74,6 @@
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="RECENT_BRANCH_BY_REPOSITORY">
- <map>
- <entry key="$PROJECT_DIR$" value="master" />
- </map>
- </option>
- <option name="RESET_MODE" value="HARD" />
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
- <option value="$PROJECT_DIR$/pom.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountHeader/mapper/CyclecountHeaderMapperAuto.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cyclecountDetail/mapper/CyclecountDetailMapper.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
- <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/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
- <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
- </list>
- </option>
- </component>
- <component name="IgnoredFileRootStore">
- <option name="generatedRoots">
- <set>
- <option value="E:\code\wms2\.idea" />
- </set>
- </option>
</component>
<component name="MavenImportPreferences">
<option name="importingSettings">
@@ -184,164 +82,13 @@
</MavenImportingSettings>
</option>
</component>
- <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="470" />
- <option name="width" value="980" />
- <option name="height" value="1030" />
- </component>
- <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
+ <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
- <component name="ProjectView">
- <navigator proportions="" version="1">
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <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="task" 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="task" type="462c0819:PsiDirectoryNode" />
- <item name="taskHeader" 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="task" type="462c0819:PsiDirectoryNode" />
- <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
- <item name="controller" 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="task" 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="task" type="462c0819:PsiDirectoryNode" />
- <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
- </path>
- </expand>
- <select />
- </subPane>
- </pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
- </panes>
- </component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
- <property name="DatabaseDriversLRU" value="mysql" />
+ <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
@@ -349,21 +96,12 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566992925117" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-glgd" />
<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)" />
- <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
- </component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
- <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
- </key>
+ <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -388,25 +126,12 @@
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="WMSV1" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
</component>
<component name="ServiceViewManager">
<option name="allServicesViewState">
<serviceView>
<treeState>
- <expand>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- </expand>
+ <expand />
<select />
</treeState>
</serviceView>
@@ -417,118 +142,32 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
- <created>1565160110910</created>
+ <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
+ <created>1566977677142</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1565160110910</updated>
- <workItem from="1565160112236" duration="11971000" />
- <workItem from="1565224833241" duration="14642000" />
- <workItem from="1565242153135" duration="1476000" />
- <workItem from="1565259513116" duration="148000" />
- <workItem from="1565311988064" duration="7176000" />
- <workItem from="1565328536669" duration="797000" />
- <workItem from="1566803530593" duration="266000" />
- <workItem from="1566951795036" duration="23038000" />
+ <updated>1566977677142</updated>
+ <workItem from="1566977678336" duration="306000" />
+ <workItem from="1566978429560" duration="9246000" />
+ <workItem from="1567038752582" duration="348000" />
</task>
- <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
- <created>1565226427512</created>
+ <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
+ <created>1566983055587</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
- <updated>1565226427512</updated>
+ <updated>1566983055587</updated>
</task>
- <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面">
- <created>1565256884822</created>
+ <task id="LOCAL-00002" summary="添加入库单历史">
+ <created>1566987011007</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
- <updated>1565256884822</updated>
- </task>
- <task id="LOCAL-00003" summary="修改库区service">
- <created>1565259481656</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1565259481656</updated>
- </task>
- <task id="LOCAL-00004" summary="盘点">
- <created>1566866817508</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1566866817508</updated>
- </task>
- <task id="LOCAL-00005" summary="修改字典管理获取不到父节点Id bug">
- <created>1566872309940</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1566872309940</updated>
- </task>
- <task id="LOCAL-00006" summary="任务完成-入库任务">
- <created>1566898785579</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1566898785579</updated>
+ <updated>1566987011007</updated>
</task>
- <option name="localTasksCounter" value="7" />
+ <option name="localTasksCounter" value="3" />
<servers />
</component>
- <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="45377000" />
- </component>
- <component name="TodoView">
- <todo-panel id="selected-file">
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="true" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- </component>
- <component name="ToolWindowManager">
- <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
- <editor active="true" />
- <layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.25670242" />
- <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
- <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
- <window_info id="Designer" order="3" />
- <window_info id="UI Designer" order="4" />
- <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
- <window_info id="Image Layers" order="6" />
- <window_info id="Capture Tool" order="7" />
- <window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" weight="0.42351276" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
- <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" weight="0.3286119" />
- <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
- <window_info anchor="bottom" id="Version Control" order="8" weight="0.49433428" />
- <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" />
- <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
- <window_info anchor="bottom" id="Database Changes" order="11" weight="0.32719547" />
- <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" />
- <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
- <window_info anchor="bottom" id="Messages" order="14" weight="0.15864022" />
- <window_info anchor="bottom" id="MyBatis Log" order="15" />
- <window_info anchor="bottom" id="Terminal" order="16" />
- <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="Maven" order="3" weight="0.3297587" />
- <window_info anchor="right" id="Palette" order="4" />
- <window_info anchor="right" id="Capture Analysis" order="5" />
- <window_info anchor="right" id="Database" order="6" />
- <window_info anchor="right" id="Palette	" order="7" />
- <window_info anchor="right" id="Theme Preview" order="8" />
- <window_info anchor="right" id="Bean Validation" order="9" />
- </layout>
- </component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -538,20 +177,7 @@
<entry key="MAIN">
<value>
<State>
- <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>
+ <option name="COLUMN_ORDER" />
</State>
</value>
</entry>
@@ -573,293 +199,32 @@
</option>
</component>
<component name="VcsManagerConfiguration">
- <MESSAGE value="添加库位、库位类型增删改查接口" />
- <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
- <MESSAGE value="修改库区service" />
- <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
- <MESSAGE value="添加userWarehouse" />
- <MESSAGE value="添加containerCapacity" />
- <MESSAGE value="添加物料页面" />
- <MESSAGE value="添加商品详情" />
- <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
- <MESSAGE value="添加task实体类" />
- <MESSAGE value="添加商品、商品详情页面" />
- <MESSAGE value="添加承运商" />
- <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
- <MESSAGE value="添加仓库配置" />
- <MESSAGE value="代码错误，库存导包" />
- <MESSAGE value="代码错误，导包" />
- <MESSAGE value="上架任务查询" />
- <MESSAGE value="库存交易搜索" />
- <MESSAGE value="库存状态搜索" />
- <MESSAGE value="盘点" />
- <MESSAGE value="修改字典管理获取不到父节点Id bug" />
- <MESSAGE value="任务完成-入库任务" />
- <option name="LAST_COMMIT_MESSAGE" value="任务完成-入库任务" />
+ <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+ <MESSAGE value="盘点明细页面" />
+ <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/common/utils/poi/ExcelUtil.java</url>
- <line>302</line>
- <properties />
- <option name="timeStamp" value="12" />
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
+ <line>5</line>
+ <option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
- <line>66</line>
- <properties />
- <option name="timeStamp" value="24" />
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
+ <line>84</line>
+ <option name="timeStamp" value="3" />
</line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
- <line>26</line>
- <properties />
- <option name="timeStamp" value="25" />
+ <line-breakpoint type="java-field">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
+ <line>35</line>
+ <properties field="receiptHeaderService" class="com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailServiceImpl" />
+ <option name="timeStamp" value="2" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
- <watches-manager>
- <configuration name="SpringBootApplicationConfigurationType">
- <watch expression="receiptTotal" />
- <watch expression="this.h" custom="java.lang.reflect.Proxy" />
- <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
- </configuration>
- </watches-manager>
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="912">
- <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-185">
- <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
- <folding>
- <element signature="imports" 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="-99">
- <caret line="50" column="54" lean-forward="true" selection-start-line="50" selection-start-column="54" selection-end-line="50" selection-end-column="54" />
- </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="312">
- <caret line="39" column="41" lean-forward="true" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
- </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="322">
- <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" />
- </state>
- </provider>
- </entry>
- <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="226">
- <caret line="77" column="143" selection-start-line="77" selection-start-column="143" selection-end-line="77" selection-end-column="143" />
- </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" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
- <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="420">
- <caret line="25" column="15" lean-forward="true" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
- <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="120">
- <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="70">
- <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
- </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="531">
- <caret line="91" selection-start-line="91" selection-end-line="91" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4480">
- <caret line="231" column="4" selection-start-line="231" selection-start-column="4" selection-end-line="231" selection-end-column="4" />
- <folding>
- <element signature="e#15677#15678#0" expanded="true" />
- <element signature="e#15706#15707#0" expanded="true" />
- <element signature="e#15751#15752#0" expanded="true" />
- <element signature="e#15787#15788#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="303">
- <caret line="103" column="20" lean-forward="true" selection-start-line="103" selection-start-column="20" selection-end-line="103" selection-end-column="34" />
- </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="72">
- <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="122">
- <caret line="96" column="93" selection-start-line="96" selection-start-column="93" selection-end-line="96" selection-end-column="93" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="271">
- <caret line="28" column="58" selection-start-line="28" selection-start-column="57" selection-end-line="28" selection-end-column="58" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictDataService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictDataServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="106" column="47" selection-start-line="106" selection-start-column="39" selection-end-line="106" selection-end-column="47" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictTypeController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="759">
- <caret line="112" column="25" lean-forward="true" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="500" column="12" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="102">
- <caret line="23" column="126" selection-start-line="23" selection-start-column="118" selection-end-line="23" selection-end-column="126" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="89">
- <caret line="56" column="76" selection-start-line="56" selection-start-column="76" selection-end-line="56" selection-end-column="76" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/type/type.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-38">
- <caret line="148" column="37" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="37" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="380">
- <caret line="86" column="37" selection-start-line="86" selection-start-column="29" selection-end-line="86" selection-end-column="37" />
- <folding>
- <element signature="e#1501#1502#0" expanded="true" />
- <element signature="e#1540#1541#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1710">
- <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="8379">
- <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="257">
- <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1467">
- <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
- </state>
- </provider>
- </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
index df81ab2..3f60288 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
@@ -142,7 +142,7 @@ public class ReceiptDetailController extends BaseController {
@ApiOperation(value="删除入库单 ", notes="删除入库单 ", httpMethod = "POST")
@RequiresPermissions("receipt:receiptDetail:remove")
@Log(title = "入库-入库单 ",operating = "删除入库单 ", action = BusinessType.INSERT)
- @PostMapping("/edit")
+ @PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
if (StringUtils.isEmpty(ids)){
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java b/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java
index 25a0359..a66287c 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/controller/ReceiptDetailHistoryController.java
@@ -28,7 +28,7 @@ import java.util.List;
@Api(tags = "历史入库明细")
@Controller
-@RequestMapping("/receipt/receiptDetail")
+@RequestMapping("/receipt/receiptDetailHistory")
public class ReceiptDetailHistoryController extends BaseController {
@Resource
--
libgit2 0.22.2