diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 941999a..6a2dedc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,33 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiving.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/wms_v2.sql" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/application-druid.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-druid.properties" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/receiving.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/receiving.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.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/mybatis/task/TaskHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -36,60 +19,464 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DatabaseView">
- <option name="SHOW_INTERMEDIATE" value="true" />
+ <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="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="@localhost" type="feb32156:DbDataSourceImpl" />
+ <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@localhost" type="feb32156:DbDataSourceImpl" />
+ <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="@localhost" type="feb32156:DbDataSourceImpl" />
+ <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
- </path>
- <path>
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
- <item name="@localhost" type="feb32156:DbDataSourceImpl" />
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
- <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
- <item name="receipt_container_header: table" type="285a2a93:MysqlImplModel$Table" />
+ <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
</path>
</expand>
<select />
</component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="236">
+ <caret line="36" selection-start-line="36" selection-end-line="36" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <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="468">
+ <caret line="37" selection-start-line="37" selection-end-line="37" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="340">
+ <caret line="24" column="112" selection-start-line="24" selection-start-column="112" selection-end-line="24" selection-end-column="112" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <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="240">
+ <caret line="15" column="102" selection-start-line="15" selection-start-column="102" selection-end-line="15" selection-end-column="102" />
+ </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/TaskHeaderServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2">
+ <caret line="440" column="18" lean-forward="true" selection-start-line="440" selection-start-column="18" selection-end-line="440" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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">
+ <state relative-caret-position="426">
+ <caret line="366" column="57" selection-start-line="366" selection-start-column="57" selection-end-line="366" 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/task/taskHeader/mapper/TaskHeaderMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="11" selection-start-line="11" selection-end-line="11" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="280">
+ <caret line="14" column="77" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <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="-72" />
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
+ <option value="CSS File" />
<option value="Class" />
+ <option value="HTML File" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="ROOT_SYNC" value="DONT_SYNC" />
</component>
- <component name="ProjectId" id="1QAvYF2l5KfXJOdWwEQu94p1EwU" />
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
+ </list>
+ </option>
+ </component>
+ <component name="MavenImportPreferences">
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="importAutomatically" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-9" />
+ <option name="y" value="-9" />
+ <option name="width" value="1938" />
+ <option name="height" value="1048" />
+ </component>
+ <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="PackagesPane" />
+ <pane id="Scope" />
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name=".idea" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="config" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="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="inventoryHeader" 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="inventoryHeader" 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="inventoryHeader" 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="task" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
+ <item name="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="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" 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="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" 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>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ </panes>
+ </component>
<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" />
@@ -97,25 +484,21 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ <property name="list.type.of.created.stylesheet" value="CSS" />
<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_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
- <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
- <property name="settings.editor.selected.configurable" value="http.proxy" />
- </component>
- <component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="E:\code\wms2\src\main\resources\templates\receipt\receiptHeader" />
- </key>
+ <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
</component>
<component name="RunDashboard">
+ <option name="configurationTypes">
+ <set>
+ <option value="SpringBootApplicationConfigurationType" />
+ </set>
+ </option>
<option name="ruleStates">
<list>
<RuleState>
@@ -126,10 +509,11 @@
</RuleState>
</list>
</option>
+ <option name="contentProportion" value="0.056010928" />
</component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="huaheng" />
+ <module name="wms2" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
@@ -142,8 +526,19 @@
<component name="ServiceViewManager">
<option name="allServicesViewState">
<serviceView>
+ <option name="contentProportion" value="0.17857143" />
<treeState>
- <expand />
+ <expand>
+ <path>
+ <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ </path>
+ <path>
+ <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@67b24c63" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+ </path>
+ </expand>
<select />
</treeState>
</serviceView>
@@ -154,20 +549,144 @@
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />
- <created>1567226260528</created>
+ <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
+ <created>1566977677142</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1567226260528</updated>
- <workItem from="1567226262934" duration="3760000" />
- <workItem from="1567237073353" duration="1270000" />
- <workItem from="1567263583919" duration="7574000" />
- <workItem from="1567321058939" duration="8502000" />
- <workItem from="1567385321419" duration="11674000" />
- <workItem from="1567405520324" duration="6659000" />
+ <updated>1566977677142</updated>
+ <workItem from="1566977678336" duration="306000" />
+ <workItem from="1566978429560" duration="9246000" />
+ <workItem from="1567038752582" duration="12361000" />
+ <workItem from="1567057373550" duration="15293000" />
+ <workItem from="1567125196953" duration="16752000" />
+ </task>
+ <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
+ <created>1566983055587</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1566983055587</updated>
+ </task>
+ <task id="LOCAL-00002" summary="添加入库单历史">
+ <created>1566987011007</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1566987011007</updated>
</task>
+ <task id="LOCAL-00003" summary="修复入库历史controller冲突">
+ <created>1567039165473</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1567039165473</updated>
+ </task>
+ <task id="LOCAL-00004" summary="添加物料类别">
+ <created>1567047135508</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1567047135508</updated>
+ </task>
+ <task id="LOCAL-00005" summary="添加系统参数配置">
+ <created>1567065008303</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
+ <option name="project" value="LOCAL" />
+ <updated>1567065008303</updated>
+ </task>
+ <task id="LOCAL-00006" summary="删除入库单">
+ <created>1567065196899</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
+ <option name="project" value="LOCAL" />
+ <updated>1567065196899</updated>
+ </task>
+ <task id="LOCAL-00007" summary="自动生成盘点首选项表">
+ <created>1567068662565</created>
+ <option name="number" value="00007" />
+ <option name="presentableId" value="LOCAL-00007" />
+ <option name="project" value="LOCAL" />
+ <updated>1567068662565</updated>
+ </task>
+ <task id="LOCAL-00008" summary="添加逻辑删除配置">
+ <created>1567069834248</created>
+ <option name="number" value="00008" />
+ <option name="presentableId" value="LOCAL-00008" />
+ <option name="project" value="LOCAL" />
+ <updated>1567069834248</updated>
+ </task>
+ <option name="localTasksCounter" value="9" />
<servers />
</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" visible="true" weight="0.33109918" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info id="Web" order="2" side_tool="true" />
+ <window_info id="Designer" order="3" />
+ <window_info id="UI Designer" order="4" />
+ <window_info id="Favorites" order="5" side_tool="true" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.07082153" />
+ <window_info anchor="bottom" id="Database Changes" order="9" />
+ <window_info anchor="bottom" id="Spring" order="10" />
+ <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
+ <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
+ <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
+ <window_info anchor="bottom" id="Java Enterprise" order="14" />
+ <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" weight="0.53824365" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Palette" order="3" />
+ <window_info anchor="right" id="Database" order="4" />
+ <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
+ <window_info anchor="right" id="Bean Validation" order="6" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ </layout>
+ <layout-to-restore>
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info id="Web" order="2" side_tool="true" />
+ <window_info id="Designer" order="3" />
+ <window_info id="UI Designer" order="4" />
+ <window_info id="Favorites" order="5" side_tool="true" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="8" weight="0.45042494" />
+ <window_info anchor="bottom" id="Database Changes" order="9" />
+ <window_info anchor="bottom" id="Spring" order="10" />
+ <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
+ <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
+ <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
+ <window_info anchor="bottom" id="Java Enterprise" order="14" />
+ <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.18838526" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Palette" order="3" />
+ <window_info anchor="right" id="Database" order="4" />
+ <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
+ <window_info anchor="right" id="Bean Validation" order="6" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ </layout-to-restore>
+ </component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -177,45 +696,205 @@
<entry key="MAIN">
<value>
<State>
- <option name="COLUMN_ORDER" />
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
</map>
</option>
+ <option name="RECENT_FILTERS">
+ <map>
+ <entry key="Branch">
+ <value>
+ <list />
+ </value>
+ </entry>
+ <entry key="User">
+ <value>
+ <list />
+ </value>
+ </entry>
+ </map>
+ </option>
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+ <MESSAGE value="盘点明细页面" />
+ <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
+ <MESSAGE value="添加入库单历史" />
+ <MESSAGE value="修复入库历史controller冲突" />
+ <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/pc/receipt/receiptDetail/controller/ReceiptDetailController.java</url>
- <line>207</line>
- <option name="timeStamp" value="3" />
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
+ <line>5</line>
+ <properties />
+ <option name="timeStamp" value="1" />
+ </line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
+ <line>60</line>
+ <properties />
+ <option name="timeStamp" value="4" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java</url>
- <line>99</line>
- <option name="timeStamp" value="6" />
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
+ <line>49</line>
+ <properties />
+ <option name="timeStamp" value="16" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java</url>
- <line>73</line>
- <option name="timeStamp" value="7" />
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
+ <line>216</line>
+ <properties />
+ <option name="timeStamp" value="19" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java</url>
- <line>117</line>
- <option name="timeStamp" value="11" />
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
+ <line>241</line>
+ <properties />
+ <option name="timeStamp" value="20" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
<line>163</line>
- <option name="timeStamp" value="12" />
+ <properties />
+ <option name="timeStamp" value="22" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
+ <line>181</line>
+ <properties />
+ <option name="timeStamp" value="23" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
+ <line>92</line>
+ <properties />
+ <option name="timeStamp" value="24" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-828" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-360" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-314">
+ <caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
+ </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="-72" />
+ </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="-1268">
+ <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="236">
+ <caret line="36" selection-start-line="36" selection-end-line="36" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="60">
+ <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/inventory/inventoryHeader/service/InventoryHeaderService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="15" column="102" selection-start-line="15" selection-start-column="102" selection-end-line="15" selection-end-column="102" />
+ </state>
+ </provider>
+ </entry>
+ <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="468">
+ <caret line="37" selection-start-line="37" selection-end-line="37" />
+ </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="340">
+ <caret line="24" column="112" selection-start-line="24" selection-start-column="112" selection-end-line="24" selection-end-column="112" />
+ </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="2">
+ <caret line="440" column="18" lean-forward="true" selection-start-line="440" selection-start-column="18" selection-end-line="440" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="426">
+ <caret line="366" column="57" selection-start-line="366" selection-start-column="57" selection-end-line="366" selection-end-column="57" />
+ </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="120">
+ <caret line="11" selection-start-line="11" selection-end-line="11" />
+ </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="280">
+ <caret line="14" column="77" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" />
+ </state>
+ </provider>
+ </entry>
+ </component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
index 2a1cd7b..4831b61 100644
--- a/src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
@@ -11,7 +11,7 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
-@ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail")
+@ApiModel(value="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail")
@Data
@TableName(value = "filter_config_detail")
public class FilterConfigDetail implements Serializable {
@@ -83,14 +83,14 @@ public class FilterConfigDetail implements Serializable {
*/
@TableField(value = "systemCreated")
@ApiModelProperty(value="是否系统创建")
- private Integer systemCreated;
+ private Boolean systemCreated;
/**
* 是否自定义SQL
*/
@TableField(value = "customSql")
@ApiModelProperty(value="是否自定义SQL")
- private String customSql;
+ private Boolean customSql;
/**
* 创建时间
diff --git a/src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
index e9e8e02..7bc6d3f 100644
--- a/src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
+++ b/src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
@@ -11,7 +11,7 @@ import lombok.Data;
import java.io.Serializable;
import java.util.Date;
-@ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader")
+@ApiModel(value="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader")
@Data
@TableName(value = "filter_config_header")
public class FilterConfigHeader implements Serializable {
@@ -62,7 +62,7 @@ public class FilterConfigHeader implements Serializable {
*/
@TableField(value = "systemCreated")
@ApiModelProperty(value="是否系统创建")
- private Integer systemCreated;
+ private Boolean systemCreated;
/**
* 创建时间
diff --git a/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java b/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
index f8b6b0b..6769def 100644
--- a/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
+++ b/src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
@@ -4,24 +4,30 @@ 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;
import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
+import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Controller
@@ -58,7 +64,13 @@ public class cycleCountPreferenceController extends BaseController {
StringUtils.isNotEmpty(createdBegin), CycleCountPreference::getCreated, createdBegin)
.le(StringUtils.isNotEmpty(createdEnd), CycleCountPreference::getCreated, createdEnd)//创建时间范围
.eq(CycleCountPreference::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
- .eq(cycleCountPreference.getId() != null, CycleCountPreference::getId, cycleCountPreference.getId())//库存明细ID
+ .eq(StringUtils.isNotEmpty(cycleCountPreference.getCode()), CycleCountPreference::getCode, cycleCountPreference.getCode())//首选项编码
+ .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLocation()),CycleCountPreference::getPromptLocation,cycleCountPreference.getPromptLocation())//提示货位
+ .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLpn()),CycleCountPreference::getPromptLpn,cycleCountPreference.getPromptLpn())//提示PLN
+ .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptItem()),CycleCountPreference::getPromptItem,cycleCountPreference.getPromptItem())//提示物料
+ .eq(StringUtils.isNotEmpty(cycleCountPreference.getLastUpdatedBy()),CycleCountPreference::getLastUpdatedBy,cycleCountPreference.getLastUpdatedBy())//更新人
+ .eq(StringUtils.isNotEmpty(cycleCountPreference.getCreatedBy()),CycleCountPreference::getCreatedBy,cycleCountPreference.getCreatedBy())//创建人
+
.orderByDesc(CycleCountPreference::getId);
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
@@ -73,7 +85,69 @@ public class cycleCountPreferenceController extends BaseController {
}
+ /**
+ * 新增盘点首选项
+ */
+ @GetMapping("/add")
+ public String add() {
+ return prefix + "/add";
+ }
+ /**
+ * 新增保存盘点首选项
+ */
+ //@RequiresPermissions("config:receiptPreference:add")
+ @Log(title = "配置-盘点首选项", operating = "新增盘点首选项", action = BusinessType.INSERT)
+ @PostMapping("/addSave")
+ @ResponseBody
+ public AjaxResult addSave(CycleCountPreference cycleCountPreference) {
+ cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
+ cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
+ cycleCountPreference.setCreated(new Date());
+ cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
+
+ return toAjax(cycleCountPreferenceService.save(cycleCountPreference));
+ }
+
+ /**
+ * 修改盘点首选项
+ */
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable Integer id, ModelMap mmap) {
+ mmap.put("cycleCountPreference", cycleCountPreferenceService.getById(id));
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存盘点首选项
+ */
+ //@RequiresPermissions("config:receiptPreference:edit")
+ @Log(title = "通用-盘点首选项", operating = "修改盘点首选项", action = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(CycleCountPreference cycleCountPreference) {
+ cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
+ cycleCountPreference.setLastUpdated(new Date());
+ return toAjax(cycleCountPreferenceService.updateById(cycleCountPreference));
+ }
+
+ /**
+ * 删除盘点首选项
+ */
+ //@RequiresPermissions("config:receiptPreference:remove")
+ @Log(title = "通用-盘点首选项", operating = "删除盘点首选项", action = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids) {
+ if (StringUtils.isEmpty(ids)){
+ return AjaxResult.error("id不能为空");
+ }
+ List<Integer> list = new ArrayList<>();
+ for (Integer id : Convert.toIntArray(ids)) {
+ list.add(id);
+ }
+ return toAjax(cycleCountPreferenceService.removeByIds(list));
+ }
diff --git a/src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java b/src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java
index 8ec517b..048d7bb 100644
--- a/src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java
+++ b/src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java
@@ -1,5 +1,6 @@
package com.huaheng.pc.config.cycleCountPreference.domain;
+import com.alibaba.druid.sql.visitor.functions.Char;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -47,21 +48,21 @@ public class CycleCountPreference implements Serializable {
*/
@TableField(value = "promptLocation")
@ApiModelProperty(value="系统提示货位")
- private Integer promptLocation;
+ private String promptLocation;
/**
* 系统提示LPN
*/
@TableField(value = "promptLpn")
@ApiModelProperty(value="系统提示LPN")
- private Integer promptLpn;
+ private String promptLpn;
/**
* 系统提示物料
*/
@TableField(value = "promptItem")
@ApiModelProperty(value="系统提示物料")
- private Integer promptItem;
+ private String promptItem;
/**
* 显示库存数量
@@ -82,7 +83,7 @@ public class CycleCountPreference implements Serializable {
*/
@TableField(value = "Enable")
@ApiModelProperty(value="有效")
- private Integer enable;
+ private Boolean enable;
/**
* 创建时间
diff --git a/src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java b/src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java
index 78162ce..9a20783 100644
--- a/src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
-@ApiModel(value="com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference")
+@ApiModel(value="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference")
@TableName(value = "shipment_preference")
public class ShipmentPreference implements Serializable {
/**
@@ -81,14 +81,14 @@ public class ShipmentPreference implements Serializable {
*/
@TableField(value = "allowCross")
@ApiModelProperty(value="允许越库")
- private Integer allowCross;
+ private Boolean allowCross;
/**
* 允许未质检的出库
*/
@TableField(value = "allowQcCheckResult")
@ApiModelProperty(value="允许未质检的出库")
- private Integer allowQcCheckResult;
+ private Boolean allowQcCheckResult;
/**
* 显示库存数量
@@ -382,39 +382,19 @@ public class ShipmentPreference implements Serializable {
this.autoAssignLPN = autoAssignLPN;
}
- /**
- * 获取允许越库
- *
- * @return allowCross - 允许越库
- */
- public Integer getAllowCross() {
+ public Boolean getAllowCross() {
return allowCross;
}
- /**
- * 设置允许越库
- *
- * @param allowCross 允许越库
- */
- public void setAllowCross(Integer allowCross) {
+ public void setAllowCross(Boolean allowCross) {
this.allowCross = allowCross;
}
- /**
- * 获取允许未质检的出库
- *
- * @return allowQcCheckResult - 允许未质检的出库
- */
- public Integer getAllowQcCheckResult() {
+ public Boolean getAllowQcCheckResult() {
return allowQcCheckResult;
}
- /**
- * 设置允许未质检的出库
- *
- * @param allowQcCheckResult 允许未质检的出库
- */
- public void setAllowQcCheckResult(Integer allowQcCheckResult) {
+ public void setAllowQcCheckResult(Boolean allowQcCheckResult) {
this.allowQcCheckResult = allowQcCheckResult;
}
diff --git a/src/main/java/com/huaheng/pc/config/shipmentType/config/shipmentTypeController.java b/src/main/java/com/huaheng/pc/config/shipmentType/config/shipmentTypeController.java
new file mode 100644
index 0000000..a91e7b1
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/config/shipmentType/config/shipmentTypeController.java
@@ -0,0 +1,151 @@
+package com.huaheng.pc.config.shipmentType.config;
+
+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;
+import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
+import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/config/shipmentType")
+public class shipmentTypeController extends BaseController {
+
+ @Resource
+ private ShipmentTypeService shipmentTypeService;
+ @Autowired
+ private ShipmentHeaderService shipmentHeaderService;
+
+ private String prefix = "config/shipmentType";
+
+ @RequiresPermissions("config:shipmentType:view")
+ @GetMapping()
+ public String shipmentType() {
+ return prefix + "/shipmentType";
+ }
+
+ /**
+ * 查询出库类型
+ */
+ @RequiresPermissions("config:shipmentType:list")
+ @Log(title = "配置-出库类型",operating = "出库类型列表", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(@ApiParam(name="shipmentType",value="编码、类型") ShipmentType shipmentType,
+ @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+ @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+ LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize();
+ lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ShipmentType::getCreated, createdBegin)
+ .lt(StringUtils.isNotEmpty(createdEnd), ShipmentType::getCreated, createdEnd)
+ .eq(StringUtils.isNotEmpty(shipmentType.getCode()), ShipmentType::getCode, shipmentType.getCode())
+ .eq(StringUtils.isNotEmpty(shipmentType.getReferType()), ShipmentType::getReferType, shipmentType.getReferType())
+ .like(StringUtils.isNotEmpty(shipmentType.getName()), ShipmentType::getName, shipmentType.getName())
+ .in(ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList())
+ .eq(ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ /*使用分页查询*/
+ Page<ShipmentType> page = new Page<>(pageNum, pageSize);
+ IPage<ShipmentType> iPage = shipmentTypeService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+ } else {
+ List<ShipmentType> list = shipmentTypeService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+ /**
+ * 新增出库类型
+ */
+ @GetMapping("/add")
+ public String add() {
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增出库类型
+ */
+ @RequiresPermissions("config:shipmentType:add")
+ @Log(title = "配置-出库类型",operating = "新增出库类型", action = BusinessType.INSERT)
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(ShipmentType shipmentType) {
+ shipmentType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+ shipmentType.setCreatedBy(ShiroUtils.getLoginName());
+ shipmentType.setLastUpdatedBy(ShiroUtils.getLoginName());
+ return toAjax(shipmentTypeService.save(shipmentType ));
+ }
+
+ /**
+ * 修改出库类型
+ */
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+ ShipmentType shipmentType = shipmentTypeService.getById(id);
+ mmap.put("shipmentType", shipmentType);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存出库类型
+ */
+ @RequiresPermissions("config:shipmentType:edit")
+ @Log(title = "配置-出库类型",operating = "修改出库类型", action = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(ShipmentType shipmentType) {
+ shipmentType.setLastUpdatedBy(ShiroUtils.getLoginName());
+ return toAjax(shipmentTypeService.updateById(shipmentType));
+ }
+
+ /**
+ * 删除出库
+ */
+ @RequiresPermissions("config:shipmentType:remove")
+ @Log(title = "配置-出库管理",operating = "修改出库", action = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids) {
+ if (StringUtils.isEmpty(ids)) {
+ return AjaxResult.error("id不能为空");
+ }
+ List<Integer> list = new ArrayList<>();
+ for (Integer id : Convert.toIntArray(ids)) {
+ ShipmentType shipmentType = shipmentTypeService.getById(id);
+ LambdaQueryWrapper<ShipmentHeader> lambda = Wrappers.lambdaQuery();
+ lambda.eq(ShipmentHeader::getShipmentType, shipmentType.getCode());
+ List<ShipmentHeader> receiptHeaderList = shipmentHeaderService.list(lambda);
+ if (receiptHeaderList.size() == 0){
+ list.add(id);
+ } else {
+ return AjaxResult.error("类型"+shipmentType.getCode()+"存在出库单，不能删除");
+ }
+ }
+ return toAjax(shipmentTypeService.removeByIds(list));
+ }
+}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentType/domain/ShipmentType.java b/src/main/java/com/huaheng/pc/config/shipmentType/domain/ShipmentType.java
index e055501..17ba769 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentType/domain/ShipmentType.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentType/domain/ShipmentType.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.shipment.shipmentType.domain;
+package com.huaheng.pc.config.shipmentType.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
import java.io.Serializable;
import java.util.Date;
@@ -41,6 +42,13 @@ public class ShipmentType implements Serializable {
private String code;
/**
+ * 编码
+ */
+ @TableField(value = "name")
+ @ApiModelProperty(value="编码")
+ private String name;
+
+ /**
* 关联订单类型
*/
@TableField(value = "referType")
@@ -59,7 +67,7 @@ public class ShipmentType implements Serializable {
*/
@TableField(value = "enable")
@ApiModelProperty(value="是否启用")
- private String enable;
+ private Boolean enable;
/**
* 创建时间
@@ -124,33 +132,6 @@ public class ShipmentType implements Serializable {
@ApiModelProperty(value="自定义字段4")
private String userDef4;
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
/**
* 处理标记
@@ -167,6 +148,8 @@ public class ShipmentType implements Serializable {
public static final String COL_CODE = "code";
+ public static final String COL_NAME= "name";
+
public static final String COL_REFERTYPE = "referType";
public static final String COL_SHIPMENTFLOW = "shipmentFlow";
@@ -191,14 +174,6 @@ public class ShipmentType implements Serializable {
public static final String COL_USERDEF4 = "userDef4";
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
public static final String COL_PROCESSSTAMP = "processStamp";
/**
@@ -273,6 +248,14 @@ public class ShipmentType implements Serializable {
this.code = code;
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
/**
* 获取关联订单类型
*
@@ -309,21 +292,11 @@ public class ShipmentType implements Serializable {
this.shipmentFlow = shipmentFlow;
}
- /**
- * 获取是否启用
- *
- * @return enable - 是否启用
- */
- public String getEnable() {
+ public Boolean getEnable() {
return enable;
}
- /**
- * 设置是否启用
- *
- * @param enable 是否启用
- */
- public void setEnable(String enable) {
+ public void setEnable(Boolean enable) {
this.enable = enable;
}
@@ -489,77 +462,6 @@ public class ShipmentType implements Serializable {
this.userDef4 = userDef4;
}
- /**
- * 获取自定义字段5
- *
- * @return userDef5 - 自定义字段5
- */
- public String getUserDef5() {
- return userDef5;
- }
-
- /**
- * 设置自定义字段5
- *
- * @param userDef5 自定义字段5
- */
- public void setUserDef5(String userDef5) {
- this.userDef5 = userDef5;
- }
-
- /**
- * 获取自定义字段6
- *
- * @return userDef6 - 自定义字段6
- */
- public String getUserDef6() {
- return userDef6;
- }
-
- /**
- * 设置自定义字段6
- *
- * @param userDef6 自定义字段6
- */
- public void setUserDef6(String userDef6) {
- this.userDef6 = userDef6;
- }
-
- /**
- * 获取自定义字段7
- *
- * @return userDef7 - 自定义字段7
- */
- public String getUserDef7() {
- return userDef7;
- }
-
- /**
- * 设置自定义字段7
- *
- * @param userDef7 自定义字段7
- */
- public void setUserDef7(String userDef7) {
- this.userDef7 = userDef7;
- }
-
- /**
- * 获取自定义字段8
- *
- * @return userDef8 - 自定义字段8
- */
- public String getUserDef8() {
- return userDef8;
- }
-
- /**
- * 设置自定义字段8
- *
- * @param userDef8 自定义字段8
- */
- public void setUserDef8(String userDef8) {
- this.userDef8 = userDef8;
- }
/**
* 获取处理标记
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentType/mapper/ShipmentTypeMapper.java b/src/main/java/com/huaheng/pc/config/shipmentType/mapper/ShipmentTypeMapper.java
index 9587aa4..48a3759 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentType/mapper/ShipmentTypeMapper.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentType/mapper/ShipmentTypeMapper.java
@@ -1,7 +1,7 @@
-package com.huaheng.pc.shipment.shipmentType.mapper;
+package com.huaheng.pc.config.shipmentType.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;
+import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
public interface ShipmentTypeMapper extends BaseMapper<ShipmentType> {
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeService.java b/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java
index b13c07d..a5ba810 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeService.java
+++ b/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java
@@ -1,7 +1,8 @@
-package com.huaheng.pc.shipment.shipmentType.service;
+package com.huaheng.pc.config.shipmentType.service;
-import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
+
public interface ShipmentTypeService extends IService<ShipmentType>{
diff --git a/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java b/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java
new file mode 100644
index 0000000..9a5cdf8
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java
@@ -0,0 +1,11 @@
+package com.huaheng.pc.config.shipmentType.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
+import com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService {
+
+}
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
index f56edf2..8ea3232 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
@@ -16,6 +16,8 @@ import com.huaheng.framework.web.page.TableSupport;
import com.huaheng.pc.config.material.service.MaterialServiceImpl;
import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -32,8 +34,7 @@ public class InventoryHeaderController extends BaseController
{
private String prefix = "inventory/inventoryHeader";
- @Resource
- private MaterialServiceImpl materialService;
+
@Resource
private InventoryHeaderService inventoryHeaderService;
@@ -64,7 +65,7 @@ public class InventoryHeaderController extends BaseController
.eq(InventoryHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())//仓库
.eq(StringUtils.isNotEmpty(inventoryHeader.getLocationCode()),InventoryHeader::getLocationCode,inventoryHeader.getLocationCode()) //库位
.eq(StringUtils.isNotEmpty(inventoryHeader.getContainerCode()),InventoryHeader::getContainerCode,inventoryHeader.getContainerCode())//容器
- //.eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主
+ .eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主
.eq(StringUtils.isNotEmpty(inventoryHeader.getCreatedBy()),InventoryHeader::getCreatedBy,inventoryHeader.getCreatedBy())//创建用户
.eq(StringUtils.isNotEmpty(inventoryHeader.getLastUpdatedBy()),InventoryHeader::getLastUpdatedBy,inventoryHeader.getLastUpdatedBy())//更新用户
.orderByDesc(InventoryHeader::getId);
@@ -80,6 +81,7 @@ public class InventoryHeaderController extends BaseController
}
}
+
/**
* 移库页面
* */
@@ -93,8 +95,8 @@ public class InventoryHeaderController extends BaseController
@PostMapping("/transfer")
@ResponseBody
public AjaxResult transfer(String sourceLocation, String destinationLocation){
-
- return inventoryHeaderService.transfer(sourceLocation,destinationLocation);
+ String companyCode="";
+ return inventoryHeaderService.transfer(sourceLocation,destinationLocation,companyCode);
}
/**出库查看*/
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
index 5826f62..538cf72 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
@@ -9,11 +9,12 @@ import org.springframework.stereotype.Service;
public interface InventoryHeaderService extends IService<InventoryHeader> {
- public AjaxResult transfer (String sourceLocation, String destinationLocation);
-
public AjaxResult createCheckOutTask (String ids);
+
+ public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode);
+
}
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
index d1f4253..4fab445 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
@@ -3,7 +3,9 @@ package com.huaheng.pc.inventory.inventoryHeader.service;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
+import com.huaheng.pc.task.taskDetail.service.TaskDetailServiceImpl;
import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper;
@@ -15,25 +17,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl<InventoryHeaderMappe
@Resource
- private TaskHeaderService taskHeaderService;
+ private TaskHeaderServiceImpl taskHeaderServiceImpl;
@Resource
- private TaskDetailService taskDetailService;
+ private TaskDetailServiceImpl taskDetailServiceImpl;
/**
* 移库
* */
- @Override
- public AjaxResult transfer(String sourceLocation, String destinationLocation) {
- //生成移库任务
+ public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode) {
+ //生成移库任务
+ taskHeaderServiceImpl.createTransferTask(sourceLocation,destinationLocation,companyCode);
return AjaxResult.success("移库任务生成成功！");
}
/**
* 出库查看
* */
- @Override
+
public AjaxResult createCheckOutTask(String ids) {
//生成出库查看任务
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeServiceImpl.java
deleted file mode 100644
index 07c811d..0000000
--- a/src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.huaheng.pc.shipment.shipmentType.service;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.shipment.shipmentType.mapper.ShipmentTypeMapper;
-import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;
-import com.huaheng.pc.shipment.shipmentType.service.ShipmentTypeService;
-@Service
-public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService{
-
-}
diff --git a/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java b/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
index 2241cae..0dcc87c 100644
--- a/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
+++ b/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
@@ -218,12 +218,6 @@ public class TaskDetail implements Serializable {
@ApiModelProperty(value="属性3")
private String attribute3;
- /**
- * 属性4
- */
- @TableField(value = "attribute4")
- @ApiModelProperty(value="属性4")
- private String attribute4;
/**
* 批次
@@ -377,41 +371,6 @@ public class TaskDetail implements Serializable {
private String userDef3;
/**
- * 自定义字段4
- */
- @TableField(value = "userDef4")
- @ApiModelProperty(value="自定义字段4")
- private String userDef4;
-
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
-
- /**
* 处理标记
*/
@TableField(value = "processStamp")
@@ -479,7 +438,6 @@ public class TaskDetail implements Serializable {
public static final String COL_ATTRIBUTE3 = "attribute3";
- public static final String COL_ATTRIBUTE4 = "attribute4";
public static final String COL_BATCH = "batch";
@@ -525,15 +483,5 @@ public class TaskDetail implements Serializable {
public static final String COL_USERDEF3 = "userDef3";
- public static final String COL_USERDEF4 = "userDef4";
-
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
public static final String COL_PROCESSSTAMP = "processStamp";
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java b/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
index d9b7301..798f2d5 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
@@ -280,40 +280,6 @@ public class TaskHeader implements Serializable {
@ApiModelProperty(value="同步标志 0：需要同步 10：同步成功 20：同步失败")
private String userDef3;
- /**
- * 自定义字段4
- */
- @TableField(value = "userDef4")
- @ApiModelProperty(value="自定义字段4")
- private String userDef4;
-
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
/**
* 处理标记
@@ -400,15 +366,5 @@ public class TaskHeader implements Serializable {
public static final String COL_USERDEF3 = "userDef3";
- public static final String COL_USERDEF4 = "userDef4";
-
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
public static final String COL_PROCESSSTAMP = "processStamp";
}
\ No newline at end of file
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 ec4bbbe..74296d6 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
@@ -22,4 +22,6 @@ public interface TaskHeaderService extends IService<TaskHeader>{
// List<Map<String, Object>> getReceiptTask(@Param("taskId") Integer taskId);
+ public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode);
+
}
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 725f91d..3e76e74 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
@@ -19,7 +19,6 @@ import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction
import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
-import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
@@ -27,21 +26,18 @@ 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;
-import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -435,5 +431,90 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
// return taskHeaderMapper.getReceiptTask(taskId) ;
// }
+ /**
+ * 立库移库
+ * */
+ @Transactional
+ public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode) {
+ /* Location temp1 = new Location();
+ temp1.setCode(sourceLocation);
+ temp1.setWarehouseId(ShiroUtils.getWarehouseId());
+ Location loc1 = locationService.selectFirstEntity(temp1);
+ if(loc1==null){
+ return AjaxResult.error("源库位："+sourceLocation+"未找到");
+ }
+ if(!loc1.getStatus().equals("empty")){
+ return AjaxResult.error("源库位："+sourceLocation+"状态非空闲");
+ }
+ if(StringUtils.isEmpty(loc1.getContainerCode())){
+ return AjaxResult.error("源库位："+sourceLocation+"不存在托盘");
+ }
+ //这里增加组盘校验，如果此托盘存在未完成的组盘数据，则不能移库
+ //校验入库组盘
+ int count1 = inventoryService.getUncompleteReceiptContainer(sourceLocation,ShiroUtils.getWarehouseId());
+ if(count1>0){
+ return AjaxResult.error("源库位："+sourceLocation+"存在入库组盘，不能移库");
+ }
+ int count2 = inventoryService.getUncompleteShipmentContainer(sourceLocation,ShiroUtils.getWarehouseId());
+ if(count2>0){
+ return AjaxResult.error("源库位："+sourceLocation+"存在出库组盘，不能移库");
+ }
+
+ Location temp2 = new Location();
+ temp2.setWarehouseId(ShiroUtils.getWarehouseId());
+ temp2.setCode(destinationLocation);
+ Location loc2 = locationService.selectFirstEntity(temp2);
+ if(loc2 == null){
+ return AjaxResult.error("目标库位："+destinationLocation+"未找到");
+ }
+ if(!loc2.getStatus().equals("empty")){
+ return AjaxResult.error("目标库位："+destinationLocation+"状态非空闲");
+ }
+ if(StringUtils.isNotEmpty(loc2.getContainerCode())){
+ return AjaxResult.error("目标库位："+destinationLocation+"已存在托盘");
+ }
+ int count3 = inventoryService.getUncompleteReceiptContainer(destinationLocation,ShiroUtils.getWarehouseId());
+ if(count3>0){
+ return AjaxResult.error("目标库位："+sourceLocation+"存在入库组盘，不能移库");
+ }
+ //hack：这里暂时写死第五层不能往其他四层移库
+ if(loc1.getLayer()==5){
+ if(loc2.getLayer()<4){
+ return AjaxResult.error("高货位不能往底货位移库");
+ }
+ }
+ Task task = new Task();
+ task.setWarehouseId(ShiroUtils.getWarehouseId());
+ task.setWarehouseCode(ShiroUtils.getWarehouseCode());
+ task.setCompanyId(ShiroUtils.getCompanyIdList().get(0));//获取第一个货主
+ task.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
+ //这里默认一个0
+ task.setPriority(0);
+ task.setType((short)800);
+ //对移库来说，这个没啥用
+ task.setStation(null);
+ task.setContainerCode(loc1.getContainerCode());
+ task.setFirstStatus((short)1);
+ task.setLastStatus((short)1);
+ task.setBeginTime(new Date());
+ task.setSourceLocation(sourceLocation);
+ task.setDestinationLocation(destinationLocation);
+ task.setCreated(new Date());
+ task.setCreatedBy(ShiroUtils.getLoginName());
+ insert(task);
+ //更新货位状态为预定
+ loc1.setStatus("lock");
+ loc2.setStatus("lock");
+ locationService.updateByModel(loc1);
+ locationService.updateByModel(loc2);
+ return AjaxResult.success(task.getId());*/
+ return null;
+ }
+
+
+
+
+
+
}
diff --git a/src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml b/src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml
index 0a7a242..6205b44 100644
--- a/src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml
+++ b/src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml
@@ -7,12 +7,12 @@
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
- <result column="promptLocation" jdbcType="INTEGER" property="promptLocation" />
- <result column="promptLpn" jdbcType="INTEGER" property="promptLpn" />
- <result column="promptItem" jdbcType="INTEGER" property="promptItem" />
+ <result column="promptLocation" jdbcType="VARCHAR" property="promptLocation" />
+ <result column="promptLpn" jdbcType="VARCHAR" property="promptLpn" />
+ <result column="promptItem" jdbcType="VARCHAR" property="promptItem" />
<result column="promptQuantity" jdbcType="INTEGER" property="promptQuantity" />
<result column="allowAddNewInventory" jdbcType="INTEGER" property="allowAddNewInventory" />
- <result column="Enable" jdbcType="INTEGER" property="enable" />
+ <result column="Enable" jdbcType="BOOLEAN" property="enable" />
<result column="created" jdbcType="TIMESTAMP" property="created" />
<result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
<result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
diff --git a/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml b/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
index 0e0c5be..294d19a 100644
--- a/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
+++ b/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper">
+<mapper namespace="com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper">
<resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
@@ -12,8 +12,8 @@
<result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="statement" jdbcType="LONGVARCHAR" property="statement" />
- <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
- <result column="customSql" jdbcType="LONGVARCHAR" property="customSql" />
+ <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
+ <result column="customSql" jdbcType="BIT" property="customSql" />
<result column="created" jdbcType="TIMESTAMP" property="created" />
<result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
<result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -23,10 +23,6 @@
<result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
<result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
<result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
<result column="filterName" jdbcType="VARCHAR" property="filterName" />
</resultMap>
@@ -34,7 +30,7 @@
<!--@mbg.generated-->
id, headerId, code, moduleType, recordType, filterCode, warehouseCode, description,
`statement`, systemCreated, customSql, created, createdBy, lastUpdated, lastUpdatedBy,
- version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
+ version, userDef1, userDef2, userDef3, userDef4,
processStamp, filterName
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml b/src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
index b33fe57..df68781 100644
--- a/src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
+++ b/src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
+<mapper namespace="com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
<resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
@@ -9,7 +9,7 @@
<result column="filterCode" jdbcType="VARCHAR" property="filterCode" />
<result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
<result column="description" jdbcType="VARCHAR" property="description" />
- <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
+ <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
<result column="created" jdbcType="TIMESTAMP" property="created" />
<result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
<result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -19,10 +19,6 @@
<result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
<result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
<result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
<result column="filterName" jdbcType="VARCHAR" property="filterName" />
</resultMap>
@@ -30,6 +26,6 @@
<!--@mbg.generated-->
id, moduleType, recordType, filterCode, warehouseCode, description, systemCreated,
created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
- userDef4, userDef5, userDef6, userDef7, userDef8, processStamp, filterName
+ userDef4, processStamp, filterName
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml b/src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
index 5ace450..2b5e7ad 100644
--- a/src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
+++ b/src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.shipment.shipmentPreference.mapper.ShipmentPreferenceMapper">
+<mapper namespace="com.huaheng.pc.config.shipmentPreference.mapper.ShipmentPreferenceMapper">
<resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
@@ -12,8 +12,8 @@
<result column="shipmentPickingLocRange" jdbcType="VARCHAR" property="shipmentPickingLocRange" />
<result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
<result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" />
- <result column="allowCross" jdbcType="INTEGER" property="allowCross" />
- <result column="allowQcCheckResult" jdbcType="INTEGER" property="allowQcCheckResult" />
+ <result column="allowCross" jdbcType="BIT" property="allowCross" />
+ <result column="allowQcCheckResult" jdbcType="BIT" property="allowQcCheckResult" />
<result column="showInventoryQty" jdbcType="INTEGER" property="showInventoryQty" />
<result column="groupPickup" jdbcType="INTEGER" property="groupPickup" />
<result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" />
diff --git a/src/main/resources/mybatis/shipment/ShipmentTypeMapper.xml b/src/main/resources/mybatis/config/ShipmentTypeMapper.xml
index ad1c5e6..643ea06 100644
--- a/src/main/resources/mybatis/shipment/ShipmentTypeMapper.xml
+++ b/src/main/resources/mybatis/config/ShipmentTypeMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.shipment.shipmentType.mapper.ShipmentTypeMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentType.domain.ShipmentType">
+<mapper namespace="com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper">
+ <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentType.domain.ShipmentType">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
@@ -9,7 +9,7 @@
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="referType" jdbcType="VARCHAR" property="referType" />
<result column="shipmentFlow" jdbcType="VARCHAR" property="shipmentFlow" />
- <result column="enable" jdbcType="VARCHAR" property="enable" />
+ <result column="enable" jdbcType="BIT" property="enable" />
<result column="created" jdbcType="TIMESTAMP" property="created" />
<result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
<result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -19,16 +19,12 @@
<result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
<result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
<result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, warehouseCode, companyCode, code, referType, shipmentFlow, `enable`, created,
createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
- userDef5, userDef6, userDef7, userDef8, processStamp
+ processStamp
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/task/TaskDetailMapper.xml b/src/main/resources/mybatis/task/TaskDetailMapper.xml
index 79c9499..1596503 100644
--- a/src/main/resources/mybatis/task/TaskDetailMapper.xml
+++ b/src/main/resources/mybatis/task/TaskDetailMapper.xml
@@ -21,7 +21,6 @@
<result column="fromZone" jdbcType="VARCHAR" property="fromZone" />
<result column="toZone" jdbcType="VARCHAR" property="toZone" />
<result column="attributeId" jdbcType="INTEGER" property="attributeId" />
- <result column="enable" jdbcType="INTEGER" property="enable" />
<result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
<result column="referenceId" jdbcType="INTEGER" property="referenceId" />
<result column="referenceLineId" jdbcType="INTEGER" property="referenceLineId" />
@@ -29,7 +28,6 @@
<result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
<result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
<result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
- <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
<result column="batch" jdbcType="VARCHAR" property="batch" />
<result column="lot" jdbcType="VARCHAR" property="lot" />
<result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
@@ -52,22 +50,16 @@
<result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
<result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
<result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
- <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, taskId, taskCode, taskType, internalTaskType, warehouseCode, companyCode, materialCode,
materialName, materialSpec, materialUnit, qty, fromLocation, toLocation, containerCode,
- fromZone, toZone, attributeId, `enable`, referenceCode, referenceId, referenceLineId,
+ fromZone, toZone, attributeId, referenceCode, referenceId, referenceLineId,
assignedUser, attribute1, attribute2, attribute3, attribute4, batch, lot, projectNo,
qcCheck, manufactureDate, expirationDate, agingDate, inventorySts, waveId, fromInventoryId,
toInventoryId, confirmedBy, groupNum, groupIndex, created, createdBy, lastUpdated,
- lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
- userDef7, userDef8, processStamp
+ lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/task/TaskHeaderMapper.xml b/src/main/resources/mybatis/task/TaskHeaderMapper.xml
index c634821..a88dfbc 100644
--- a/src/main/resources/mybatis/task/TaskHeaderMapper.xml
+++ b/src/main/resources/mybatis/task/TaskHeaderMapper.xml
@@ -13,7 +13,6 @@
<result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
<result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" />
<result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" />
- <result column="enable" jdbcType="INTEGER" property="enable" />
<result column="waveId" jdbcType="INTEGER" property="waveId" />
<result column="pickingCartCode" jdbcType="VARCHAR" property="pickingCartCode" />
<result column="pickingCartPos" jdbcType="VARCHAR" property="pickingCartPos" />
@@ -40,11 +39,6 @@
<result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
<result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
<result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
- <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
</resultMap>
<select id="getReceiptTask" resultType="java.util.Map">
@@ -60,11 +54,11 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, code, warehouseCode, companyCode, taskType, internalTaskType, referenceId, referenceCode,
- assignedUser, confirmedBy, `enable`, waveId, pickingCartCode, pickingCartPos, containerCode,
+ assignedUser, confirmedBy, waveId, pickingCartCode, pickingCartPos, containerCode,
startPickDateTime, endPickDateTime, rebatchLoc, finishRebatch, rebatchGroupCode,
allowRebatch, taskProcessType, rebinBench, rebined, startRebinDateTime, endRebinDateTime,
rebinedBy, exceptionCode, exceptionHandledBy, created, createdBy, lastUpdated, lastUpdatedBy,
- version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
+ version, userDef1, userDef2, userDef3,
processStamp
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/config/cycleCountPreference/add.html b/src/main/resources/templates/config/cycleCountPreference/add.html
index d7b7a4e..fce118b 100644
--- a/src/main/resources/templates/config/cycleCountPreference/add.html
+++ b/src/main/resources/templates/config/cycleCountPreference/add.html
@@ -4,32 +4,32 @@
<head th:include="include :: header"></head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-receiptPreference-add">
+ <form class="form-horizontal m" id="form-cycleCountPreference-add">
<div class="form-group">
- <label class="col-sm-3 control-label">编码：</label>
+ <label class="col-sm-3 control-label">盘点首选项编码：</label>
<div class="col-sm-8">
<input id="code" name="code" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">名称：</label>
+ <label class="col-sm-3 control-label">盘点首选项名称：</label>
<div class="col-sm-8">
<input id="name" name="name" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">入库流程：</label>
+ <label class="col-sm-3 control-label">系统提示货位：</label>
<div class="col-sm-8">
- <input id="receiptFlow" name="receiptFlow" class="form-control" type="text">
+ <input id="promptLocation" name="promptLocation" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">自动生成托盘号：</label>
+ <label class="col-sm-3 control-label">系统提示LPN：</label>
<div class="col-sm-8">
- <input id="autoAssignLPN" name="autoAssignLPN" class="form-control" type="text">
+ <input id="promptLpn" name="promptLpn" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
+ <!-- <div class="form-group">
<label class="col-sm-3 control-label">允许超收：</label>
<div class="col-sm-8">
<div class="onoffswitch">
@@ -40,101 +40,29 @@
</label>
</div>
</div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">允许超收范围：</label>
- <div class="col-sm-8">
- <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自动定位：</label>
- <div class="col-sm-8">
- <input id="autoLocate" name="autoLocate" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">RF显示未收数量：</label>
- <div class="col-sm-8">
- <input id="showOpenQty" name="showOpenQty" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">RF组车收货：</label>
- <div class="col-sm-8">
- <input id="groupPutaway" name="groupPutaway" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">人工组盘：</label>
- <div class="col-sm-8">
- <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">定位规则：</label>
- <div class="col-sm-8">
- <input id="locationRule" name="locationRule" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">空库位规则：</label>
- <div class="col-sm-8">
- <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">RF逐件收货：</label>
- <div class="col-sm-8">
- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">RF自动提交收货：</label>
- <div class="col-sm-8">
- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">abc分类：</label>
- <div class="col-sm-8">
- <input id="abcClass" name="abcClass" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">保质期（天）：</label>
- <div class="col-sm-8">
- <input id="daysToExpire" name="daysToExpire" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">临期预警（天）：</label>
- <div class="col-sm-8">
- <input id="expiringDays" name="expiringDays" class="form-control" type="text">
- </div>
- </div>
+ </div>-->
<div class="form-group">
- <label class="col-sm-3 control-label">收货预警(天)：</label>
+ <label class="col-sm-3 control-label">系统提示物料：</label>
<div class="col-sm-8">
- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
+ <input id="promptItem" name="promptItem" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">RF快速上架：</label>
+ <label class="col-sm-3 control-label">显示库存数量：</label>
<div class="col-sm-8">
- <input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text">
+ <input id="promptQuantity" name="promptQuantity" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">属性模板：</label>
+ <label class="col-sm-3 control-label">允许添加库存：</label>
<div class="col-sm-8">
- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
+ <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">快速入库：</label>
+ <label class="col-sm-3 control-label">RF逐件盘点：</label>
<div class="col-sm-8">
- <input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text">
+ <input id="countByPiece" name="countByPiece" class="form-control" type="text">
</div>
</div>
<!--<div class="form-group">
@@ -167,19 +95,19 @@
<!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
<!--</div>-->
<!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">是否有效：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<!–<input id="enable" name="enable" class="form-control" type="text">–>-->
- <!--<div class="onoffswitch">-->
- <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
- <!--<label class="onoffswitch-label" for="enable">-->
- <!--<span class="onoffswitch-inner"></span>-->
- <!--<span class="onoffswitch-switch"></span>-->
- <!--</label>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否有效：</label>
+ <div class="col-sm-8">
+ <!--<input id="enable" name="enable" class="form-control" type="text">-->
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
+ <label class="onoffswitch-label" for="enable">
+ <span class="onoffswitch-inner"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
<!--<div class="form-group"> -->
<!--<label class="col-sm-3 control-label">是否删除：</label>-->
<!--<div class="col-sm-8">-->
@@ -218,7 +146,7 @@
<!--</div>-->
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
- <button type="submit" class="btn btn-primary">提交</button>
+ <input type="submit" class="btn btn-primary" value="提交">
<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
</div>
</div>
@@ -226,8 +154,8 @@
</div>
<div th:include="include::footer"></div>
<script type="text/javascript">
- var prefix = ctx + "config/receiptPreference";
- $("#form-receiptPreference-add").validate({
+ var prefix = ctx + "config/cycleCountPreference";
+ $("#form-cycleCountPreference-add").validate({
rules:{
code:{
required: true,
@@ -235,41 +163,26 @@
name:{
required: true,
},
- autoAssignLPN:{
- required: true,
- },
- allowOverReceiving:{
- required: true,
- },
- allowOverReceivingQty:{
- required: true,
- },
- autoLocate: {
- required: true,
- },
- showOpenQty: {
- required: true,
- },
- groupPutaway: {
+ promptLocation:{
required: true,
},
- manuallyBuildLPN: {
+ promptLpn:{
required: true,
},
- checkinByPiece: {
+ promptItem:{
required: true,
},
- pieceConfirm: {
+ promptQuantity: {
required: true,
},
- allowQuickPutaway: {
+ allowAddNewInventory: {
required: true,
}
},
submitHandler: function(form) {
- var tableValue = $.common.getTableValue("#form-receiptPreference-add");
- tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
- $.operate.save(prefix + "/edit", tableValue);
+ var tableValue = $.common.getTableValue("#form-cycleCountPreference-add");
+ //tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
+ $.operate.save(prefix + "/addSave", tableValue);
}
});
</script>
diff --git a/src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html b/src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html
index 1e28904..488845a 100644
--- a/src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html
+++ b/src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.w3.org/1999/xhtml">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="gray-bg">
@@ -13,9 +13,6 @@
盘点首选项编码：<input type="text" name="code"/>
</li>
<li>
- 盘点首选项名称：<input type="text" name="name"/>
- </li>
- <li>
提示货位：<input type="text" name="promptLocation"/>
</li>
<li>
@@ -45,12 +42,9 @@
</form>
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:receiptPreference:add">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" >
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:receiptPreference:remove">
- <i class="fa fa-trash-o"></i> 删除
- </a>
</div>
<div class="col-sm-12 select-info">
@@ -94,7 +88,7 @@
},
{
field : 'promptLocation',
- title : '系统提示货位'
+ title : '系统提示货位',
},
{
field : 'promptLpn',
@@ -119,12 +113,12 @@
{
field : 'created',
title : '创建时间',
- visible : false
+ visible : true
},
{
field : 'createdBy',
title : '创建用户',
- visible : false
+ visible : true
},
{
field : 'lastUpdated',
@@ -172,8 +166,8 @@
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-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
+ actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>修改</a> ');
+ actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}]
diff --git a/src/main/resources/templates/config/cycleCountPreference/edit.html b/src/main/resources/templates/config/cycleCountPreference/edit.html
index 712e423..18607bd 100644
--- a/src/main/resources/templates/config/cycleCountPreference/edit.html
+++ b/src/main/resources/templates/config/cycleCountPreference/edit.html
@@ -4,161 +4,100 @@
<head th:include="include :: header"></head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-receiptPreference-edit" th:object="${receiptPreference}">
- <input id="id" name="id" th:field="*{id}">
+ <form class="form-horizontal m" id="form-cycleCountPreference-edit" th:object="${cycleCountPreference}">
<div class="form-group">
- <label class="col-sm-3 control-label">编码：</label>
+ <label class="col-sm-3 control-label">ID：</label>
<div class="col-sm-8">
- <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">名称：</label>
- <div class="col-sm-8">
- <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
+ <input id="id" name="id" class="form-control" type="text" th:field="*{id}" readonly="readonly">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">入库流程：</label>
+ <label class="col-sm-3 control-label">盘点首选项编码：</label>
<div class="col-sm-8">
- <input id="receiptFlow" name="receiptFlow" class="form-control" type="text" th:field="*{receiptFlow}">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自动生成托盘号：</label>
- <div class="col-sm-8">
- <input id="autoAssignLPN" name="autoAssignLPN" class="form-control" type="text" th:field="*{autoAssignLPN}">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">允许超收：</label>
- <div class="col-sm-8">
- <div class="onoffswitch">
- <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowOverReceiving"
- name="allowOverReceiving" th:field="*{allowOverReceiving}">
- <label class="onoffswitch-label" for="allowOverReceiving">
- <span class="onoffswitch-inner"></span>
- <span class="onoffswitch-switch"></span>
- </label>
- </div>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">允许超收范围：</label>
- <div class="col-sm-8">
- <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control" type="text" th:field="*{allowOverReceivingQty}">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自动定位：</label>
- <div class="col-sm-8">
- <input id="autoLocate" name="autoLocate" class="form-control" type="text" th:field="*{autoLocate}">
+ <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">RF显示未收数量：</label>
+ <label class="col-sm-3 control-label">盘点首选项名称：</label>
<div class="col-sm-8">
- <input id="showOpenQty" name="showOpenQty" class="form-control" type="text" th:field="*{showOpenQty}">
+ <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">RF组车收货：</label>
+ <label class="col-sm-3 control-label">仓库：</label>
<div class="col-sm-8">
- <input id="groupPutaway" name="groupPutaway" class="form-control" type="text" th:field="*{groupPutaway}">
+ <input id="warehouseCode" name="warehouseCode" class="form-control" type="text" th:field="*{warehouseCode}" readonly="readonly">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">人工组盘：</label>
+ <label class="col-sm-3 control-label">系统提示货位：</label>
<div class="col-sm-8">
- <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text" th:field="*{manuallyBuildLPN}">
+ <input id="promptLocation" name="promptLocation" class="form-control" type="text" th:field="*{promptLocation}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">定位规则：</label>
+ <label class="col-sm-3 control-label">系统提示LPN：</label>
<div class="col-sm-8">
- <input id="locationRule" name="locationRule" class="form-control" type="text" th:field="*{locationRule}">
+ <input id="promptLpn" name="promptLpn" class="form-control" type="text" th:field="*{promptLpn}">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">空库位规则：</label>
+ <!--<div class="form-group">
+ <label class="col-sm-3 control-label">系统提示LPN：</label>
<div class="col-sm-8">
- <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}">
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn"
+ name="promptLpn" th:field="*{promptLpn}">
+ <label class="onoffswitch-label" for="promptLpn">
+ <span class="onoffswitch-inner"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
</div>
- </div>
+ </div>-->
<div class="form-group">
- <label class="col-sm-3 control-label">RF逐件收货：</label>
+ <label class="col-sm-3 control-label">系统提示物料：</label>
<div class="col-sm-8">
- <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">
+ <input id="promptItem" name="promptItem" class="form-control" type="text" th:field="*{promptItem}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">RF自动提交收货：</label>
+ <label class="col-sm-3 control-label">显示库存数量：</label>
<div class="col-sm-8">
- <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}">
+ <input id="promptQuantity" name="promptQuantity" class="form-control" type="text" th:field="*{promptQuantity}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">abc分类：</label>
+ <label class="col-sm-3 control-label">允许添加库存：</label>
<div class="col-sm-8">
- <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}">
+ <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text" th:field="*{allowAddNewInventory}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">保质期（天）：</label>
+ <label class="col-sm-3 control-label">RF逐件盘点：</label>
<div class="col-sm-8">
- <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}">
+ <input id="countByPiece" name="countByPiece" class="form-control" type="text" th:field="*{countByPiece}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">临期预警（天）：</label>
+ <label class="col-sm-3 control-label">数据版本：</label>
<div class="col-sm-8">
- <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
+ <input id="version" name="version" class="form-control" type="text" th:field="*{version}">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">收货预警(天)：</label>
- <div class="col-sm-8">
- <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
- </div>
+ <label class="col-sm-3 control-label">创建时间：</label>
+ <div class="col-sm-8">
+ <input id="created" name="created" class="form-control" type="text" th:field="*{created}" readonly="readonly">
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">RF快速上架：</label>
- <div class="col-sm-8">
- <input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text" th:field="*{allowQuickPutaway}">
- </div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">属性模板：</label>
- <div class="col-sm-8">
- <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">
- </div>
+ <label class="col-sm-3 control-label">创建者：</label>
+ <div class="col-sm-8">
+ <input id="createdBy" name="createdBy" class="form-control" type="text" th:field="*{createdBy}" readonly="readonly">
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">快速入库：</label>
- <div class="col-sm-8">
- <input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text" th:field="*{useQuickCheckIn}">
- </div>
</div>
- <!--<div class="form-group">
- <label class="col-sm-3 control-label">数据版本：</label>
- <div class="col-sm-8">
- <input id="version" name="version" class="form-control" type="text">
- </div>
- </div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建时间：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="created" name="created" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建者：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
<!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+ <!--<label class="col-sm-3 control-label">更新时间：</label>-->
<!--<div class="col-sm-8">-->
<!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
<!--</div>-->
@@ -169,19 +108,25 @@
<!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
<!--</div>-->
<!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">是否有效：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<!–<input id="enable" name="enable" class="form-control" type="text">–>-->
- <!--<div class="onoffswitch">-->
- <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
- <!--<label class="onoffswitch-label" for="enable">-->
- <!--<span class="onoffswitch-inner"></span>-->
- <!--<span class="onoffswitch-switch"></span>-->
- <!--</label>-->
- <!--</div>-->
- <!--</div>-->
- <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理标记：</label>
+ <div class="col-sm-8">
+ <input id="processStamp" name="processStamp" class="form-control" type="text" th:field="*{processStamp}" />
+ </div>
+ </div>
+ <!--<div class="form-group">
+ <label class="col-sm-3 control-label">是否有效：</label>
+ <div class="col-sm-8">
+ <!–<input id="enable" name="enable" class="form-control" type="text">–>
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
+ <label class="onoffswitch-label" for="enable">
+ <span class="onoffswitch-inner"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>-->
<!--<div class="form-group"> -->
<!--<label class="col-sm-3 control-label">是否删除：</label>-->
<!--<div class="col-sm-8">-->
@@ -220,7 +165,7 @@
<!--</div>-->
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
- <button type="submit" class="btn btn-primary">提交</button>
+ <input type="submit" class="btn btn-primary" value="提交">
<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
</div>
</div>
@@ -228,8 +173,8 @@
</div>
<div th:include="include::footer"></div>
<script type="text/javascript">
- var prefix = ctx + "config/receiptPreference";
- $("#form-receiptPreference-edit").validate({
+ var prefix = ctx + "config/cycleCountPreference";
+ $("#form-cycleCountPreference-edit").validate({
rules:{
code:{
required: true,
@@ -237,40 +182,28 @@
name:{
required: true,
},
- autoAssignLPN:{
- required: true,
- },
- allowOverReceiving:{
- required: true,
- },
- allowOverReceivingQty:{
- required: true,
- },
- autoLocate: {
- required: true,
- },
- showOpenQty: {
+ warehouseCode:{
required: true,
},
- groupPutaway: {
+ promptLocation:{
required: true,
},
- manuallyBuildLPN: {
+ promptLpn:{
required: true,
},
- checkinByPiece: {
+ promptItem: {
required: true,
},
- pieceConfirm: {
+ promptQuantity: {
required: true,
},
- allowQuickPutaway: {
+ allowAddNewInventory: {
required: true,
}
},
submitHandler: function(form) {
- var tableValue = $.common.getTableValue("#form-receiptPreference-edi");
- tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
+ var tableValue = $.common.getTableValue("#form-cycleCountPreference-edit");
+ /*tableValue = formValueReplace(tableValue, "id", $("input[name='id']").is(':checked'));*/
$.operate.save(prefix + "/edit", tableValue);
}
});
diff --git a/src/main/resources/templates/config/filterConfigDetail/add.html b/src/main/resources/templates/config/filterConfigDetail/add.html
index cd6d562..f54964d 100644
--- a/src/main/resources/templates/config/filterConfigDetail/add.html
+++ b/src/main/resources/templates/config/filterConfigDetail/add.html
@@ -39,19 +39,35 @@
<div class="form-group">
<label class="col-sm-3 control-label">全SQL：</label>
<div class="col-sm-8">
- <input id="statement" name="statement" class="description" type="text">
+ <input id="statement" name="statement" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否系统创建：</label>
<div class="col-sm-8">
- <input id="systemCreated" name="systemCreated" class="form-control" type="text">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated1" name="systemCreated" value="true" checked="checked"
+ class="radio_select">
+ <label for="systemCreated1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated2" name="systemCreated" value="false">
+ <label for="systemCreated2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否自定义SQL：</label>
<div class="col-sm-8">
- <input id="customSql" name="customSql" class="form-control" type="text">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="customSql1" name="customSql" value="true" checked="checked"
+ class="radio_select">
+ <label for="customSql1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="customSql2" name="customSql" value="false">
+ <label for="customSql2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
diff --git a/src/main/resources/templates/config/filterConfigDetail/edit.html b/src/main/resources/templates/config/filterConfigDetail/edit.html
index cdd09aa..abca232 100644
--- a/src/main/resources/templates/config/filterConfigDetail/edit.html
+++ b/src/main/resources/templates/config/filterConfigDetail/edit.html
@@ -46,13 +46,29 @@
<div class="form-group">
<label class="col-sm-3 control-label">是否系统创建：</label>
<div class="col-sm-8">
- <input id="systemCreated" name="systemCreated" class="form-control" type="text" th:field="*{systemCreated}">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated1" name="systemCreated" value="true" th:field="*{systemCreated}"
+ class="radio_select">
+ <label for="systemCreated1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated2" name="systemCreated" value="false" th:field="*{systemCreated}">
+ <label for="systemCreated2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否自定义SQL：</label>
<div class="col-sm-8">
- <input id="customSql" name="customSql" class="form-control" type="text" th:field="*{customSql}">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="customSql1" name="customSql" value="true" th:field="*{customSql}"
+ class="radio_select">
+ <label for="customSql1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="customSql2" name="customSql" value="false" th:field="*{customSql}">
+ <label for="customSql2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
diff --git a/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html b/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html
index 01d22fa..b26417d 100644
--- a/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html
+++ b/src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html
@@ -83,7 +83,27 @@
},
{
field : 'systemCreated',
- title : '是否系统创建'
+ title : '是否系统创建',
+ formatter: function (value, item, index) {
+ if (value==true) {
+ return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
+ }
+ else if (value==false) {
+ return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
+ }
+ }
+ },
+ {
+ field : 'customSql',
+ title : '是否自定义SQL',
+ formatter: function (value, item, index) {
+ if (value==true) {
+ return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
+ }
+ else if (value==false) {
+ return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
+ }
+ }
},
{
field : 'version',
diff --git a/src/main/resources/templates/config/filterConfigHeader/add.html b/src/main/resources/templates/config/filterConfigHeader/add.html
index aec605f..edf4339 100644
--- a/src/main/resources/templates/config/filterConfigHeader/add.html
+++ b/src/main/resources/templates/config/filterConfigHeader/add.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
@@ -35,7 +35,26 @@
<input id="description" name="description" class="form-control" type="text">
</div>
</div>
-
+ <!--<div class="form-group">-->
+ <!--<label class="col-sm-3 control-label">是否系统创建：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="systemCreated" name="systemCreated" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否系统创建：</label>
+ <div class="col-sm-8">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated1" name="systemCreated" value="true" checked="checked"
+ class="radio_select">
+ <label for="systemCreated1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated2" name="systemCreated" value="false">
+ <label for="systemCreated2">否</label>
+ </div>
+ </div>
+ </div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
@@ -48,18 +67,18 @@
<script type="text/javascript">
var prefix = ctx + "config/filterConfigHeader";
$("#form-filterConfigHeader-add").validate({
- rules:{
- moduleType:{
- required:true,
+ rules: {
+ moduleType: {
+ required: true,
},
- recordType:{
- required:true,
+ recordType: {
+ required: true,
},
- filterCode:{
- required:true,
+ filterCode: {
+ required: true,
},
},
- submitHandler: function(form) {
+ submitHandler: function (form) {
// $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
var tableValue = $.common.getTableValue("#form-filterConfigHeader-add");
$.operate.save(prefix + "/add", tableValue);
diff --git a/src/main/resources/templates/config/filterConfigHeader/edit.html b/src/main/resources/templates/config/filterConfigHeader/edit.html
index 8eb2fb1..5018cda 100644
--- a/src/main/resources/templates/config/filterConfigHeader/edit.html
+++ b/src/main/resources/templates/config/filterConfigHeader/edit.html
@@ -36,6 +36,32 @@
<input id="description" name="description" class="form-control" type="text" th:field="*{description}">
</div>
</div>
+ <!--<div class="form-group">-->
+ <!--<label class="col-sm-3 control-label">是否系统创建：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<div class="onoffswitch">-->
+ <!--<input type="checkbox" th:checked="${systemCreated}" class="onoffswitch-checkbox" id="systemCreated" name="systemCreated">-->
+ <!--<label class="onoffswitch-label" for="systemCreated">-->
+ <!--<span class="onoffswitch-inner"></span>-->
+ <!--<span class="onoffswitch-switch"></span>-->
+ <!--</label>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否系统创建：</label>
+ <div class="col-sm-8">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated1" name="systemCreated" value="true" th:field="*{systemCreated}"
+ class="radio_select">
+ <label for="systemCreated1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="systemCreated2" name="systemCreated" value="false" th:field="*{systemCreated}">
+ <label for="systemCreated2">否</label>
+ </div>
+ </div>
+ </div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
diff --git a/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html b/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html
index 270b270..7d45191 100644
--- a/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html
+++ b/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html
@@ -112,8 +112,16 @@
title : '描述'
},
{
- field : 'description',
- title : '是否系统创建'
+ field : 'systemCreated',
+ title : '是否系统创建',
+ formatter: function (value, item, index) {
+ if (value==true) {
+ return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
+ }
+ else if (value==false) {
+ return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
+ }
+ }
},
{
field : 'version',
diff --git a/src/main/resources/templates/config/shipmentPreference/add.html b/src/main/resources/templates/config/shipmentPreference/add.html
index eeecad9..a50641d 100644
--- a/src/main/resources/templates/config/shipmentPreference/add.html
+++ b/src/main/resources/templates/config/shipmentPreference/add.html
@@ -50,13 +50,29 @@
<div class="form-group">
<label class="col-sm-3 control-label">允许越库：</label>
<div class="col-sm-8">
- <input id="allowCross" name="allowCross" class="form-control" type="text">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowCross1" name="allowCross" value="true" checked="checked"
+ class="radio_select">
+ <label for="allowCross1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowCross2" name="allowCross" value="false">
+ <label for="allowCross2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">允许未质检的出库：</label>
<div class="col-sm-8">
- <input id="allowQcCheckResult" name="allowQcCheckResult" class="form-control" type="text">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowQcCheckResult1" name="allowQcCheckResult" value="true" checked="checked"
+ class="radio_select">
+ <label for="allowQcCheckResult1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowQcCheckResult2" name="allowQcCheckResult" value="false">
+ <label for="allowQcCheckResult2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
diff --git a/src/main/resources/templates/config/shipmentPreference/edit.html b/src/main/resources/templates/config/shipmentPreference/edit.html
index fd3ea67..bfe8d46 100644
--- a/src/main/resources/templates/config/shipmentPreference/edit.html
+++ b/src/main/resources/templates/config/shipmentPreference/edit.html
@@ -51,14 +51,29 @@
<div class="form-group">
<label class="col-sm-3 control-label">允许越库：</label>
<div class="col-sm-8">
- <input id="allowCross" name="allowCross" class="form-control" type="text" th:field="*{allowCross}">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowCross1" name="allowCross" value="true" th:field="*{allowCross}"
+ class="radio_select">
+ <label for="allowCross1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowCross2" name="allowCross" value="false" th:field="*{allowCross}">
+ <label for="allowCross2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">允许未质检的出库：</label>
<div class="col-sm-8">
- <input id="allowQcCheckResult" name="allowQcCheckResult" class="form-control"
- type="text" th:field="*{allowQcCheckResult}">
+ <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowQcCheckResult1" name="allowQcCheckResult" value="true" th:field="*{allowQcCheckResult}"
+ class="radio_select">
+ <label for="allowQcCheckResult1">是</label>
+ </div>
+ <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
+ <input type="radio" id="allowQcCheckResult2" name="allowQcCheckResult" value="false" th:field="*{allowQcCheckResult}">
+ <label for="allowQcCheckResult2">否</label>
+ </div>
</div>
</div>
<div class="form-group">
diff --git a/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html b/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
index 97ef408..6782f94 100644
--- a/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
+++ b/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
@@ -102,11 +102,27 @@
},
{
field : 'allowCross',
- title : '允许越库'
+ title : '允许越库',
+ formatter: function (value, item, index) {
+ if (value==true) {
+ return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
+ }
+ else if (value==false) {
+ return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
+ }
+ }
},
{
field : 'allowQcCheckResult',
- title : '允许未质检的出库'
+ title : '允许未质检的出库',
+ formatter: function (value, item, index) {
+ if (value==true) {
+ return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
+ }
+ else if (value==false) {
+ return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
+ }
+ }
},
{
field : 'showInventoryQty',
diff --git a/src/main/resources/templates/config/shipmentType/add.html b/src/main/resources/templates/config/shipmentType/add.html
new file mode 100644
index 0000000..e35d3a8
--- /dev/null
+++ b/src/main/resources/templates/config/shipmentType/add.html
@@ -0,0 +1,179 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-receiptType-add">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">编码：</label>
+ <div class="col-sm-8">
+ <input id="code" name="code" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">名称：</label>
+ <div class="col-sm-8">
+ <input id="name" name="name" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">货主编码：</label>
+ <div class="col-sm-8">
+ <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
+ <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">关联订单类型：</label>
+ <div class="col-sm-8">
+ <input id="referType" name="referType" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">出库流程：</label>
+ <div class="col-sm-8">
+ <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}">
+ <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <!--<div class="form-group">
+ <label class="col-sm-3 control-label">数据版本：</label>
+ <div class="col-sm-8">
+ <input id="version" name="version" class="form-control" type="text">
+ </div>
+ </div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="created" name="created" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">创建者：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">更新者：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">是否有效：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<!–<input id="enable" name="enable" class="form-control" type="text">–>-->
+ <!--<div class="onoffswitch">-->
+ <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
+ <!--<label class="onoffswitch-label" for="enable">-->
+ <!--<span class="onoffswitch-inner"></span>-->
+ <!--<span class="onoffswitch-switch"></span>-->
+ <!--</label>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">是否删除：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否启用：</label>
+ <div class="col-sm-8">
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
+ <label class="onoffswitch-label" for="enable">
+ <span class="onoffswitch-inner"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="form-control-static col-sm-offset-9">
+ <button type="submit" class="btn btn-primary">提交</button>
+ <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+ </div>
+ </div>
+ </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+ var prefix = ctx + "config/shipmentType";
+ $("#form-receiptType-add").validate({
+ rules:{
+ code:{
+ required:true,
+ },
+ name:{
+ required:true,
+ },
+ shipmentFlow:{
+ required:true,
+ },
+ },
+ submitHandler: function(form) {
+ // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
+ var tableValue = $.common.getTableValue("#form-receiptType-add");
+ tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
+ tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
+ tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
+ $.operate.save(prefix + "/add", tableValue);
+ }
+ });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/config/shipmentType/edit.html b/src/main/resources/templates/config/shipmentType/edit.html
new file mode 100644
index 0000000..1e6c3c2
--- /dev/null
+++ b/src/main/resources/templates/config/shipmentType/edit.html
@@ -0,0 +1,181 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-shipmentType-edit" th:object="${shipmentType}">
+ <input name="id" type="hidden" th:field="*{id}">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">编码：</label>
+ <div class="col-sm-8">
+ <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">名字：</label>
+ <div class="col-sm-8">
+ <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">货主编码：</label>
+ <div class="col-sm-8">
+ <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"
+ th:field="*{companyCode}">
+ <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">关联订单类型：</label>
+ <div class="col-sm-8">
+ <input id="referType" name="referType" class="form-control" type="text" th:field="*{referType}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">出库流程：</label>
+ <div class="col-sm-8">
+ <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}" th:field="*{receiptFlow}">
+ <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
+ </select>
+ </div>
+ </div>
+ <!--<div class="form-group">
+ <label class="col-sm-3 control-label">数据版本：</label>
+ <div class="col-sm-8">
+ <input id="version" name="version" class="form-control" type="text">
+ </div>
+ </div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="created" name="created" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">创建者：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">更新者：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">是否有效：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<!–<input id="enable" name="enable" class="form-control" type="text">–>-->
+ <!--<div class="onoffswitch">-->
+ <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
+ <!--<label class="onoffswitch-label" for="enable">-->
+ <!--<span class="onoffswitch-inner"></span>-->
+ <!--<span class="onoffswitch-switch"></span>-->
+ <!--</label>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">是否删除：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <!--<div class="form-group"> -->
+ <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+ <!--<div class="col-sm-8">-->
+ <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否启用：</label>
+ <div class="col-sm-8">
+ <div class="onoffswitch">
+ <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
+ <label class="onoffswitch-label" for="enable">
+ <span class="onoffswitch-inner"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="form-control-static col-sm-offset-9">
+ <button type="submit" class="btn btn-primary">提交</button>
+ <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+ </div>
+ </div>
+ </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+ var prefix = ctx + "config/shipmentType";
+ $("#form-receiptType-edit").validate({
+ rules:{
+ code:{
+ required:true,
+ },
+ name:{
+ required:true,
+ },
+ shipmentFlow:{
+ required:true,
+ },
+ },
+ submitHandler: function(form) {
+ // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
+ var tableValue = $.common.getTableValue("#form-shipmentType-edit");
+ tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
+ tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
+ tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
+ $.operate.save(prefix + "/edit", tableValue);
+ }
+ });
+</script>
+</body>
+</html>
diff --git a/src/main/resources/templates/config/shipmentType/shipmentType.html b/src/main/resources/templates/config/shipmentType/shipmentType.html
new file mode 100644
index 0000000..78e1cfe
--- /dev/null
+++ b/src/main/resources/templates/config/shipmentType/shipmentType.html
@@ -0,0 +1,162 @@
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 select-info">
+ <form id="shipmentType-form">
+ <div class="select-list">
+ <ul>
+ <li>
+ 编码：<input type="text" name="code"/>
+ </li>
+ <li>
+ 名称：<input type="text" name="name"/>
+ </li>
+ <li class="time">
+ <label>创建时间： </label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i> 导出</a>-->
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <div class="btn-group hidden-xs" id="toolbar" role="group">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:shipmentType:add">
+ <i class="fa fa-plus"></i> 新增
+ </a>
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:shipmentType:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>
+ </div>
+
+ <div class="col-sm-12 select-info">
+ <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+ </div>
+ <div>
+ </div>
+ <div th:include="include :: footer"></div>
+ <script th:inline="javascript">
+ var editFlag = [[${@permission.hasPermi('config:shipmentType:edit')}]];
+ var removeFlag = [[${@permission.hasPermi('config:shipmentType:remove')}]];
+ var prefix = ctx + "config/shipmentType";
+ var datas = [[${@dict.getType('sys_normal_disable')}]];
+ $(function() {
+ var options = {
+ url: prefix + "/list",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/remove",
+ modalName: "出库单类型",
+ search: false,
+ columns: [{
+ checkbox: true
+ },
+ {
+ field : 'id',
+ title : '出库单类型Id'
+ },
+ {
+ field : 'code',
+ title : '类型编码'
+ },
+ {
+ field : 'name',
+ title : '名称'
+ },
+ {
+ field : 'companyCode',
+ title : '货主编码',
+ visible:false
+ },
+ {
+ field : 'warehouseCode',
+ title : '仓库编码',
+ visible:false
+ },
+ {
+ field : 'referType',
+ title : '关联订单类型'
+ },
+ {
+ field : 'shipmentFlow',
+ title : '出库流程'
+ },
+ {
+ field : 'created',
+ title : '创建时间'
+ },
+ {
+ field : 'createdBy',
+ title : '创建用户'
+ },
+ {
+ field : 'lastUpdated',
+ title : '更新时间'
+ },
+ {
+ field : 'lastUpdatedBy',
+ title : '更新用户'
+ },
+ {
+ field : 'enable',
+ title : '是否有效',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(datas, value);
+ },
+ align: 'center',
+ },
+ {
+ field : 'version',
+ title : '数据版本',
+ visible : false
+ },
+ {
+ field : 'processStamp',
+ title : '处理标记',
+ visible : false
+ },
+ {
+ field : 'userDef1',
+ title : '自定义字段1' ,
+ visible:false
+ },
+ {
+ field : 'userDef2',
+ title : '自定义字段2' ,
+ visible:false
+ },
+ {
+ field : 'userDef3',
+ title : '自定义字段3' ,
+ visible:false
+ },
+ {
+ field : 'userDef4',
+ title : '自定义字段4' ,
+ visible:false
+ },
+ {
+ title: '操作',
+ 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-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/inventory/inventoryHeader/transfer.html b/src/main/resources/templates/inventory/inventoryHeader/transfer.html
index 45d8363..ca2ce2d 100644
--- a/src/main/resources/templates/inventory/inventoryHeader/transfer.html
+++ b/src/main/resources/templates/inventory/inventoryHeader/transfer.html
@@ -34,7 +34,7 @@
</div>
<div th:include="include::footer"></div>
<script type="text/javascript">
- var prefix = ctx + "inventory/inventorytransfer"
+ var prefix = ctx + "inventory/inventoryHeader"
$("#form-inventory-transfer").validate({
rules:{
sourceLocation:{