diff --git a/.idea/WMSV1.iml b/.idea/WMSV1.iml
deleted file mode 100644
index 88aff5d..0000000
--- a/.idea/WMSV1.iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- <sourceRoots>
- <root url="file://$MODULE_DIR$/src/main/java" />
- <root url="file://$MODULE_DIR$/src/main/resources" />
- </sourceRoots>
- </configuration>
- </facet>
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5429242..3370385 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,118 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
- <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/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
+ <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" 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/addGoods.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/addGoods.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/main/resources/templates/inventory/cyclecountDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/report.html" 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" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" 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/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="false" />
- <option name="GROUP_DATA_SOURCES" value="true" />
- <option name="GROUP_SCHEMA" value="true" />
- <option name="GROUP_CONTENTS" value="false" />
- <option name="SORT_POSITIONED" value="false" />
- <option name="SHOW_EMPTY_GROUPS" value="false" />
- <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
- <option name="HIDDEN_KINDS">
- <set />
- </option>
- <expand>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
- <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
- </path>
- </expand>
- <select />
- </component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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/task/taskHeader/controller/TaskHeaderController.java">
+ <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="639">
- <caret line="85" selection-start-line="85" selection-end-line="85" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- <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 relative-caret-position="163">
+ <caret line="46" column="36" lean-forward="true" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
+ <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="152">
- <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
+ <state relative-caret-position="327">
+ <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
+ <file pinned="false" current-in-tab="false">
+ <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="72">
- <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
- <state 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 relative-caret-position="20">
+ <caret line="57" column="17" lean-forward="true" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-513">
+ <state relative-caret-position="186">
+ <caret line="627" column="34" selection-start-line="627" selection-start-column="34" selection-end-line="627" selection-end-column="34" />
<folding>
- <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
+ <element signature="e#2532#2538#0" expanded="true" />
+ <element signature="e#12645#13357#0" />
+ <element signature="e#14470#15250#0" />
+ <element signature="e#15294#16280#0" />
+ <element signature="e#16281#17279#0" />
+ <element signature="e#17284#17312#0" />
</folding>
</state>
</provider>
@@ -120,69 +64,20 @@
</file>
</leaf>
</component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="Class" />
- </list>
- </option>
- </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="RECENT_BRANCH_BY_REPOSITORY">
- <map>
- <entry key="$PROJECT_DIR$" value="master" />
- </map>
- </option>
- <option name="RESET_MODE" value="HARD" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
- <option value="$PROJECT_DIR$/pom.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/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/service/CycleCountDetailServiceImpl.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" />
</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>
@@ -202,11 +97,11 @@
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="470" />
- <option name="width" value="980" />
- <option name="height" value="1030" />
+ <option name="x" value="-9" />
+ <option name="y" value="-9" />
+ <option name="width" value="1938" />
+ <option name="height" value="1048" />
</component>
- <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
@@ -215,6 +110,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -326,46 +223,7 @@
<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="mapper" 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" />
@@ -378,31 +236,6 @@
<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="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="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="inventoryDetail" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -410,19 +243,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" />
- <item name="inventoryDetail" 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="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -451,7 +271,6 @@
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="inventory" type="462c0819:PsiDirectoryNode" />
<item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -460,8 +279,6 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="task" type="462c0819:PsiDirectoryNode" />
- <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
<item name="inventory" type="462c0819:PsiDirectoryNode" />
<item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
</path>
@@ -475,49 +292,18 @@
<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" />
- </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
- <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
- <property name="DatabaseDriversLRU" value="mysql" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="aspect.path.notification.shown" value="true" />
- <property name="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="settings.editor.selected.configurable" value="preferences.pluginManager" />
- </component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
- <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
- </key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -533,17 +319,7 @@
</component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="huaheng" />
- <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
- <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="WMSV1" />
+ <module name="wms2" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
<method v="2">
@@ -551,117 +327,38 @@
</method>
</configuration>
</component>
- <component name="ServiceViewManager">
- <option name="allServicesViewState">
- <serviceView>
- <treeState>
- <expand>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- </expand>
- <select />
- </treeState>
- </serviceView>
- </option>
- </component>
<component name="SvnConfiguration">
<configuration />
</component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
- <created>1565160110910</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1565160110910</updated>
- <workItem from="1565160112236" duration="11971000" />
- <workItem from="1565224833241" duration="14642000" />
- <workItem from="1565242153135" duration="1476000" />
- <workItem from="1565259513116" duration="148000" />
- <workItem from="1565311988064" duration="7176000" />
- <workItem from="1565328536669" duration="797000" />
- <workItem from="1566803530593" duration="266000" />
- </task>
- <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
- <created>1565226427512</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1565226427512</updated>
- </task>
- <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面">
- <created>1565256884822</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1565256884822</updated>
- </task>
- <task id="LOCAL-00003" summary="修改库区service">
- <created>1565259481656</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1565259481656</updated>
- </task>
- <option name="localTasksCounter" value="4" />
- <servers />
- </component>
- <component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="266000" />
- </component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<layout>
+ <window_info id="Web" side_tool="true" />
<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 content_ui="combo" id="Project" order="0" visible="true" weight="0.2855228" />
<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 content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.1883378" />
- <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
- <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
- <window_info id="Designer" order="3" />
- <window_info id="UI Designer" order="4" />
- <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
- <window_info id="Image Layers" order="6" />
- <window_info id="Capture Tool" order="7" />
+ <window_info anchor="bottom" id="Java Enterprise" />
+ <window_info anchor="bottom" id="Spring" />
+ <window_info anchor="bottom" id="MyBatis Log" />
+ <window_info anchor="bottom" id="Event Log" side_tool="true" />
+ <window_info anchor="bottom" id="Messages" weight="0.12606232" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.08073654" />
<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.49433428" />
- <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" />
- <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
- <window_info anchor="bottom" id="Database Changes" order="11" weight="0.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" 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="Maven" weight="0.097184986" />
<window_info anchor="right" id="Bean Validation" />
+ <window_info anchor="right" id="Palette	" />
+ <window_info anchor="right" id="Database" />
<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" />
@@ -670,295 +367,70 @@
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <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" />
- </State>
- </value>
- </entry>
- </map>
- </option>
- <option name="RECENT_FILTERS">
- <map>
- <entry key="Branch">
- <value>
- <list />
- </value>
- </entry>
- <entry key="User">
- <value>
- <list />
- </value>
- </entry>
- </map>
- </option>
- </component>
- <component name="VcsManagerConfiguration">
- <MESSAGE value="添加库位、库位类型增删改查接口" />
- <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
- <MESSAGE value="修改库区service" />
- <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
- <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
- <MESSAGE value="添加userWarehouse" />
- <MESSAGE value="添加containerCapacity" />
- <MESSAGE value="添加物料页面" />
- <MESSAGE value="添加商品详情" />
- <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
- <MESSAGE value="添加task实体类" />
- <MESSAGE value="添加商品、商品详情页面" />
- <MESSAGE value="添加承运商" />
- <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
- <MESSAGE value="添加仓库配置" />
- <MESSAGE value="代码错误，库存导包" />
- <MESSAGE value="代码错误，导包" />
- <MESSAGE value="上架任务查询" />
- <MESSAGE value="库存交易搜索" />
- <MESSAGE value="库存状态搜索" />
- <MESSAGE value="盘点" />
- <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>
- </component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor" />
</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="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="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="-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/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/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/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">
+ <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml">
<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/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/service/CycleCountDetailServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="100">
- <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
+ <state relative-caret-position="287">
+ <caret line="607" column="5" lean-forward="true" selection-start-line="607" selection-start-column="5" selection-end-line="607" selection-end-column="5" />
<folding>
- <element signature="e#0#15820#0" expanded="true" />
+ <element signature="e#11035#11036#0" expanded="true" />
+ <element signature="e#11064#11065#0" expanded="true" />
+ <element signature="e#17291#17292#0" expanded="true" />
+ <element signature="e#17330#17331#0" expanded="true" />
+ <element signature="e#17395#17396#0" expanded="true" />
+ <element signature="e#17451#17452#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="764">
- <caret line="67" column="5" 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>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
+ <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="120">
- <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="176">
+ <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
+ <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="70">
- <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
+ <state relative-caret-position="327">
+ <caret line="76" column="59" selection-start-line="76" selection-start-column="59" selection-end-line="76" selection-end-column="59" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
+ <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="-173">
- <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
- <state relative-caret-position="639">
- <caret line="85" selection-start-line="85" selection-end-line="85" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="163">
+ <caret line="46" column="36" lean-forward="true" selection-start-line="46" selection-start-column="36" selection-end-line="53" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="531">
- <caret line="91" selection-start-line="91" selection-end-line="91" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="20">
+ <caret line="57" column="17" lean-forward="true" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4480">
- <caret line="231" column="4" selection-start-line="231" selection-start-column="4" selection-end-line="231" selection-end-column="4" />
+ <state relative-caret-position="186">
+ <caret line="627" column="34" selection-start-line="627" selection-start-column="34" selection-end-line="627" selection-end-column="34" />
<folding>
- <element signature="e#15677#15678#0" expanded="true" />
- <element signature="e#15706#15707#0" expanded="true" />
- <element signature="e#15751#15752#0" expanded="true" />
- <element signature="e#15787#15788#0" expanded="true" />
+ <element signature="e#2532#2538#0" expanded="true" />
+ <element signature="e#12645#13357#0" />
+ <element signature="e#14470#15250#0" />
+ <element signature="e#15294#16280#0" />
+ <element signature="e#16281#17279#0" />
+ <element signature="e#17284#17312#0" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="303">
- <caret line="103" column="20" lean-forward="true" selection-start-line="103" selection-start-column="20" selection-end-line="103" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="72">
- <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
- </state>
- </provider>
- </entry>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
index f93c7d6..e3ef4b8 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
@@ -57,16 +57,32 @@ public class CycleCountDetailController extends BaseController {
@Log(title = "库存-盘点",operating = "查看盘点明细", action = BusinessType.GRANT)
@ResponseBody
public TableDataInfo list(CycleCountDetail cycleCountDetail, String createdBegin, String createdEnd) {
+
LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
- lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
+ lambdaQueryWrapper.ge(
+ StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
.le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围
- .eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
-
-
+ //.eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
+ .eq(cycleCountDetail.getCycleCountHeadId() != null ,CycleCountDetail::getCycleCountHeadId,cycleCountDetail.getCycleCountHeadId())//盘点主单
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompanyCode()),CycleCountDetail::getCompanyCode, cycleCountDetail.getCompanyCode())//货主
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getLocationCode()), CycleCountDetail::getLocationCode, cycleCountDetail.getLocationCode()) //库位
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getContainerCode()), CycleCountDetail::getContainerCode,cycleCountDetail.getContainerCode()) //容器
+ .eq(cycleCountDetail.getInventoryDetailId() != null, CycleCountDetail::getInventoryDetailId, cycleCountDetail.getInventoryDetailId())//库存明细ID
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getMaterialCode()), CycleCountDetail::getMaterialCode,cycleCountDetail.getMaterialCode())//物料编码
+ .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialName()), CycleCountDetail::getMaterialName, cycleCountDetail.getMaterialName())//物料名称
+ .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialSpec()), CycleCountDetail::getMaterialSpec,cycleCountDetail.getMaterialSpec())//物料规格
+ .eq(cycleCountDetail.getTaskHeaderId() != null, CycleCountDetail::getTaskHeaderId, cycleCountDetail.getTaskHeaderId())//任务主表
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getInventorySts()), CycleCountDetail::getInventorySts,cycleCountDetail.getInventorySts())//库存状态
+ .eq(cycleCountDetail.getEnableStatus() != null, CycleCountDetail::getEnableStatus, cycleCountDetail.getEnableStatus())//明细状态
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getBatch()),CycleCountDetail::getBatch,cycleCountDetail.getBatch())//批次
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getLot()),CycleCountDetail::getLot,cycleCountDetail.getLot())//批号
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getProjectNo()),CycleCountDetail::getProjectNo,cycleCountDetail.getProjectNo())//项目号
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getCreatedBy()),CycleCountDetail::getCreatedBy,cycleCountDetail.getCreatedBy())//创建人
+ .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompletedBy()), CycleCountDetail::getCompletedBy,cycleCountDetail.getCompletedBy())//完成人
.orderByDesc(CycleCountDetail::getId);
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
index d4c407a..d770af4 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
@@ -132,11 +132,11 @@ public class CycleCountDetail implements Serializable {
private Long countedQty;
/**
- * 调整数量
+ * 差异数量
*/
- @TableField(value = "adjustQty")
- @ApiModelProperty(value="调整数量")
- private Long adjustQty;
+ @TableField(value = "gapQty")
+ @ApiModelProperty(value="差异数量")
+ private Long gapQty;
/**
* 失败原因
@@ -278,83 +278,19 @@ public class CycleCountDetail implements Serializable {
@ApiModelProperty(value="项目号")
private String projectNo;
- private static final long serialVersionUID = 1L;
-
- public static final String COL_ID = "id";
-
- public static final String COL_COUNTID = "countId";
-
- public static final String COL_ROUND = "round";
-
- public static final String COL_TASKHEADERID = "taskHeaderId";
-
- public static final String COL_TASKDETAILID = "taskDetailId";
-
- public static final String COL_WAREHOUSECODE = "warehouseCode";
-
- public static final String COL_INVENTORYDETAILID = "inventoryDetailId";
-
- public static final String COL_LOCATIONCODE = "locationCode";
-
- public static final String COL_CONTAINERCODE = "containerCode";
-
- public static final String COL_MATERIALCODE = "materialCode";
-
- public static final String COL_MATERIALNAME = "materialName";
-
- public static final String COL_MATERIALSPEC = "materialSpec";
-
- public static final String COL_MATERIALUNIT = "materialUnit";
-
- public static final String COL_COMPANYCODE = "companyCode";
-
- public static final String COL_INVENTORYSTS = "inventorySts";
-
- public static final String COL_SYSTEMQTY = "systemQty";
-
- public static final String COL_COUNTEDQTY = "countedQty";
-
- public static final String COL_ADJUSTQTY = "adjustQty";
-
- public static final String COL_REJECTIONNOTE = "rejectionNote";
-
- public static final String COL_COUNTEDBY = "countedBy";
- public static final String COL_COUNTEDAT = "countedAt";
-
- public static final String COL_ASSIGNEDTO = "assignedTo";
-
- public static final String COL_ASSIGNEDAT = "assignedAt";
-
- public static final String COL_COMPLETEDBY = "completedBy";
-
- public static final String COL_COMPLETEDAT = "completedAt";
-
- public static final String COL_ENABLESTATUS = "enableStatus";
-
- public static final String COL_CREATED = "created";
-
- public static final String COL_CREATEDBY = "createdBy";
-
- public static final String COL_LASTUPDATED = "lastUpdated";
-
- public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
-
- public static final String COL_VERSION = "version";
-
- public static final String COL_USERDEF1 = "userDef1";
-
- public static final String COL_USERDEF2 = "userDef2";
+ /**
+ * 盘点主单号
+ * */
+ @TableField(value = "cycleCountHeadId")
+ @ApiModelProperty(value = "盘点主单号")
+ private Integer cycleCountHeadId;
- public static final String COL_USERDEF3 = "userDef3";
- public static final String COL_PROCESSSTAMP = "processStamp";
- public static final String COL_BATCH = "batch";
- public static final String COL_LOT = "lot";
+ private static final long serialVersionUID = 1L;
- public static final String COL_PROJECTNO = "projectNo";
/**
* 获取ID
@@ -665,19 +601,14 @@ public class CycleCountDetail implements Serializable {
/**
* 获取调整数量
*
- * @return adjustQty - 调整数量
+ * @return gapQty- 调整数量
*/
- public Long getAdjustQty() {
- return adjustQty;
+ public Long getGapQty() {
+ return gapQty;
}
- /**
- * 设置调整数量
- *
- * @param adjustQty 调整数量
- */
- public void setAdjustQty(Long adjustQty) {
- this.adjustQty = adjustQty;
+ public void setGapQty(Long gapQty) {
+ this.gapQty = gapQty;
}
/**
@@ -1039,4 +970,12 @@ public class CycleCountDetail implements Serializable {
public void setProjectNo(String projectNo) {
this.projectNo = projectNo;
}
+
+ public Integer getCycleCountHeadId() {
+ return cycleCountHeadId;
+ }
+
+ public void setCycleCountHeadId(Integer cycleCountHeadId) {
+ this.cycleCountHeadId = cycleCountHeadId;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java b/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
index c092147..9f4b7ed 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
@@ -68,10 +68,13 @@ public class CycleCountHeaderController extends BaseController {
lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountHeader::getCreated, createdBegin)
.le(StringUtils.isNotEmpty(createdEnd), CycleCountHeader::getCreated, createdEnd)//创建时间范围
- .eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
-
-
-
+ //.eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
+ .eq(StringUtils.isNotEmpty(cycleCountHeader.getSourceCode()),CycleCountHeader::getSourceCode,cycleCountHeader.getSourceCode())//源盘点单号
+ .eq(cycleCountHeader.getId() != null, CycleCountHeader::getId,cycleCountHeader.getId())//ID
+ .eq(StringUtils.isNotEmpty(cycleCountHeader.getMasterCode()),CycleCountHeader::getMasterCode, cycleCountHeader.getMasterCode())//盘点主表编号
+ .eq(cycleCountHeader.getCountOrderId() != null, CycleCountHeader::getCountOrderId, cycleCountHeader.getCountOrderId())//原始盘点ID
+ .eq(cycleCountHeader.getStatusCyc() != null, CycleCountHeader::getStatusCyc, cycleCountHeader.getStatusCyc()) //盘点单状态
+ .eq(cycleCountHeader.getCountType() != null ,CycleCountHeader::getCountType, cycleCountHeader.getCountType())//盘点类型
.orderByDesc(CycleCountHeader::getId);
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
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 3ea50fc..eaf6233 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
@@ -108,7 +108,7 @@ public class TaskHeaderController extends BaseController {
/**
* 完成任务
*/
- @RequiresPermissions("task:task:complete")
+ @RequiresPermissions("task:taskHeader:complete")
@Log(title = "任务-任务管理", operating = "PC完成立库任务", action = BusinessType.UPDATE)
@PostMapping( "/completeTaskByWMS")
@ResponseBody
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 102e169..8abcd35 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
@@ -12,7 +12,10 @@ import com.huaheng.pc.config.location.domain.Location;
import com.huaheng.pc.config.location.service.LocationService;
import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
+import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
+import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
@@ -54,6 +57,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
@Autowired
private TaskHeaderService taskHeaderService;
+ @Autowired
+ private InventoryHeaderService inventoryHeaderService;
+
+ @Autowired
+ private InventoryTransactionService inventoryTransactionService;
+
@Resource
private TaskHeaderMapper taskHeaderMapper;
@@ -239,7 +248,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new ServiceException("任务(" + taskId + ")任务已经是完成的！");
}
//如果没有库位不能完成
- if (StringUtils.isEmpty(task.getPickingCartPos())) {
+ if (StringUtils.isEmpty(task.getLocationCode())) {
throw new ServiceException("任务" + taskId + "没有库位，执行中止");
}
this.completeTask(task);
@@ -286,83 +295,83 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
public AjaxResult completeReceiptTask(TaskHeader task) throws Exception {
// String LocationCode = task.getIsDoubleIn().intValue() == 0 ? task.getDestinationLocation() : task.getSecondDestinationLocation();
List<Map<String, Object>> taskReceiptContainerDetail =taskHeaderMapper.getReceiptTask(task.getId());
+ if (taskReceiptContainerDetail.size()<1){
+ return AjaxResult.success("未找到对应任务的入库单号!!!");
+ }
for (Map<String, Object> map : taskReceiptContainerDetail) {
//将未完成的任务数量更新到库存表
if (DataUtils.getInteger(map.get("status")) < 100) {
-// //更新库存表
-// BigDecimal inventoryQty = new BigDecimal("0");
-// Inventory condition = new Inventory();
-// condition.setWarehouseId(ShiroUtils.getWarehouseId());
-// condition.setLocationCode(LocationCode);
-// condition.setReceiptDetailId(DataUtils.getInteger(map.get("billDetailId")));
-// condition.setContainerCode(DataUtils.getString(map.get("containerCode")));
-// Inventory inventory = inventoryService.selectFirstEntity(condition);
-// if (inventory == null)
-// {
-// inventory = new Inventory();
-// inventory.setWarehouseId(DataUtils.getInteger(map.get("warehouseId")));
-// inventory.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
-// inventory.setLocationCode(LocationCode);
-// inventory.setContainerCode(DataUtils.getString(map.get("containerCode")));
-// inventory.setSourceCode(DataUtils.getString(map.get("sourceCode")));
-// inventory.setSourceLine(DataUtils.getString(map.get("sourceLine")));
-// inventory.setCompanyId(task.getCompanyId());
-// inventory.setCompanyCode(task.getCompanyCode());
-// inventory.setMaterialCode(DataUtils.getString(map.get("materialCode")));
-// inventory.setMaterialName(DataUtils.getString(map.get("materialName")));
-// inventory.setReceiptCode(DataUtils.getString(map.get("billCode")));
-// inventory.setReceiptId(DataUtils.getInteger(map.get("billId")));
-// inventory.setReceiptDetailId(DataUtils.getInteger(map.get("billDetailId")));
-// inventory.setBatch(DataUtils.getString(map.get("batch")));
-// inventory.setLot(DataUtils.getString(map.get("lot")));
-// inventory.setProject(DataUtils.getString(map.get("project")));
-// inventory.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
-// inventory.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
-// inventory.setStatus(DataUtils.getString((map.get("inventoryStatus"))));
-// inventory.setQty(DataUtils.getBigDecimal(map.get("qty")));
-// inventory.setCostPrice(DataUtils.getBigDecimal(map.get("price")));
-// inventory.setCreatedBy(ShiroUtils.getLoginName());
-// inventory.setLastUpdatedBy(ShiroUtils.getLoginName());
-// inventoryService.insert(inventory);
-// }
-// else
-// {
-// inventoryQty = inventory.getQty();
-// inventory.setQty(inventory.getQty().add(DataUtils.getBigDecimal(map.get("qty"))));
-// inventory.setLastUpdatedBy(ShiroUtils.getLoginName());
-// inventoryService.updateByModel(inventory);
-// }
-// //记录库存交易记录
-// InventoryTransaction inventoryTransaction = new InventoryTransaction();
-// inventoryTransaction.setType("receipt");
-// inventoryTransaction.setWarehouseId(DataUtils.getInteger(map.get("warehouseId")));
-// inventoryTransaction.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
-// inventoryTransaction.setCompanyId(task.getCompanyId());
-// inventoryTransaction.setCompanyCode(task.getCompanyCode());
-// inventoryTransaction.setLocationCode(LocationCode);
-// inventoryTransaction.setContainerCode(DataUtils.getString(map.get("containerCode")));
-// inventoryTransaction.setSourceCode(DataUtils.getString(map.get("sourceCode")));
-// inventoryTransaction.setSourceLine(DataUtils.getString(map.get("sourceLine")));
-// inventoryTransaction.setMaterialCode(DataUtils.getString(map.get("materialCode")));
-// inventoryTransaction.setMaterialName(DataUtils.getString(map.get("materialName")));
-// inventoryTransaction.setBillCode(DataUtils.getString(map.get("billCode")));
-// inventoryTransaction.setBillId(DataUtils.getInteger(map.get("billId")));
-// inventoryTransaction.setBillDetailId(DataUtils.getInteger(map.get("billDetailId")));
-// inventoryTransaction.setBatch(DataUtils.getString(map.get("batch")));
-// inventoryTransaction.setLot(DataUtils.getString(map.get("lot")));
-// inventoryTransaction.setProject(DataUtils.getString(map.get("project")));
-// inventoryTransaction.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
-// inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
-// inventoryTransaction.setStatus(DataUtils.getString((map.get("inventoryStatus"))));
-// inventoryTransaction.setQty(inventoryQty);
-// inventoryTransaction.setTaskQty(DataUtils.getBigDecimal(map.get("qty")));
-// inventoryTransaction.setCostPrice(DataUtils.getBigDecimal(map.get("price")));
-// //inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
-// inventoryTransaction.setCreated(null);
-// inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
-// inventoryTransaction.setLastUpdated(null);
-// inventoryTransaction.setLastUpdatedBy(ShiroUtils.getLoginName());
-// inventoryTransactionService.insert(inventoryTransaction);
+ LambdaQueryWrapper<InventoryDetail> inventory =Wrappers.lambdaQuery();
+ inventory.eq(InventoryDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
+ .eq(InventoryDetail::getLocationCode,task.getLocationCode())
+ .eq(InventoryDetail::getReceiptDetailId,DataUtils.getString(map.get("id")))
+ .eq(InventoryDetail::getContainerCode,DataUtils.getString(map.get("containerCode")));
+ InventoryDetail detail=inventoryDetailService.getOne(inventory);
+ if (detail == null)
+ {
+ //添加库存单
+ InventoryHeader header = new InventoryHeader();
+ header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
+ header.setCompanyCode(task.getCompanyCode());//货主
+ header.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
+ header.setTotalQty(DataUtils.getInteger(map.get("totalQty")));//总数量
+ header.setLocking(1);
+ header.setEnable(1);
+ header.setCreatedBy(ShiroUtils.getLoginName());
+ header.setCreated(new Date());
+ header.setLastUpdated(new Date());
+ inventoryHeaderService.save(header);
+ //库存明细添加
+ detail = new InventoryDetail();
+ detail.setInventoryHeaderId(header.getId());//库存头ID
+ detail.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库
+ detail.setCompanyCode(task.getCompanyCode());//货主
+ detail.setLocationCode(task.getLocationCode());//库位号
+ detail.setContainerCode(DataUtils.getString(map.get("containerCode")));//容器号
+ detail.setMaterialCode(DataUtils.getString(map.get("materialCode")));//物料号
+ detail.setMaterialName(DataUtils.getString(map.get("materialName")));//物料名称
+ detail.setMaterialSpec(DataUtils.getString(map.get("materialSpec")));//物料规格
+ detail.setReceiptCode(DataUtils.getString(map.get("receiptCode")));//入库单编码
+ detail.setReceiptDetailId(DataUtils.getInteger(map.get("id")));//入库单明细ID
+ detail.setBatch(DataUtils.getString(map.get("batch")));//批次
+ detail.setLot(DataUtils.getString(map.get("lot")));//批号
+ detail.setInventorySts(DataUtils.getString(map.get("inventorySts")));//库存状态
+ detail.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));//生产日期
+ detail.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));//失效日期
+ detail.setQty(DataUtils.getBigDecimal(map.get("qty")));//数量
+ detail.setTaskQty(DataUtils.getBigDecimal(map.get("taskQty")));
+ detail.setCreatedBy(ShiroUtils.getLoginName());//创建人
+ detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间
+ inventoryDetailService.save(detail);
+ }
+ else
+ {
+ detail.setQty(detail.getQty().add(DataUtils.getBigDecimal(map.get("qty"))));
+ detail.setLastUpdatedBy(ShiroUtils.getLoginName());
+ LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
+ lambdaUpdateWrapper.eq(InventoryDetail::getId,DataUtils.getInteger(map.get("id")));
+ inventoryDetailService.update(detail, lambdaUpdateWrapper);
+ }
+ //记录库存交易记录
+ InventoryTransaction inventoryTransaction = new InventoryTransaction();
+ inventoryTransaction.setTransactionType(10);
+ inventoryTransaction.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));
+ inventoryTransaction.setCompanyCode(task.getCompanyCode());
+ inventoryTransaction.setLocationCode(task.getLocationCode());
+ inventoryTransaction.setContainerCode(DataUtils.getString(map.get("containerCode")));
+ inventoryTransaction.setMaterialCode(DataUtils.getString(map.get("materialCode")));
+ inventoryTransaction.setMaterialName(DataUtils.getString(map.get("materialName")));
+ inventoryTransaction.setBillCode(DataUtils.getString(map.get("receiptCode")));
+ inventoryTransaction.setBillDetailId(DataUtils.getInteger(map.get("id")));
+ inventoryTransaction.setBatch(DataUtils.getString(map.get("batch")));
+ inventoryTransaction.setLot(DataUtils.getString(map.get("lot")));
+ inventoryTransaction.setManufactureDate(DataUtils.getDateTime(map.get("manufactureDate")));
+ inventoryTransaction.setExpirationDate(DataUtils.getDateTime(map.get("expirationDate")));
+ inventoryTransaction.setInventorySts(DataUtils.getString((map.get("inventorySts"))));
+ inventoryTransaction.setTaskQty(DataUtils.getInteger(map.get("taskQty")));
+ inventoryTransaction.setCreated(new Date());
+ inventoryTransaction.setCreatedBy(ShiroUtils.getLoginName());
+ inventoryTransactionService.save(inventoryTransaction);
// //修改任务明细的状态为完成
// TaskDetail taskDetail = new TaskDetail();
// taskDetail.setId(DataUtils.getInteger(map.get("taskDetailId")));
diff --git a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
index 28c3419..ebfbd71 100644
--- a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
+++ b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
@@ -6,48 +6,80 @@
<div class="row">
<div class="col-sm-12">
<div class="col-sm-12 select-info">
- <div class="select-list" th:object="${header}">
+ <div class="select-list">
<ul>
<li>
<form id="cycleHeader-form">
- 盘点单id：<input type="text" id="headId" name="headId" th:value="*{id}" readonly="readonly">
+ 盘点主ID：<input type="text" id="cycleCountHeadId" name="cycleCountHeadId" />
</form>
</li>
<li>
- 货主编码：<input id="companyCode" type="text" name="companyCode" th:value="*{companyCode}" readonly="readonly"/>
+ 货主编码：<input id="companyCode" type="text" name="companyCode" />
</li>
<li>
- 盘点单编码：<input id="code" type="text" name="code" th:value="*{code}" readonly="readonly"/>
+ 库位：<input id="locationCode" type="text" name="locationCode" />
</li>
<li>
- 源盘点单号：<input id="sourceCode" type="text" name="type" th:value="*{sourceCode}" readonly="readonly">
+ 容器：<input id="containerCode" type="text" name="containerCode" />
</li>
<li>
- <!--入库类型：<input type="text" name="sourceCode"/>-->
- 盘点类型：<input id="type" type="text" name="type" th:value="*{typeLabel}" readonly="readonly">
+ 库存明细ID：<input id = "inventoryDetailId" type="text" name="inventoryDetailId" />
</li>
<li>
- <!--头 状 态：<input type="text" name="firstStatus"/>-->
- 状态：<input id = "status" type="text" name="status" th:value="*{statusLabel}" readonly="readonly">
+ 物料编码：<input id="materialCode" type="text" name="materialCode" />
</li>
<li>
- 创建时间：<input id="created" type="text" name="created" th:value="*{created}" readonly="readonly">
-
+ 物料名称：<input id="materialName" type="text" name="materialName" />
</li>
<li>
- 创建人：<input id="createdBy" type="text" name="createdBy" th:value="*{createdBy}" readonly="readonly">
+ 物料规格：<input id="materialSpec" type="text" name="materialSpec" />
</li>
<li>
- 最后更新时间：<input id="lastUpdated" type="text" name="lastUpdated" th:value="*{lastUpdated}" readonly="readonly">
-
+ 任务主表：<input id="taskHeaderId" type="text" name="taskHeaderId" />
+ </li>
+ <li>
+ 库存状态：
+ <select name="inventorySts" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
+ <option value="">所有</option>
+ <option th:each="e : ${inventoryStatus}" th:text="${e['dictLabel']}"
+ th:value="${e['dictValue']}"></option>
+ </select>
+ </li>
+ <li>
+ 盘点明细状态：<select name="enableStatus"
+ th:with="lastStatus=${@dict.getType('cyclecountStatus')}">
+ <option value="">所有</option>
+ <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
+ th:value="${e['dictValue']}"></option>
+ </select>
+ </li>
+ <li>
+ 批次：<input id="batch" type="text" name="batch" />
+ </li>
+ <li>
+ 批号：<input id="lot" type="text" name="lot" />
+ </li>
+ <li>
+ 项目号：<input id="projectNo" type="text" name="projectNo" />
+ </li>
+ <li class="time">
+ <label>创建时间： </label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+ name="params[createdBegin]"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+ name="params[createdEnd]"/>
+ </li>
+ <li>
+ 创建人：<input id="createdBy" type="text" name="createdBy" />
+ </li>
+ <li>
+ 完成人：<input id="completedBy" type="text" name="completedBy"/>
</li>
<li>
- 最后更新人：<input id="lastUpdatedBy" type="text" name="lastUpdatedBy" th:value="*{lastUpdatedBy}" readonly="readonly">
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+ class="fa fa-search"></i> 搜索</a>
</li>
- <!--<li>-->
- <!--<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
- <!--class="fa fa-search"></i> 搜索</a>-->
- <!--</li>-->
</ul>
</div>
</div>
@@ -56,14 +88,6 @@
shiro:hasPermission="inventory:cycleCountDetail:add">
<i class="fa fa-plus"></i> 新增
</a>
- <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="comfirmAllWithNoGapQty()"
- shiro:hasPermission="inventoryHeader:cycleCountDetail:confirmAll">
- <i class="fa fa-vcard"></i> 全部无差异确认
- </a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="comfirmRemainWithNoGapQty()"
- shiro:hasPermission="inventoryHeader:cycleCountDetail:confirmRemain">
- <i class="fa fa-vcard"></i> 剩余无差异确认
- </a>-->
<a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
shiro:hasPermission="inventory:cyclecountDetail:cyclecountRepeat">
<i class="fa fa-vcard"></i> 差异复盘
@@ -89,10 +113,10 @@
var removeFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:remove')}]];
var confirmFlag=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:confirm')}]];
var createTaskFalg=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:createTask')}]];
- var prefix = ctx + "inventory/cyclecountDetail";
- var prefix_head = ctx + "inventory/cyclecountHeader";
+ var prefix = ctx + "inventory/cycleCountDetail";
+ var prefix_head = ctx + "inventory/cycleCountHeader";
var remove_url= prefix + "/remove";
- var datas = [[${@dict.getType('cyclecountDetailStatus')}]];
+ var datas = [[${@dict.getType('cyclecountStatus')}]];
var inventoryStatus=[[${@dict.getType('inventoryStatus')}]];
var created ;
@@ -115,63 +139,67 @@
},
{
field: 'id',
- title: 'id',
+ title: '明细ID',
sortable:true
},
{
- field: 'code',
- title: '盘点单编码',
- sortable:false
+ field: 'cycleCountHeadId',
+ title: '盘点主单ID',
+ },
+ {
+ field: 'warehouseCode',
+ title: '仓库',
+ },
+ {
+ field: 'countId',
+ title: '盘点内部号',
+ visible: false
+ },
+ {
+ field: 'round',
+ title: '盘点次数',
+ visible: false
+ },
+ {
+ field: 'taskHeaderId',
+ title: '任务ID',
+ visible: false
+ },
+ {
+ field: 'taskDetailId',
+ title: '任务明细ID',
+ visible: false
},
{
field: 'companyCode',
- title: '货主'
+ title: '货主',
+ visible: true
},
- // {
- // field: 'locationId',
- // title: '库位id'
- // },
{
field: 'locationCode',
title: '库位编码',
- sortable:true
},
{
field: 'containerCode',
title: '容器编号',
- sortable:true
+
},
- // {
- // field: 'materialId',
- // title: '物料Id'
- // },
- /*{
+ {
field: 'materialCode',
- title: '存货编码',
- sortable:true
- },*/
+ title: '物料编码',
+ },
{
field: 'materialName',
title: '物料名称',
- sortable:true
},
{
- field: 'materialSpecification',
+ field: 'materialSpec',
title: '物料规格',
- sortable:true
},
{
- field: 'receiptCode',
- title: '入库单编码'
+ field: 'materialUnit',
+ title: '物料单位',
},
- // {
- // field: 'receiptId',
- // title: '入库单id'
- // },
- // {
- // field: 'receiptDetailId',
- // title: '入库单明细id'
- // },
{
field: 'batch',
title: '批次',
@@ -183,25 +211,18 @@
sortable:true
},
{
- field: 'project',
+ field: 'projectNo',
title: '项目号',
sortable:true
},
+
{
- field: 'manufactureDate',
- title: '生产日期'
- },
- {
- field: 'expirationDate',
- title: '失效日期'
- },
- {
- field: 'inventoryStatus',
+ field: 'inventorySts',
title: '库存状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(inventoryStatus, value);
},
- sortable:true
+
},
{
field: 'systemQty',
@@ -216,6 +237,34 @@
field: 'gapQty'
},
{
+ field: 'rejectionNote',
+ title: '失败原因'
+ },
+ {
+ field: 'countedBy',
+ title: '盘点创建人'
+ },
+ {
+ field: 'countedAt',
+ title: '盘点创建日期'
+ },
+ {
+ field: 'assignedTo',
+ title: '指派用户'
+ },
+ {
+ field: 'assignedAt',
+ title: '指派时间'
+ },
+ {
+ field: 'completedBy',
+ title: '完成用户'
+ },
+ {
+ field: 'completedAt',
+ title: '完成时间'
+ },
+ {
field: 'created',
title: '创建时间'
},
@@ -232,11 +281,7 @@
title: '更新用户'
},
{
- field: 'fromSource',
- title: '来源'
- },
- {
- field: 'status',
+ field: 'enableStatus',
title: '盘点明细状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(datas, value);
@@ -244,9 +289,14 @@
sortable:true
},
{
- field: 'isCreateTask',
- title: '盘点任务'
+ field: 'processStamp',
+ title: '处理标记'
+ },
+ {
+ field: 'version',
+ title: '数据版本'
},
+
// {
// field: 'userDef1',
// title: '自定义字段1'
@@ -280,15 +330,15 @@
});
function update() {
- var url = location.search; //获取url中"?"符后的字串
+ let url = location.search; //获取url中"?"符后的字串
if (url.indexOf("?") != -1) { //判断是否有参数
- var str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
- strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
+ let str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
+ let strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
$.ajax({
url: prefix + "/list",
type:"post",
data:{
- code:strs[1]
+ cycleCountHeadId:strs[1]
},
success:function (res) {
$("#bootstrap-table").bootstrapTable('removeAll');
@@ -297,36 +347,27 @@
$("#bootstrap-table").bootstrapTable('insertRow', {index:i,row:res.data[i]});
}
}
- })
+ });
+ return false
}
$.ajax({
- url:prefix_head+ "/getHeader",
+ url: prefix + "/list",
type:"post",
- data:{
- id:$('#headId').val()
- },
- success:function (value) {
- if (value.data) {
- $('#code').val(value.data.code);
- $('#type').val(value.data.typeLabel);
- $('#status').val(value.data.statusLabel);
- $('#created').val(value.data.created);
- var text_val=$('#created').val();
- $('#created').val(text_val.replace("T"," "));
- $('#createdBy').val(value.data.createdBy);
- $('#lastUpdated').val(value.data.lastUpdated);
- var text_val_t=$('#lastUpdated').val();
- $('#lastUpdated').val(text_val_t.replace("T"," "));
- $('#lastUpdatedBy').val(value.data.lastUpdatedBy);
+ data:{},
+ success:function (res) {
+ $("#bootstrap-table").bootstrapTable('removeAll');
+ // $("#bootstrap-table").bootstrapTable('append', res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ $("#bootstrap-table").bootstrapTable('insertRow', {index:i,row:res.data[i]});
}
}
})
}
function add() {
- var headId = $('#headId').val();
+ var cycleCountHeadId = $('#cycleCountHeadId').val();
var companyCode = $('#companyCode').val();
- if(headId !=null && headId!="" && headId!=undefined && companyCode !=null && companyCode!="" && companyCode!=undefined ){
- open("添加盘点明细", prefix+"/add?headId=" + headId + "&companyCode=" + companyCode);
+ if(cycleCountHeadId !=null && cycleCountHeadId!="" && cycleCountHeadId!=undefined && companyCode !=null && companyCode!="" && companyCode!=undefined ){
+ open("添加盘点明细", prefix+"/add?cycleCountHeadId=" + cycleCountHeadId + "&companyCode=" + companyCode);
}
}
function remove(id) {
@@ -351,11 +392,11 @@
}
/**盘点补货*/
function addGoods() {
- var headId = $('#headId').val();
+ var headId = $('#cycleCountHeadId').val();
var companyCode = $('#companyCode').val();
- var code = $('#code').val();
+ //var code = $('#code').val();
// var url = prefix+"/addGoods";
- $.modal.open("盘点补货",prefix+"/addGoods?headId=" + headId + "&companyCode=" + companyCode + "&code=" + code);
+ $.modal.open("盘点补货",prefix+"/addGoods?headId=" + cycleCountHeadId + "&companyCode=" + companyCode );
}
//
@@ -520,7 +561,7 @@
function comfirmAllWithNoGapQty() {
$.modal.confirm("确认全部无差异登记么？注意这会覆盖先前登记的信息。", function() {
var url = prefix + "/comfirmAllWithNoGapQty";
- var data = { "headId": $('#headId').val() };
+ var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
postInner(url, data);
});
}
@@ -531,7 +572,7 @@
function comfirmRemainWithNoGapQty() {
$.modal.confirm("确认剩余无差异登记么？", function() {
var url = prefix + "/comfirmRemainWithNoGapQty";
- var data = { "headId": $('#headId').val() };
+ var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
postInner(url, data);
});
}
@@ -549,7 +590,7 @@
function createCyclecountWithGapQty() {
$.modal.confirm("确认进行差异复盘么？该操作会将有差异的明细重新生成一个新的盘点单。", function() {
var url = prefix + "/createCyclecountWithGapQty";
- var data = { "headId": $('#headId').val() };
+ var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
postInner(url, data);
});
}
@@ -558,7 +599,7 @@
function adjust() {
$.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！", function() {
var url = prefix + "/adjust";
- var data = { "headId": $('#headId').val() };
+ var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
postInner(url,data);
});
}
@@ -592,7 +633,7 @@
function outcheckAll() {
$.modal.confirm("确认进行盘点任务生成么？注意，这将会使未生成盘点任务的明细生成盘点任务！", function() {
var url = prefix + "/createCyccountTaskByHeadId";
- var data = { "headId": $('#headId').val() };
+ var data = { "cycleCountHeadId": $('#cycleCountHeadId').val() };
postInner(url,data);
});
}
diff --git a/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html b/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
index 5d7d09b..474cea0 100644
--- a/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
+++ b/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
@@ -25,14 +25,19 @@
<div class="select-list">
<ul>
<li>
- 盘点单号：<input type="text" name="code"/>
+ 盘点主单ID：<input type="text" name="id"/>
</li>
<li>
源盘点单号：<input type="text" name="sourceCode"/>
</li>
<li>
- <!--头 状 态：<input type="text" name="firstStatus"/>-->
- 盘点单类型：<select name="type"
+ 盘点主表编号：<input type="text" name="masterCode"/>
+ </li>
+ <li>
+ 原始盘点ID：<input type="text" name="countOrderId"/>
+ </li>
+ <li>
+ 盘点单类型：<select name="countType"
th:with="firstStatus=${@dict.getType('cyclecountType')}">
<option value="">所有</option>
<option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
@@ -40,8 +45,7 @@
</select>
</li>
<li>
- <!--尾 状 态：<input type="text" name="lastStatus"/>-->
- 盘点单状态：<select name="status"
+ 盘点单状态：<select name="statusCyc"
th:with="lastStatus=${@dict.getType('cyclecountStatus')}">
<option value="">所有</option>
<option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
@@ -270,15 +274,18 @@
}]
};
$.table.init(options);
- $("#myTab li:eq(1)").one('click', (function () {
- var cyc_id = $("#bootstrap-table tr:eq(1) td:eq(1)").text();
- var cyc_code = $("#bootstrap-table tr:eq(1) td:eq(2)").text();
- detail(cyc_id, cyc_code);
- }));
+ $("#myTab li:eq(1)").click(function () {
+ // var cyc_id = $("#bootstrap-table tr:eq(1) td:eq(1)").text();
+ // var cyc_code = $("#bootstrap-table tr:eq(1) td:eq(2)").text();
+ detail();
+ });
});
- function detail(id, code) {
- var url = ctx + "inventory/cycleCountDetail?code=" + code;
+ function detail(id) {
+ let url = ctx + "inventory/cycleCountDetail";
+ if (id) {
+ url = ctx + "inventory/cycleCountDetail?id=" + id;
+ }
$("#tabDetail").children().remove();
$("#myTab li").removeClass("active");
var height = $(document).height() - 100 + 'px';
diff --git a/src/main/resources/templates/task/taskHeader/taskHeader.html b/src/main/resources/templates/task/taskHeader/taskHeader.html
index f10e0c7..a18ca42 100644
--- a/src/main/resources/templates/task/taskHeader/taskHeader.html
+++ b/src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -439,7 +439,7 @@
/*任务列表-完成任务*/
function complete(taskId) {
$.modal.confirm("确定完成任务？", function() {
- var url = ctx + 'task/task/completeTaskByWMS';
+ var url = ctx + 'task/taskHeader/completeTaskByWMS';
var data = { "taskId" : taskId };
$.operate.post(url, data);
});