diff --git a/.idea/misc.xml b/.idea/misc.xml
index 48b4b95..e8ff3b7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,4 +14,7 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
+ <component name="SuppressionsComponent">
+ <option name="suppComments" value="[]" />
+ </component>
</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 6cb772c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/wms2.iml" filepath="$PROJECT_DIR$/.idea/wms2.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 11a9f6a..86d1b92 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="BranchesTreeState">
+ <expand>
+ <path>
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+ <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+ </path>
+ <path>
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+ <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+ </path>
+ <path>
+ <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+ <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+ <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+ </path>
+ </expand>
+ <select />
+ </component>
<component name="ChangeListManager">
- <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式...">
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" afterDir="false" />
- </list>
- <ignored path="$PROJECT_DIR$/target/" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+ <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="合并信义源码" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -31,94 +44,6 @@
</expand>
<select />
</component>
- <component name="FileEditorManager">
- <leaf>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="7436" column="43" selection-start-line="7436" selection-start-column="39" selection-end-line="7436" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="258">
- <caret line="7415" column="9" lean-forward="true" selection-start-line="7415" selection-start-column="9" selection-end-line="7415" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="99" column="65" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-5608" />
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="68" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-704">
- <caret line="88" column="57" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
- <folding>
- <element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#2763#8715#0" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="262">
- <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
@@ -129,46 +54,6 @@
</list>
</option>
</component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>receiptTypeService</find>
- <find>LocationInfo</find>
- <find>getLocationInfo</find>
- <find>LK</find>
- <find>findShipment</find>
- <find>没有对应的出库单类型</find>
- <find>createShipmentTask</find>
- <find>getEmptyContainerInLocation</find>
- <find>findlast</find>
- <find>searchTask</find>
- <find>COMPLETE</find>
- <find>complete</find>
- <find>findTask</find>
- <find>inventoryDetailLook</find>
- <find>inventoryDetailId</find>
- <find>containerCode</find>
- <find>materialName</find>
- <find />
- <find>定位</find>
- <find>setLocation</find>
- <find>setLocationCode</find>
- <find>getLocationCode</find>
- <find>weight</find>
- <find>location</find>
- <find>locationService</find>
- <find>getOne</find>
- <find>locationLambdaQueryWrapper</find>
- <find>receiptDetailList</find>
- <find>searchShipmentInCondition</find>
- <find>png</find>
- </findStrings>
- <replaceStrings>
- <replace />
- </replaceStrings>
- <dirStrings>
- <dir>E:\web\wms2\src\main\java\com\huaheng\pc\receipt</dir>
- </dirStrings>
- </component>
<component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -178,74 +63,6 @@
</map>
</option>
</component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobilePutawayController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/mapper/ShipmentHeaderMapper.java" />
- <option value="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/task/task/task.html" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskDomain.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/InventoryDomain.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskInfo.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TodayInfo.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html" />
- <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
- <option value="$PROJECT_DIR$/target/classes/static/css/style.css" />
- <option value="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" />
- </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">
- <MavenImportingSettings>
- <option name="importAutomatically" value="true" />
- </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="422" />
<option name="y" value="118" />
@@ -256,109 +73,8 @@
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
- <component name="ProjectView">
- <navigator proportions="" version="1">
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <pane id="Scope" />
- <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="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="static" 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="config" 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="config" type="462c0819:PsiDirectoryNode" />
- <item name="receiptPreference" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="target" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="target" type="462c0819:PsiDirectoryNode" />
- <item name="classes" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="target" type="462c0819:PsiDirectoryNode" />
- <item name="classes" type="462c0819:PsiDirectoryNode" />
- <item name="static" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="target" type="462c0819:PsiDirectoryNode" />
- <item name="classes" type="462c0819:PsiDirectoryNode" />
- <item name="static" type="462c0819:PsiDirectoryNode" />
- <item name="css" type="462c0819:PsiDirectoryNode" />
- </path>
- </expand>
- <select />
- </subPane>
- </pane>
- <pane id="AndroidView" />
- </panes>
- </component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
- <option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
@@ -382,7 +98,7 @@
<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" />
+ <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@@ -396,18 +112,6 @@
<recent name="E:\code\wms2\src\main\resources\mybatis\monitor" />
</key>
</component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="huaheng" />
@@ -440,18 +144,6 @@
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
</configuration>
</component>
- <component name="ServiceViewManager">
- <option name="viewStates">
- <list>
- <serviceView>
- <treeState>
- <expand />
- <select />
- </treeState>
- </serviceView>
- </list>
- </option>
- </component>
<component name="SvnConfiguration">
<configuration />
</component>
@@ -508,12 +200,23 @@
<option name="project" value="LOCAL" />
<updated>1594027428164</updated>
</task>
- <option name="localTasksCounter" value="6" />
+ <task id="LOCAL-00006" summary="差异单样式修改">
+ <created>1594890132247</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
+ <option name="project" value="LOCAL" />
+ <updated>1594890132247</updated>
+ </task>
+ <task id="LOCAL-00007" summary="差异单样式修改">
+ <created>1594890170064</created>
+ <option name="number" value="00007" />
+ <option name="presentableId" value="LOCAL-00007" />
+ <option name="project" value="LOCAL" />
+ <updated>1594890170064</updated>
+ </task>
+ <option name="localTasksCounter" value="8" />
<servers />
</component>
- <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="162341000" />
- </component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
@@ -523,45 +226,6 @@
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
- <component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
- <editor active="true" />
- <layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.25" />
- <window_info id="Structure" order="1" sideWeight="0.5011442" side_tool="true" weight="0.27680966" />
- <window_info id="Designer" order="2" />
- <window_info id="Image Layers" order="3" />
- <window_info id="UI Designer" order="4" />
- <window_info id="Favorites" order="5" side_tool="true" />
- <window_info id="Capture Tool" order="6" />
- <window_info id="Web" order="7" side_tool="true" />
- <window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="bottom" id="Find" order="1" weight="0.32952926" />
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932975" weight="0.38937092" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.37635574" />
- <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.32952926" />
- <window_info anchor="bottom" id="Spring" order="7" weight="0.32952926" />
- <window_info anchor="bottom" id="Terminal" order="8" weight="0.32952926" />
- <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50067025" side_tool="true" weight="0.4807418" />
- <window_info anchor="bottom" id="Statistic" order="10" />
- <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.32952926" />
- <window_info anchor="bottom" id="Database Changes" order="12" />
- <window_info active="true" anchor="bottom" id="Version Control" order="13" visible="true" weight="0.23318872" />
- <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49865952" weight="0.32952926" />
- <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="Palette	" order="4" />
- <window_info anchor="right" id="Capture Analysis" order="5" />
- <window_info anchor="right" id="Database" order="6" weight="0.3297587" />
- <window_info anchor="right" id="Bean Validation" order="7" weight="0.3297587" />
- <window_info anchor="right" id="Theme Preview" order="8" />
- <window_info anchor="right" id="Maven Projects" order="9" weight="0.3297587" />
- </layout>
- </component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -570,22 +234,7 @@
<map>
<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>
- </State>
+ <State />
</value>
</entry>
</map>
@@ -604,66 +253,78 @@
</entry>
</map>
</option>
+ <option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="添加库位、库位类型增删改查接口" />
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
<MESSAGE value="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式..." />
- <option name="LAST_COMMIT_MESSAGE" value="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式..." />
+ <MESSAGE value="差异单样式修改" />
+ <option name="LAST_COMMIT_MESSAGE" value="差异单样式修改" />
</component>
<component name="WindowStateProjectService">
- <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" />
- <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" />
- <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state x="550" y="111" key="CommitChangelistDialog2" />
- <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" />
- <state x="184" y="92" key="DiffContextDialog" />
- <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.0.bottom" />
- <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.0.center" />
- <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.0.left" />
- <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.0.right" />
- <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.1.bottom" />
- <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.1.center" />
- <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.1.left" />
- <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.1.right" />
- <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.2.bottom" />
- <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.2.center" />
- <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.2.left" />
- <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state width="1877" height="232" key="GridCell.Tab.2.right" />
- <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state x="552" y="253" key="Vcs.Push.Dialog.v2" />
- <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" />
- <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" />
- <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" />
- <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
- <state x="647" y="310" key="git4idea.merge.GitPullDialog" />
- <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" />
- <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" />
- <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
+ <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1594890018298" />
+ <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1594890018298" />
+ <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="550" y="111" key="CommitChangelistDialog2" timestamp="1594890018298" />
+ <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="184" y="92" key="DiffContextDialog" timestamp="1594890018298" />
+ <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.bottom" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.center" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.left" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.right" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.bottom" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.center" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.left" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.right" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.bottom" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.center" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.left" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.right" timestamp="1594890018298" />
+ <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="696" y="221" key="RollbackChangesDialog" timestamp="1594890072970">
+ <screen x="0" y="0" width="1920" height="1040" />
+ </state>
+ <state x="696" y="221" key="RollbackChangesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890072970" />
+ <state x="461" y="164" key="SettingsEditor" timestamp="1594946753286">
+ <screen x="0" y="0" width="1920" height="1040" />
+ </state>
+ <state x="461" y="164" key="SettingsEditor/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594946753286" />
+ <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1594946725336">
+ <screen x="0" y="0" width="1920" height="1040" />
+ </state>
+ <state x="552" y="253" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594946725336" />
+ <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1594890018298" />
+ <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" timestamp="1594890018298" />
+ <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="647" y="310" key="git4idea.merge.GitPullDialog" timestamp="1594890018298" />
+ <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
+ <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1594890018298" />
+ <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java</url>
- <line>462</line>
- <properties />
+ <line>459</line>
<option name="timeStamp" value="41" />
</line-breakpoint>
</breakpoints>
@@ -673,375 +334,4 @@
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ShipmentDomain.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="76">
- <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="23" selection-start-line="23" selection-end-line="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/InventoryDomain.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="10" column="51" selection-start-line="10" selection-start-column="51" selection-end-line="10" selection-end-column="51" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TodayInfo.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="38">
- <caret line="2" column="22" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="22" />
- <folding>
- <element signature="e#197#198#0" expanded="true" />
- <element signature="e#230#231#0" expanded="true" />
- <element signature="e#283#284#0" expanded="true" />
- <element signature="e#327#328#0" expanded="true" />
- <element signature="e#367#368#0" expanded="true" />
- <element signature="e#402#403#0" expanded="true" />
- <element signature="e#459#460#0" expanded="true" />
- <element signature="e#507#508#0" expanded="true" />
- <element signature="e#548#549#0" expanded="true" />
- <element signature="e#584#585#0" expanded="true" />
- <element signature="e#643#644#0" expanded="true" />
- <element signature="e#693#694#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="112">
- <caret line="111" column="48" selection-start-line="111" selection-start-column="29" selection-end-line="111" selection-end-column="48" />
- </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="-2">
- <caret line="66" column="18" selection-start-line="66" selection-start-column="18" selection-end-line="66" selection-end-column="18" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="197">
- <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/ShiroConfig.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="327">
- <caret line="264" column="19" lean-forward="true" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="152">
- <caret line="134" column="32" lean-forward="true" selection-start-line="134" selection-start-column="32" selection-end-line="134" selection-end-column="32" />
- <folding>
- <element signature="n#style#0;n#button#0;n#div#0;n#div#14;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#button#1;n#div#0;n#div#14;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="6" column="68" lean-forward="true" selection-start-line="6" selection-start-column="68" selection-end-line="6" selection-end-column="68" />
- <folding>
- <element signature="n#style#0;n#button#0;n#div#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#button#1;n#div#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="118">
- <caret line="31" column="32" lean-forward="true" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="353">
- <caret line="90" column="9" lean-forward="true" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
- </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="76">
- <caret line="9" column="66" lean-forward="true" selection-start-line="9" selection-start-column="66" selection-end-line="9" selection-end-column="66" />
- </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="106">
- <caret line="90" column="55" lean-forward="true" selection-start-line="90" selection-start-column="55" selection-end-line="90" selection-end-column="55" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java" />
- <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="216">
- <caret line="162" column="33" selection-start-line="162" selection-start-column="33" selection-end-line="162" selection-end-column="33" />
- </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="339">
- <caret line="651" column="39" lean-forward="true" selection-start-line="651" selection-start-column="39" selection-end-line="651" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="348">
- <caret line="33" column="44" lean-forward="true" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="224">
- <caret line="35" column="59" lean-forward="true" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="114">
- <caret line="7" selection-start-line="7" selection-end-line="7" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="302">
- <caret line="51" column="5" lean-forward="true" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="133">
- <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-70">
- <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="367">
- <caret line="35" column="56" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="167">
- <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="424">
- <caret line="56" column="50" lean-forward="true" selection-start-line="56" selection-start-column="50" selection-end-line="56" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="228">
- <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="197">
- <caret line="309" column="39" selection-start-line="309" selection-start-column="39" selection-end-line="309" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="140" column="9" lean-forward="true" selection-start-line="140" selection-start-column="9" selection-end-line="140" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WcsLoginController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="116">
- <caret line="30" column="53" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/acs/controller/TaskConfirm.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="186">
- <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="95">
- <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="35" column="53" lean-forward="true" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="243">
- <caret line="71" column="66" selection-start-line="71" selection-start-column="66" selection-end-line="71" selection-end-column="66" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="269">
- <caret line="464" column="5" selection-start-line="441" selection-start-column="3" selection-end-line="464" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="164">
- <caret line="532" column="4" selection-start-line="532" selection-start-column="4" selection-end-line="553" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="209" column="5" selection-start-line="188" selection-start-column="4" selection-end-line="209" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="211">
- <caret line="74" column="43" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="43" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-5608" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="99" column="65" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="68" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="7436" column="43" selection-start-line="7436" selection-start-column="39" selection-end-line="7436" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-704">
- <caret line="88" column="57" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
- <folding>
- <element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#2763#8715#0" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="258">
- <caret line="7415" column="9" lean-forward="true" selection-start-line="7415" selection-start-column="9" selection-end-line="7415" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="262">
- <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
- </state>
- </provider>
- </entry>
- </component>
</project>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html b/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
index 1fc3602..d70f99c 100644
--- a/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
+++ b/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
@@ -2,14 +2,6 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
-<style>
- #toolbar1 {
- display: inline-block;
- /*position: absolute;
- margin: 10px auto;*/
- line-height: 34px;
- }
-</style>
<body class="gray-bg">
<div class="container-div">
<div class="row">
@@ -109,10 +101,6 @@
sortName: "created",
sortOrder: "desc",
search: false,
-
- // onDblClickRow: function (row) {
- // showDetail(row.id,row.code);
- // },
onDblClickRow:function(row){
detail(row.id,row.masterCode);
},