diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5af4f83..8352e31 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,20 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java" 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/resources/templates/inventory/cyclecountAdjustDetail/cyclecountAdjustDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjustDetail/cyclecountAdjustDetail.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/cyclecountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/cyclecountDetail.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" 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/templates/task/taskHeader/taskHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -51,66 +42,59 @@
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
</path>
+ <path>
+ <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+ <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+ <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+ <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
+ <item name="location: 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="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1340">
- <caret line="67" column="5" lean-forward="true" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
- <folding>
- <element signature="e#0#16496#0" expanded="true" />
- </folding>
- </state>
- </provider>
+ <leaf>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.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="200">
- <caret line="10" selection-start-line="10" selection-end-line="10" />
+ <state relative-caret-position="409">
+ <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <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/task/taskHeader/service/TaskHeaderService.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="100">
- <caret line="31" column="40" lean-forward="true" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
- <folding>
- <element signature="e#0#15820#0" expanded="true" />
- </folding>
+ <state relative-caret-position="152">
+ <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
+ <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="-244">
- <caret line="13" column="49" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
+ <state relative-caret-position="-173">
+ <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
- <provider selected="true" editor-type-id="text-editor" />
+ <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="-513">
+ <folding>
+ <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
</file>
</leaf>
@@ -118,18 +102,10 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
- <option value="FxmlFile" />
- <option value="Interface" />
- <option value="HTML File" />
<option value="Class" />
</list>
</option>
</component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>configuration</find>
- </findStrings>
- </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY">
@@ -137,45 +113,6 @@
<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/task/taskHeader/controller/TaskHeaderController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
- <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/controller/CycleCountDetailController.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/controller/CycleCountHeaderController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
- </list>
- </option>
</component>
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
@@ -191,11 +128,21 @@
</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="-9" />
- <option name="y" value="-9" />
- <option name="width" value="1938" />
- <option name="height" value="1048" />
+ <option name="x" value="470" />
+ <option name="width" value="980" />
+ <option name="height" value="1030" />
</component>
<component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
<component name="ProjectLevelVcsManager">
@@ -263,119 +210,6 @@
<item name="wms2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountDetail" 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="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- <item name="service" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountHeader" 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="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
- <item name="service" 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>
@@ -393,7 +227,7 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -402,28 +236,8 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cyclecountHeader" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -436,8 +250,6 @@
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="mysql" />
- <property name="DefaultHtmlFileTemplate" value="HTML File" />
- <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
@@ -445,43 +257,23 @@
<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="1566462677598" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566803879583" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
<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="nodejs_package_manager_path" value="npm" />
- <property name="project.structure.last.edited" value="Project" />
- <property name="project.structure.proportion" value="0.0" />
- <property name="project.structure.side.proportion" value="0.0" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="C:\Project\wms2\src\main\java\com\huaheng\pc\inventory" />
- <recent name="F:\wms2\src\main\resources\templates\task\taskHeader" />
- <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
- <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
- <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" />
- </key>
- <key name="CopyClassDialog.RECENTS_KEY">
- <recent name="com.huaheng.pc.task.taskDetail.controller" />
- </key>
<key name="MoveFile.RECENT_KEYS">
- <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
<recent name="E:\code\wms2\src\main\resources\mybatis\general" />
<recent name="E:\code\wms2\src\main\resources\mybatis\config" />
</key>
</component>
<component name="RunDashboard">
- <option name="configurationTypes">
- <set>
- <option value="SpringBootApplicationConfigurationType" />
- </set>
- </option>
<option name="ruleStates">
<list>
<RuleState>
@@ -492,14 +284,12 @@
</RuleState>
</list>
</option>
- <option name="contentProportion" value="0.012987013" />
</component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="wms2" />
+ <module name="huaheng" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
- <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
+ <option name="ALTERNATIVE_JRE_PATH" />
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<method v="2">
@@ -518,12 +308,11 @@
<component name="ServiceViewManager">
<option name="allServicesViewState">
<serviceView>
- <option name="contentProportion" value="0.18875067" />
<treeState>
<expand>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
</path>
</expand>
<select />
@@ -536,7 +325,7 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
+ <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
<created>1565160110910</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
@@ -547,28 +336,7 @@
<workItem from="1565259513116" duration="148000" />
<workItem from="1565311988064" duration="7176000" />
<workItem from="1565328536669" duration="797000" />
- <workItem from="1565345715376" duration="452000" />
- <workItem from="1565570424829" duration="11663000" />
- <workItem from="1565587737758" duration="12961000" />
- <workItem from="1565657307503" duration="115000" />
- <workItem from="1565657439247" duration="2447000" />
- <workItem from="1565662229227" duration="20296000" />
- <workItem from="1565691345079" duration="6000" />
- <workItem from="1565743087352" duration="10121000" />
- <workItem from="1565760941070" duration="6738000" />
- <workItem from="1565768341327" duration="2970000" />
- <workItem from="1565771864886" duration="599000" />
- <workItem from="1565772469694" duration="23000" />
- <workItem from="1565772518459" duration="4348000" />
- <workItem from="1565829438280" duration="3502000" />
- <workItem from="1565832950552" duration="86000" />
- <workItem from="1565833039573" duration="288000" />
- <workItem from="1565833342181" duration="13946000" />
- <workItem from="1565936336169" duration="3845000" />
- <workItem from="1565941296716" duration="6217000" />
- <workItem from="1566175534262" duration="11146000" />
- <workItem from="1566433893313" duration="21834000" />
- <workItem from="1566463230092" duration="4987000" />
+ <workItem from="1566803530593" duration="266000" />
</task>
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
@@ -591,144 +359,47 @@
<option name="project" value="LOCAL" />
<updated>1565259481656</updated>
</task>
- <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml">
- <created>1565342188814</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1565342188814</updated>
- </task>
- <task id="LOCAL-00005" summary="添加userWarehouse">
- <created>1565571202923</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1565571202923</updated>
- </task>
- <task id="LOCAL-00006" summary="添加containerCapacity">
- <created>1565578920011</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1565578920011</updated>
- </task>
- <task id="LOCAL-00007" summary="添加物料页面">
- <created>1565593159103</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1565593159103</updated>
- </task>
- <task id="LOCAL-00008" summary="添加商品详情">
- <created>1565598117104</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1565598117104</updated>
- </task>
- <task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位">
- <created>1565659672152</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1565659672152</updated>
- </task>
- <task id="LOCAL-00010" summary="添加task实体类">
- <created>1565665525508</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1565665525508</updated>
- </task>
- <task id="LOCAL-00011" summary="添加商品、商品详情页面">
- <created>1565686619774</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1565686619774</updated>
- </task>
- <task id="LOCAL-00012" summary="添加承运商">
- <created>1565745258070</created>
- <option name="number" value="00012" />
- <option name="presentableId" value="LOCAL-00012" />
- <option name="project" value="LOCAL" />
- <updated>1565745258070</updated>
- </task>
- <task id="LOCAL-00013" summary="添加物料导入、导出模板，添加Excel导入导出配置文件">
- <created>1565833218584</created>
- <option name="number" value="00013" />
- <option name="presentableId" value="LOCAL-00013" />
- <option name="project" value="LOCAL" />
- <updated>1565833218584</updated>
- </task>
- <task id="LOCAL-00014" summary="添加仓库配置">
- <created>1566176469173</created>
- <option name="number" value="00014" />
- <option name="presentableId" value="LOCAL-00014" />
- <option name="project" value="LOCAL" />
- <updated>1566176469173</updated>
- </task>
- <task id="LOCAL-00015" summary="上架任务查询">
- <created>1566439482539</created>
- <option name="number" value="00015" />
- <option name="presentableId" value="LOCAL-00015" />
- <option name="project" value="LOCAL" />
- <updated>1566439482539</updated>
- </task>
- <option name="localTasksCounter" value="16" />
+ <option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="38616000" />
- </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>
+ <option name="totallyTimeSpent" value="266000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
- <editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.37533513" />
- <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 id="Designer" />
+ <window_info id="Image Layers" />
+ <window_info id="Capture Tool" />
+ <window_info id="UI Designer" />
+ <window_info id="Favorites" side_tool="true" />
+ <window_info id="Web" side_tool="true" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info anchor="bottom" id="Spring" />
+ <window_info anchor="bottom" id="Terminal" />
+ <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Event Log" side_tool="true" />
+ <window_info anchor="bottom" id="Java Enterprise" />
+ <window_info anchor="bottom" id="Database Changes" />
+ <window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Message" order="0" />
- <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
+ <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<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.3275488" />
- <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
- <window_info anchor="bottom" id="Version Control" order="8" weight="0.059490085" />
- <window_info anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" weight="0.09206799" />
- <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
- <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
- <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" visible="true" weight="0.16005665" />
- <window_info anchor="bottom" id="MyBatis Log" order="15" />
- <window_info anchor="bottom" id="Terminal" order="16" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="right" id="Maven" weight="0.3297587" />
+ <window_info anchor="right" id="Palette" />
+ <window_info anchor="right" id="Capture Analysis" />
+ <window_info anchor="right" id="Database" />
+ <window_info anchor="right" id="Palette	" />
+ <window_info anchor="right" id="Theme Preview" />
+ <window_info anchor="right" id="Bean Validation" />
<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="Maven" order="4" />
- <window_info anchor="right" id="Bean Validation" order="5" />
- <window_info anchor="right" id="Database" order="6" />
- <window_info anchor="right" id="Palette	" order="7" />
- <window_info anchor="right" id="Capture Analysis" order="8" />
- <window_info anchor="right" id="Theme Preview" order="9" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -746,14 +417,7 @@
<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>
@@ -778,399 +442,39 @@
<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="库存状态搜索" />
- <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>
- <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" />
- </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>
- </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>
+ <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="232">
- <caret line="26" column="42" selection-start-line="26" selection-start-column="42" selection-end-line="26" selection-end-column="42" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="209">
- <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
- </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="76">
- <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/resources/mybatis/task/TaskHeaderMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="48">
- <caret line="3" column="30" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="30" />
- </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="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-114">
- <caret line="38" selection-start-line="38" selection-end-line="41" selection-end-column="44" />
- </state>
- </provider>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+ <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="226">
- <caret line="92" column="12" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="12" />
+ <state relative-caret-position="409">
+ <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
</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="57">
- <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="38">
- <caret line="61" column="49" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="49" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="145">
- <caret line="472" selection-start-line="472" selection-end-line="472" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="965">
- <caret line="69" column="29" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="29" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-332">
- <caret line="114" column="27" selection-start-line="114" selection-start-column="23" selection-end-line="114" selection-end-column="27" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="266">
- <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="52" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomDetailController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="304">
- <caret line="58" column="80" lean-forward="true" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="80" />
- </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="-1435">
- <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="161">
- <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/mapper/DictTypeMapper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="161">
- <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictTypeServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="199">
- <caret line="52" column="41" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictTypeService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="161">
- <caret line="28" column="26" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="19">
- <caret line="141" column="36" selection-start-line="141" selection-start-column="32" selection-end-line="141" selection-end-column="36" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/DictTypeMapper.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="931">
- <caret line="49" column="43" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="43" />
- </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="1653">
- <caret line="87" column="31" selection-start-line="87" selection-start-column="23" selection-end-line="87" selection-end-column="31" />
- </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="243">
- <caret line="144" column="55" selection-start-line="144" selection-start-column="55" selection-end-line="144" selection-end-column="55" />
- </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="153">
- <caret line="218" column="15" selection-start-line="218" selection-start-column="12" selection-end-line="218" selection-end-column="15" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="67">
- <caret line="102" selection-start-line="102" selection-end-line="102" />
+ <state relative-caret-position="152">
+ <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
</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="248">
- <caret line="43" column="123" lean-forward="true" selection-start-line="43" selection-start-column="123" selection-end-line="43" selection-end-column="123" />
+ <state relative-caret-position="-513">
<folding>
<element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
- </folding>
- </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/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="40">
- <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" />
- <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="178">
- <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
- </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="213">
- <caret line="119" column="12" selection-start-line="119" selection-start-column="12" selection-end-line="119" selection-end-column="12" />
- </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="1167">
- <caret line="87" column="26" lean-forward="true" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
- </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">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-7">
- <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
- </state>
- </provider>
- </entry>
- <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/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="428">
- <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
- </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" />
- </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">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="40">
- <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
- </state>
- </provider>
- </entry>
- <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/controller/CycleCountDetailController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-244">
- <caret line="13" column="49" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="100">
- <caret line="31" column="40" lean-forward="true" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
- <folding>
- <element signature="e#0#15820#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="200">
- <caret line="10" selection-start-line="10" selection-end-line="10" />
- </state>
- </provider>
- </entry>
- <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/task/taskHeader/service/TaskHeaderServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1340">
- <caret line="67" column="5" lean-forward="true" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
- <folding>
- <element signature="e#0#16496#0" expanded="true" />
- </folding>
+ <state relative-caret-position="-173">
+ <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
</state>
</provider>
</entry>
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java b/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
index 9ecd34b..f58ece4 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.aspectj.lang.annotation.Log;
import com.huaheng.framework.aspectj.lang.constant.BusinessType;
import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.framework.web.page.PageDomain;
import com.huaheng.framework.web.page.TableDataInfo;
import com.huaheng.framework.web.page.TableSupport;
@@ -50,6 +52,7 @@ public class TaskHeaderController extends BaseController {
+
/**
* 查询任务列表
*/
@@ -57,7 +60,8 @@ public class TaskHeaderController extends BaseController {
@Log(title = "任务-上架任务", operating = "查看任务列表", action = BusinessType.GRANT)
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(TaskHeader taskHeader,@ApiParam(name="InternalTaskType",value="类型") String InternalTaskType) {
+ public TableDataInfo list(TaskHeader taskHeader,@ApiParam(name="InternalTaskType",value="类型") String InternalTaskType,
+ @ApiParam(name="createdBegin",value="类型") String createdBegin,@ApiParam(name="createdEnd",value="类型") String createdEnd) {
LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
.in(TaskHeader::getCompanyCode,ShiroUtils.getCompanyCodeList())
@@ -65,7 +69,10 @@ public class TaskHeaderController extends BaseController {
.eq(StringUtils.isNotEmpty(taskHeader.getInternalTaskType()),TaskHeader::getInternalTaskType,taskHeader.getInternalTaskType())
.eq(StringUtils.isNotNull(taskHeader.getId()),TaskHeader::getId,taskHeader.getId())
.eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()),TaskHeader::getContainerCode,taskHeader.getContainerCode())
- .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode());
+ .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode())
+ .gt(StringUtils.isNotEmpty(createdBegin),TaskHeader::getCreated,createdBegin)
+ .lt(StringUtils.isNotEmpty(createdEnd),TaskHeader::getCreated,createdEnd);
+
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
@@ -83,5 +90,21 @@ public class TaskHeaderController extends BaseController {
}
+ /**
+ * 下发任务
+ */
+ @RequiresPermissions("task:task:execute")
+ @Log(title = "任务-任务管理", operating = "下发立库任务", action = BusinessType.UPDATE)
+ @PostMapping( "/execute")
+ @ResponseBody
+ public AjaxResult execute(String taskId)
+ {
+ if (StringUtils.isEmpty(taskId))
+ return AjaxResult.error("taskId不能为空");
+ AjaxResult ajaxResult = taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId));
+ return ajaxResult;
+ }
+
+
}
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
index 9dbfd76..a041a6e 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
@@ -9,4 +9,6 @@ public interface TaskHeaderService extends IService<TaskHeader>{
AjaxResult createTaskFromShipmentContainers(ShipmentTaskCreateModel shipmentTaskCreateModel) ;
+ AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds);
+
}
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index 610bc88..9a78470 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -1,7 +1,9 @@
package com.huaheng.pc.task.taskHeader.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.DataUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.config.location.domain.Location;
@@ -13,13 +15,17 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainer
import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskDetail.mapper.TaskDetailMapper;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
+import com.sun.jmx.snmp.tasks.Task;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
@@ -39,6 +45,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
private InventoryDetailService inventoryDetailService;
@Autowired
private TaskDetailService taskDetailService;
+ @Autowired
+ private TaskHeaderService taskHeaderService;
/**
* 生成出库任务
@@ -149,4 +157,63 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return AjaxResult.success(task.getId());
}
+
+ @Override
+ public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) {
+ TaskHeader task=null;
+ for(Integer taskId:taskIds){
+ task = taskHeaderService.getById(taskId);
+ if(task.getStatus() > 9){
+ return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止");
+ }
+ //修改任务头表
+ task.setStatus(10);
+ task.setStartPickDateTime(new Date()); //生成时间
+ task.setLastUpdated(new Date());
+ task.setLastUpdatedBy(ShiroUtils.getLoginName());
+ LambdaUpdateWrapper<TaskHeader> HeaderUpdateWrapper=Wrappers.lambdaUpdate();
+ HeaderUpdateWrapper.eq(TaskHeader::getId,taskId);
+ taskHeaderService.update(task,HeaderUpdateWrapper);
+ //修改任务明细状态
+ TaskDetail record = new TaskDetail();
+ record.setStatus(10);
+ record.setLastUpdated(new Date());
+ record.setLastUpdatedBy(ShiroUtils.getLoginName());
+ LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper=Wrappers.lambdaUpdate();
+ lambdaUpdateWrapper.eq(TaskDetail::getTaskId,task.getId());
+ taskDetailService.update(record,lambdaUpdateWrapper);
+
+
+// if (task.getInternalTaskType().equals("100"))
+// {
+// List<Map<String, Object>> maps = taskDetailService.selectListMapByEqual("billId, billDetailId", condition);
+// for (Map<String, Object> item : maps){
+// Integer billDetailId = DataUtils.getInteger(item.get("billDetailId"));
+// receiptHeaderService.updateDetailStatus(billDetailId, (short)300);
+// }
+// maps.stream().map(X -> X.get("billId")).distinct().forEach(X -> receiptHeaderService.receiptStatusUpdate(DataUtils.getInteger(X), (short)300));
+// }
+// //盘点单执行
+// if(task.getType() == 700){
+// CyclecountDetail cyclecountDetai = cyclecountDetailService.selectEntityById(
+// task.getAllocationHeadId());
+// cyclecountDetai.setStatus(10);
+// cyclecountDetailService.updateByModel(cyclecountDetai);
+// }
+//// //如果是单排人工库，那么出入库都是先完成，在下发AGV任务
+//// if (task.getType().intValue() == 300 || task.getType().intValue() == 600) {
+//// if (task.getSourceLocation().startsWith("L03") == false ) {
+//// taskAgvService.createTaskAgv(task);
+//// }
+//// }
+//// else {
+//// taskAgvService.createTaskAgv(task);
+//// }
+// //任务类型是出库，那就完成任务在叫agv
+// if (task.getType().intValue() == 100 || task.getType().intValue() == 500) {
+// taskAgvService.createTaskAgv(task);
+// }
+ }
+ return AjaxResult.success("下发任务成功",task);
+ }
}
diff --git a/src/main/resources/templates/task/taskHeader/taskHeader.html b/src/main/resources/templates/task/taskHeader/taskHeader.html
index c0cd28d..2a8c3c9 100644
--- a/src/main/resources/templates/task/taskHeader/taskHeader.html
+++ b/src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -36,12 +36,12 @@
</li>
<li class="time" style="height: 30px">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
- 任务类型：<input type="hidden" name="internalTaskType" th:value="${InternalTaskType}"/>
+ <input type="hidden" name="internalTaskType" th:value="${InternalTaskType}"/>
</li>
<!--<li>-->
@@ -228,20 +228,15 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
- if (row.lastStatus < 10) {
- if(row.zoneCode != "AGV"){
- actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
- }
+ if (row.status < 10) {
+ actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
- if(row.zoneCode != "AGV"){
actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
- }
- }
- if(row.lastStatus < 10 && row.zoneCode == "AGV"){
- actions.push('<a style="background-color: #f59e00;border: #f59e00" class="btn btn-primary btn-xs ' + agvFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>AGV完成</a>');
}
+ if (row.status > 10) {
+ actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+ }
return actions.join('');
}
}
@@ -287,11 +282,6 @@
title : '单据编码',
},
{
- field : 'allocationId',
- title : '容器物料表ID' ,
- sortable: true
- },
- {
field : 'materialCode',
title : '存货编码',
sortable: true
@@ -311,12 +301,12 @@
sortable:true
},
{
- field : 'sourceLocation',
+ field : 'fromLocation',
title : '源库位',
sortable:true
},
{
- field : 'destinationLocation',
+ field : 'toLocation',
title : '目的库位',
sortable:true
},
@@ -333,8 +323,8 @@
}
},
{
- field : 'endTime',
- title : '子任务完成时间' ,
+ field : 'created',
+ title : '创建时间' ,
visible:false,
sortable:true
},