wms / wms_henanqingyuan · Commits

Commit eddd6905e58eda31b4f47e3b00f062443369fae9

Authored by mahuandong
2 parents 75e17445 5e2ccac4
develop

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	.idea/workspace.xml
Inline Side-by-side
Showing 42 changed files with 1990 additions and 724 deletions
.idea/workspace.xml
  View file @eddd690
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="">  
5 - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiving.html" afterDir="false" />  
8 - <change afterPath="$PROJECT_DIR$/wms_v2.sql" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> 4 + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
15 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
16 - <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" />  
17 - <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" />  
18 - <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" />  
19 - <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" />  
20 - <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" />  
21 - <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" />  
22 - <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" />  
23 - <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" />  
24 - <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" />  
25 - <change beforePath="$PROJECT_DIR$/src/main/resources/application-druid.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-druid.properties" afterDir="false" />  
26 - <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" />  
27 - <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" />  
28 - <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" />  
29 - <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" />  
30 - <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" /> 6 + <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" />
  7 + <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" />
  8 + <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" />
  9 + <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" />
  10 + <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" />
  11 + <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" />
  12 + <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" />
  13 + <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" />
31 </list> 14 </list>
32 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
33 <option name="SHOW_DIALOG" value="false" /> 16 <option name="SHOW_DIALOG" value="false" />
@@ -36,60 +19,464 @@ @@ -36,60 +19,464 @@
36 <option name="LAST_RESOLUTION" value="IGNORE" /> 19 <option name="LAST_RESOLUTION" value="IGNORE" />
37 </component> 20 </component>
38 <component name="DatabaseView"> 21 <component name="DatabaseView">
39 - <option name="SHOW_INTERMEDIATE" value="true" /> 22 + <option name="SHOW_INTERMEDIATE" value="false" />
40 <option name="GROUP_DATA_SOURCES" value="true" /> 23 <option name="GROUP_DATA_SOURCES" value="true" />
41 <option name="GROUP_SCHEMA" value="true" /> 24 <option name="GROUP_SCHEMA" value="true" />
42 <option name="GROUP_CONTENTS" value="false" /> 25 <option name="GROUP_CONTENTS" value="false" />
43 <option name="SORT_POSITIONED" value="false" /> 26 <option name="SORT_POSITIONED" value="false" />
44 <option name="SHOW_EMPTY_GROUPS" value="false" /> 27 <option name="SHOW_EMPTY_GROUPS" value="false" />
45 - <option name="AUTO_SCROLL_FROM_SOURCE" value="false" /> 28 + <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
46 <option name="HIDDEN_KINDS"> 29 <option name="HIDDEN_KINDS">
47 <set /> 30 <set />
48 </option> 31 </option>
49 <expand> 32 <expand>
50 <path> 33 <path>
51 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> 34 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
52 - <item name="@localhost" type="feb32156:DbDataSourceImpl" /> 35 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
53 </path> 36 </path>
54 <path> 37 <path>
55 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> 38 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
56 - <item name="@localhost" type="feb32156:DbDataSourceImpl" /> 39 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
57 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> 40 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
58 </path> 41 </path>
59 <path> 42 <path>
60 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> 43 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
61 - <item name="@localhost" type="feb32156:DbDataSourceImpl" /> 44 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
62 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> 45 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
63 - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />  
64 - </path>  
65 - <path>  
66 - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />  
67 - <item name="@localhost" type="feb32156:DbDataSourceImpl" />  
68 - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />  
69 - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />  
70 - <item name="receipt_container_header: table" type="285a2a93:MysqlImplModel$Table" /> 46 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
71 </path> 47 </path>
72 </expand> 48 </expand>
73 <select /> 49 <select />
74 </component> 50 </component>
  51 + <component name="FileEditorManager">
  52 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  53 + <file pinned="false" current-in-tab="false">
  54 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  55 + <provider selected="true" editor-type-id="text-editor">
  56 + <state relative-caret-position="236">
  57 + <caret line="36" selection-start-line="36" selection-end-line="36" />
  58 + </state>
  59 + </provider>
  60 + </entry>
  61 + </file>
  62 + <file pinned="false" current-in-tab="false">
  63 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state relative-caret-position="468">
  66 + <caret line="37" selection-start-line="37" selection-end-line="37" />
  67 + </state>
  68 + </provider>
  69 + </entry>
  70 + </file>
  71 + <file pinned="false" current-in-tab="false">
  72 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  73 + <provider selected="true" editor-type-id="text-editor">
  74 + <state relative-caret-position="340">
  75 + <caret line="24" column="112" selection-start-line="24" selection-start-column="112" selection-end-line="24" selection-end-column="112" />
  76 + </state>
  77 + </provider>
  78 + </entry>
  79 + </file>
  80 + <file pinned="false" current-in-tab="false">
  81 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
  82 + <provider selected="true" editor-type-id="text-editor">
  83 + <state relative-caret-position="240">
  84 + <caret line="15" column="102" selection-start-line="15" selection-start-column="102" selection-end-line="15" selection-end-column="102" />
  85 + </state>
  86 + </provider>
  87 + </entry>
  88 + </file>
  89 + <file pinned="false" current-in-tab="false">
  90 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  91 + <provider selected="true" editor-type-id="text-editor">
  92 + <state relative-caret-position="2">
  93 + <caret line="440" column="18" lean-forward="true" selection-start-line="440" selection-start-column="18" selection-end-line="440" selection-end-column="18" />
  94 + </state>
  95 + </provider>
  96 + </entry>
  97 + </file>
  98 + <file pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
  100 + <provider selected="true" editor-type-id="text-editor">
  101 + <state relative-caret-position="426">
  102 + <caret line="366" column="57" selection-start-line="366" selection-start-column="57" selection-end-line="366" selection-end-column="57" />
  103 + </state>
  104 + </provider>
  105 + </entry>
  106 + </file>
  107 + <file pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
  109 + <provider selected="true" editor-type-id="text-editor">
  110 + <state relative-caret-position="120">
  111 + <caret line="11" selection-start-line="11" selection-end-line="11" />
  112 + </state>
  113 + </provider>
  114 + </entry>
  115 + </file>
  116 + <file pinned="false" current-in-tab="true">
  117 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
  118 + <provider selected="true" editor-type-id="text-editor">
  119 + <state relative-caret-position="280">
  120 + <caret line="14" column="77" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" />
  121 + </state>
  122 + </provider>
  123 + </entry>
  124 + </file>
  125 + <file pinned="false" current-in-tab="false">
  126 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  127 + <provider selected="true" editor-type-id="text-editor">
  128 + <state relative-caret-position="-72" />
  129 + </provider>
  130 + </entry>
  131 + </file>
  132 + </leaf>
  133 + </component>
75 <component name="FileTemplateManagerImpl"> 134 <component name="FileTemplateManagerImpl">
76 <option name="RECENT_TEMPLATES"> 135 <option name="RECENT_TEMPLATES">
77 <list> 136 <list>
  137 + <option value="CSS File" />
78 <option value="Class" /> 138 <option value="Class" />
  139 + <option value="HTML File" />
79 </list> 140 </list>
80 </option> 141 </option>
81 </component> 142 </component>
82 <component name="Git.Settings"> 143 <component name="Git.Settings">
83 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 144 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
84 - <option name="ROOT_SYNC" value="DONT_SYNC" />  
85 </component> 145 </component>
86 - <component name="ProjectId" id="1QAvYF2l5KfXJOdWwEQu94p1EwU" /> 146 + <component name="IdeDocumentHistory">
  147 + <option name="CHANGED_PATHS">
  148 + <list>
  149 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" />
  150 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
  151 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
  152 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
  153 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
  154 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
  155 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" />
  156 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
  157 + </list>
  158 + </option>
  159 + </component>
  160 + <component name="MavenImportPreferences">
  161 + <option name="importingSettings">
  162 + <MavenImportingSettings>
  163 + <option name="importAutomatically" value="true" />
  164 + </MavenImportingSettings>
  165 + </option>
  166 + </component>
  167 + <component name="ProjectFrameBounds" extendedState="6">
  168 + <option name="x" value="-9" />
  169 + <option name="y" value="-9" />
  170 + <option name="width" value="1938" />
  171 + <option name="height" value="1048" />
  172 + </component>
  173 + <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
87 <component name="ProjectLevelVcsManager"> 174 <component name="ProjectLevelVcsManager">
88 <ConfirmationsSetting value="2" id="Add" /> 175 <ConfirmationsSetting value="2" id="Add" />
89 </component> 176 </component>
  177 + <component name="ProjectView">
  178 + <navigator proportions="" version="1">
  179 + <foldersAlwaysOnTop value="true" />
  180 + </navigator>
  181 + <panes>
  182 + <pane id="PackagesPane" />
  183 + <pane id="Scope" />
  184 + <pane id="ProjectPane">
  185 + <subPane>
  186 + <expand>
  187 + <path>
  188 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  189 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  190 + </path>
  191 + <path>
  192 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  193 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  194 + <item name=".idea" type="462c0819:PsiDirectoryNode" />
  195 + </path>
  196 + <path>
  197 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  198 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  199 + <item name="src" type="462c0819:PsiDirectoryNode" />
  200 + </path>
  201 + <path>
  202 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  203 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  204 + <item name="src" type="462c0819:PsiDirectoryNode" />
  205 + <item name="main" type="462c0819:PsiDirectoryNode" />
  206 + </path>
  207 + <path>
  208 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  209 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  210 + <item name="src" type="462c0819:PsiDirectoryNode" />
  211 + <item name="main" type="462c0819:PsiDirectoryNode" />
  212 + <item name="java" type="462c0819:PsiDirectoryNode" />
  213 + </path>
  214 + <path>
  215 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  216 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  217 + <item name="src" type="462c0819:PsiDirectoryNode" />
  218 + <item name="main" type="462c0819:PsiDirectoryNode" />
  219 + <item name="java" type="462c0819:PsiDirectoryNode" />
  220 + <item name="com" type="462c0819:PsiDirectoryNode" />
  221 + </path>
  222 + <path>
  223 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  224 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  225 + <item name="src" type="462c0819:PsiDirectoryNode" />
  226 + <item name="main" type="462c0819:PsiDirectoryNode" />
  227 + <item name="java" type="462c0819:PsiDirectoryNode" />
  228 + <item name="com" type="462c0819:PsiDirectoryNode" />
  229 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  230 + </path>
  231 + <path>
  232 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  233 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  234 + <item name="src" type="462c0819:PsiDirectoryNode" />
  235 + <item name="main" type="462c0819:PsiDirectoryNode" />
  236 + <item name="java" type="462c0819:PsiDirectoryNode" />
  237 + <item name="com" type="462c0819:PsiDirectoryNode" />
  238 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  239 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  240 + </path>
  241 + <path>
  242 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  243 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  244 + <item name="src" type="462c0819:PsiDirectoryNode" />
  245 + <item name="main" type="462c0819:PsiDirectoryNode" />
  246 + <item name="java" type="462c0819:PsiDirectoryNode" />
  247 + <item name="com" type="462c0819:PsiDirectoryNode" />
  248 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  249 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  250 + <item name="config" type="462c0819:PsiDirectoryNode" />
  251 + </path>
  252 + <path>
  253 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  254 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  255 + <item name="src" type="462c0819:PsiDirectoryNode" />
  256 + <item name="main" type="462c0819:PsiDirectoryNode" />
  257 + <item name="java" type="462c0819:PsiDirectoryNode" />
  258 + <item name="com" type="462c0819:PsiDirectoryNode" />
  259 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  260 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  261 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  262 + </path>
  263 + <path>
  264 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  265 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  266 + <item name="src" type="462c0819:PsiDirectoryNode" />
  267 + <item name="main" type="462c0819:PsiDirectoryNode" />
  268 + <item name="java" type="462c0819:PsiDirectoryNode" />
  269 + <item name="com" type="462c0819:PsiDirectoryNode" />
  270 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  271 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  272 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  273 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  274 + </path>
  275 + <path>
  276 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  277 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  278 + <item name="src" type="462c0819:PsiDirectoryNode" />
  279 + <item name="main" type="462c0819:PsiDirectoryNode" />
  280 + <item name="java" type="462c0819:PsiDirectoryNode" />
  281 + <item name="com" type="462c0819:PsiDirectoryNode" />
  282 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  283 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  284 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  285 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  286 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  287 + </path>
  288 + <path>
  289 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  290 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  291 + <item name="src" type="462c0819:PsiDirectoryNode" />
  292 + <item name="main" type="462c0819:PsiDirectoryNode" />
  293 + <item name="java" type="462c0819:PsiDirectoryNode" />
  294 + <item name="com" type="462c0819:PsiDirectoryNode" />
  295 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  296 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  297 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  298 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  299 + <item name="service" type="462c0819:PsiDirectoryNode" />
  300 + </path>
  301 + <path>
  302 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  303 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  304 + <item name="src" type="462c0819:PsiDirectoryNode" />
  305 + <item name="main" type="462c0819:PsiDirectoryNode" />
  306 + <item name="java" type="462c0819:PsiDirectoryNode" />
  307 + <item name="com" type="462c0819:PsiDirectoryNode" />
  308 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  309 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  310 + <item name="task" type="462c0819:PsiDirectoryNode" />
  311 + </path>
  312 + <path>
  313 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  314 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  315 + <item name="src" type="462c0819:PsiDirectoryNode" />
  316 + <item name="main" type="462c0819:PsiDirectoryNode" />
  317 + <item name="java" type="462c0819:PsiDirectoryNode" />
  318 + <item name="com" type="462c0819:PsiDirectoryNode" />
  319 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  320 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  321 + <item name="task" type="462c0819:PsiDirectoryNode" />
  322 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  323 + </path>
  324 + <path>
  325 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  326 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  327 + <item name="src" type="462c0819:PsiDirectoryNode" />
  328 + <item name="main" type="462c0819:PsiDirectoryNode" />
  329 + <item name="java" type="462c0819:PsiDirectoryNode" />
  330 + <item name="com" type="462c0819:PsiDirectoryNode" />
  331 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  332 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  333 + <item name="task" type="462c0819:PsiDirectoryNode" />
  334 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  335 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  336 + </path>
  337 + <path>
  338 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  339 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  340 + <item name="src" type="462c0819:PsiDirectoryNode" />
  341 + <item name="main" type="462c0819:PsiDirectoryNode" />
  342 + <item name="java" type="462c0819:PsiDirectoryNode" />
  343 + <item name="com" type="462c0819:PsiDirectoryNode" />
  344 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  345 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  346 + <item name="task" type="462c0819:PsiDirectoryNode" />
  347 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  348 + <item name="domain" type="462c0819:PsiDirectoryNode" />
  349 + </path>
  350 + <path>
  351 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  352 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  353 + <item name="src" type="462c0819:PsiDirectoryNode" />
  354 + <item name="main" type="462c0819:PsiDirectoryNode" />
  355 + <item name="java" type="462c0819:PsiDirectoryNode" />
  356 + <item name="com" type="462c0819:PsiDirectoryNode" />
  357 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  358 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  359 + <item name="task" type="462c0819:PsiDirectoryNode" />
  360 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  361 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
  362 + </path>
  363 + <path>
  364 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  365 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  366 + <item name="src" type="462c0819:PsiDirectoryNode" />
  367 + <item name="main" type="462c0819:PsiDirectoryNode" />
  368 + <item name="java" type="462c0819:PsiDirectoryNode" />
  369 + <item name="com" type="462c0819:PsiDirectoryNode" />
  370 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  371 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  372 + <item name="task" type="462c0819:PsiDirectoryNode" />
  373 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  374 + <item name="service" type="462c0819:PsiDirectoryNode" />
  375 + </path>
  376 + <path>
  377 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  378 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  379 + <item name="src" type="462c0819:PsiDirectoryNode" />
  380 + <item name="main" type="462c0819:PsiDirectoryNode" />
  381 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  382 + </path>
  383 + <path>
  384 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  385 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  386 + <item name="src" type="462c0819:PsiDirectoryNode" />
  387 + <item name="main" type="462c0819:PsiDirectoryNode" />
  388 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  389 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  390 + </path>
  391 + <path>
  392 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  393 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  394 + <item name="src" type="462c0819:PsiDirectoryNode" />
  395 + <item name="main" type="462c0819:PsiDirectoryNode" />
  396 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  397 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  398 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  399 + </path>
  400 + <path>
  401 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  402 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  403 + <item name="src" type="462c0819:PsiDirectoryNode" />
  404 + <item name="main" type="462c0819:PsiDirectoryNode" />
  405 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  406 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  407 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  408 + <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
  409 + </path>
  410 + <path>
  411 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  412 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  413 + <item name="src" type="462c0819:PsiDirectoryNode" />
  414 + <item name="main" type="462c0819:PsiDirectoryNode" />
  415 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  416 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  417 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  418 + <item name="adjustHeader" type="462c0819:PsiDirectoryNode" />
  419 + </path>
  420 + <path>
  421 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  422 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  423 + <item name="src" type="462c0819:PsiDirectoryNode" />
  424 + <item name="main" type="462c0819:PsiDirectoryNode" />
  425 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  426 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  427 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  428 + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
  429 + </path>
  430 + <path>
  431 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  432 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  433 + <item name="src" type="462c0819:PsiDirectoryNode" />
  434 + <item name="main" type="462c0819:PsiDirectoryNode" />
  435 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  436 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  437 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  438 + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
  439 + </path>
  440 + <path>
  441 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  442 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  443 + <item name="src" type="462c0819:PsiDirectoryNode" />
  444 + <item name="main" type="462c0819:PsiDirectoryNode" />
  445 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  446 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  447 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  448 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  449 + </path>
  450 + <path>
  451 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  452 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  453 + <item name="src" type="462c0819:PsiDirectoryNode" />
  454 + <item name="main" type="462c0819:PsiDirectoryNode" />
  455 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  456 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  457 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  458 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  459 + </path>
  460 + <path>
  461 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  462 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  463 + <item name="src" type="462c0819:PsiDirectoryNode" />
  464 + <item name="main" type="462c0819:PsiDirectoryNode" />
  465 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  466 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  467 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  468 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  469 + </path>
  470 + </expand>
  471 + <select />
  472 + </subPane>
  473 + </pane>
  474 + </panes>
  475 + </component>
90 <component name="PropertiesComponent"> 476 <component name="PropertiesComponent">
91 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> 477 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
92 - <property name="DatabaseDriversLRU" value="mysql" /> 478 + <property name="DefaultHtmlFileTemplate" value="HTML File" />
  479 + <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
93 <property name="RequestMappingsPanelOrder0" value="0" /> 480 <property name="RequestMappingsPanelOrder0" value="0" />
94 <property name="RequestMappingsPanelOrder1" value="1" /> 481 <property name="RequestMappingsPanelOrder1" value="1" />
95 <property name="RequestMappingsPanelWidth0" value="75" /> 482 <property name="RequestMappingsPanelWidth0" value="75" />
@@ -97,25 +484,21 @@ @@ -97,25 +484,21 @@
97 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> 484 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
98 <property name="WebServerToolWindowFactoryState" value="false" /> 485 <property name="WebServerToolWindowFactoryState" value="false" />
99 <property name="aspect.path.notification.shown" value="true" /> 486 <property name="aspect.path.notification.shown" value="true" />
100 - <property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving" />  
101 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 487 + <property name="list.type.of.created.stylesheet" value="CSS" />
102 <property name="node.js.detected.package.eslint" value="true" /> 488 <property name="node.js.detected.package.eslint" value="true" />
103 - <property name="node.js.detected.package.tslint" value="true" />  
104 <property name="node.js.path.for.package.eslint" value="project" /> 489 <property name="node.js.path.for.package.eslint" value="project" />
105 <property name="node.js.path.for.package.tslint" value="project" /> 490 <property name="node.js.path.for.package.tslint" value="project" />
106 <property name="node.js.selected.package.eslint" value="(autodetect)" /> 491 <property name="node.js.selected.package.eslint" value="(autodetect)" />
107 <property name="node.js.selected.package.tslint" value="(autodetect)" /> 492 <property name="node.js.selected.package.tslint" value="(autodetect)" />
108 - <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />  
109 - <property name="nodejs_npm_path_reset_for_default_project" value="true" />  
110 <property name="nodejs_package_manager_path" value="npm" /> 493 <property name="nodejs_package_manager_path" value="npm" />
111 - <property name="settings.editor.selected.configurable" value="http.proxy" />  
112 - </component>  
113 - <component name="RecentsManager">  
114 - <key name="CopyFile.RECENT_KEYS">  
115 - <recent name="E:\code\wms2\src\main\resources\templates\receipt\receiptHeader" />  
116 - </key> 494 + <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
117 </component> 495 </component>
118 <component name="RunDashboard"> 496 <component name="RunDashboard">
  497 + <option name="configurationTypes">
  498 + <set>
  499 + <option value="SpringBootApplicationConfigurationType" />
  500 + </set>
  501 + </option>
119 <option name="ruleStates"> 502 <option name="ruleStates">
120 <list> 503 <list>
121 <RuleState> 504 <RuleState>
@@ -126,10 +509,11 @@ @@ -126,10 +509,11 @@
126 </RuleState> 509 </RuleState>
127 </list> 510 </list>
128 </option> 511 </option>
  512 + <option name="contentProportion" value="0.056010928" />
129 </component> 513 </component>
130 <component name="RunManager"> 514 <component name="RunManager">
131 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> 515 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
132 - <module name="huaheng" /> 516 + <module name="wms2" />
133 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> 517 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
134 <option name="ALTERNATIVE_JRE_PATH" /> 518 <option name="ALTERNATIVE_JRE_PATH" />
135 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> 519 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
@@ -142,8 +526,19 @@ @@ -142,8 +526,19 @@
142 <component name="ServiceViewManager"> 526 <component name="ServiceViewManager">
143 <option name="allServicesViewState"> 527 <option name="allServicesViewState">
144 <serviceView> 528 <serviceView>
  529 + <option name="contentProportion" value="0.17857143" />
145 <treeState> 530 <treeState>
146 - <expand /> 531 + <expand>
  532 + <path>
  533 + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
  534 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  535 + </path>
  536 + <path>
  537 + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
  538 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@b9e1b2d7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  539 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@67b24c63" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  540 + </path>
  541 + </expand>
147 <select /> 542 <select />
148 </treeState> 543 </treeState>
149 </serviceView> 544 </serviceView>
@@ -154,20 +549,144 @@ @@ -154,20 +549,144 @@
154 </component> 549 </component>
155 <component name="TaskManager"> 550 <component name="TaskManager">
156 <task active="true" id="Default" summary="Default task"> 551 <task active="true" id="Default" summary="Default task">
157 - <changelist id="4d9bac65-d8f6-4ced-8855-0db48f39a5f2" name="Default Changelist" comment="" />  
158 - <created>1567226260528</created> 552 + <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
  553 + <created>1566977677142</created>
159 <option name="number" value="Default" /> 554 <option name="number" value="Default" />
160 <option name="presentableId" value="Default" /> 555 <option name="presentableId" value="Default" />
161 - <updated>1567226260528</updated>  
162 - <workItem from="1567226262934" duration="3760000" />  
163 - <workItem from="1567237073353" duration="1270000" />  
164 - <workItem from="1567263583919" duration="7574000" />  
165 - <workItem from="1567321058939" duration="8502000" />  
166 - <workItem from="1567385321419" duration="11674000" />  
167 - <workItem from="1567405520324" duration="6659000" /> 556 + <updated>1566977677142</updated>
  557 + <workItem from="1566977678336" duration="306000" />
  558 + <workItem from="1566978429560" duration="9246000" />
  559 + <workItem from="1567038752582" duration="12361000" />
  560 + <workItem from="1567057373550" duration="15293000" />
  561 + <workItem from="1567125196953" duration="16752000" />
  562 + </task>
  563 + <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
  564 + <created>1566983055587</created>
  565 + <option name="number" value="00001" />
  566 + <option name="presentableId" value="LOCAL-00001" />
  567 + <option name="project" value="LOCAL" />
  568 + <updated>1566983055587</updated>
  569 + </task>
  570 + <task id="LOCAL-00002" summary="添加入库单历史">
  571 + <created>1566987011007</created>
  572 + <option name="number" value="00002" />
  573 + <option name="presentableId" value="LOCAL-00002" />
  574 + <option name="project" value="LOCAL" />
  575 + <updated>1566987011007</updated>
168 </task> 576 </task>
  577 + <task id="LOCAL-00003" summary="修复入库历史controller冲突">
  578 + <created>1567039165473</created>
  579 + <option name="number" value="00003" />
  580 + <option name="presentableId" value="LOCAL-00003" />
  581 + <option name="project" value="LOCAL" />
  582 + <updated>1567039165473</updated>
  583 + </task>
  584 + <task id="LOCAL-00004" summary="添加物料类别">
  585 + <created>1567047135508</created>
  586 + <option name="number" value="00004" />
  587 + <option name="presentableId" value="LOCAL-00004" />
  588 + <option name="project" value="LOCAL" />
  589 + <updated>1567047135508</updated>
  590 + </task>
  591 + <task id="LOCAL-00005" summary="添加系统参数配置">
  592 + <created>1567065008303</created>
  593 + <option name="number" value="00005" />
  594 + <option name="presentableId" value="LOCAL-00005" />
  595 + <option name="project" value="LOCAL" />
  596 + <updated>1567065008303</updated>
  597 + </task>
  598 + <task id="LOCAL-00006" summary="删除入库单">
  599 + <created>1567065196899</created>
  600 + <option name="number" value="00006" />
  601 + <option name="presentableId" value="LOCAL-00006" />
  602 + <option name="project" value="LOCAL" />
  603 + <updated>1567065196899</updated>
  604 + </task>
  605 + <task id="LOCAL-00007" summary="自动生成盘点首选项表">
  606 + <created>1567068662565</created>
  607 + <option name="number" value="00007" />
  608 + <option name="presentableId" value="LOCAL-00007" />
  609 + <option name="project" value="LOCAL" />
  610 + <updated>1567068662565</updated>
  611 + </task>
  612 + <task id="LOCAL-00008" summary="添加逻辑删除配置">
  613 + <created>1567069834248</created>
  614 + <option name="number" value="00008" />
  615 + <option name="presentableId" value="LOCAL-00008" />
  616 + <option name="project" value="LOCAL" />
  617 + <updated>1567069834248</updated>
  618 + </task>
  619 + <option name="localTasksCounter" value="9" />
169 <servers /> 620 <servers />
170 </component> 621 </component>
  622 + <component name="ToolWindowManager">
  623 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  624 + <editor active="true" />
  625 + <layout>
  626 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33109918" />
  627 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  628 + <window_info id="Web" order="2" side_tool="true" />
  629 + <window_info id="Designer" order="3" />
  630 + <window_info id="UI Designer" order="4" />
  631 + <window_info id="Favorites" order="5" side_tool="true" />
  632 + <window_info anchor="bottom" id="Message" order="0" />
  633 + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  634 + <window_info anchor="bottom" id="Run" order="2" />
  635 + <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
  636 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  637 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  638 + <window_info anchor="bottom" id="TODO" order="6" />
  639 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  640 + <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.07082153" />
  641 + <window_info anchor="bottom" id="Database Changes" order="9" />
  642 + <window_info anchor="bottom" id="Spring" order="10" />
  643 + <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
  644 + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
  645 + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
  646 + <window_info anchor="bottom" id="Java Enterprise" order="14" />
  647 + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" weight="0.53824365" />
  648 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  649 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  650 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  651 + <window_info anchor="right" id="Palette" order="3" />
  652 + <window_info anchor="right" id="Database" order="4" />
  653 + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
  654 + <window_info anchor="right" id="Bean Validation" order="6" />
  655 + <window_info anchor="right" id="Palette&#9;" order="7" />
  656 + </layout>
  657 + <layout-to-restore>
  658 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26340482" />
  659 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  660 + <window_info id="Web" order="2" side_tool="true" />
  661 + <window_info id="Designer" order="3" />
  662 + <window_info id="UI Designer" order="4" />
  663 + <window_info id="Favorites" order="5" side_tool="true" />
  664 + <window_info anchor="bottom" id="Message" order="0" />
  665 + <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
  666 + <window_info anchor="bottom" id="Run" order="2" />
  667 + <window_info anchor="bottom" id="Debug" order="3" weight="0.29036826" />
  668 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  669 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  670 + <window_info anchor="bottom" id="TODO" order="6" />
  671 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  672 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.45042494" />
  673 + <window_info anchor="bottom" id="Database Changes" order="9" />
  674 + <window_info anchor="bottom" id="Spring" order="10" />
  675 + <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
  676 + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
  677 + <window_info anchor="bottom" id="Messages" order="13" weight="0.12606232" />
  678 + <window_info anchor="bottom" id="Java Enterprise" order="14" />
  679 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.18838526" />
  680 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  681 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  682 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  683 + <window_info anchor="right" id="Palette" order="3" />
  684 + <window_info anchor="right" id="Database" order="4" />
  685 + <window_info anchor="right" id="Maven" order="5" weight="0.097184986" />
  686 + <window_info anchor="right" id="Bean Validation" order="6" />
  687 + <window_info anchor="right" id="Palette&#9;" order="7" />
  688 + </layout-to-restore>
  689 + </component>
171 <component name="TypeScriptGeneratedFilesManager"> 690 <component name="TypeScriptGeneratedFilesManager">
172 <option name="version" value="1" /> 691 <option name="version" value="1" />
173 </component> 692 </component>
@@ -177,45 +696,205 @@ @@ -177,45 +696,205 @@
177 <entry key="MAIN"> 696 <entry key="MAIN">
178 <value> 697 <value>
179 <State> 698 <State>
180 - <option name="COLUMN_ORDER" /> 699 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  700 + <collection />
  701 + </option>
  702 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  703 + <collection />
  704 + </option>
  705 + <option name="COLUMN_ORDER">
  706 + <list>
  707 + <option value="0" />
  708 + <option value="1" />
  709 + <option value="2" />
  710 + <option value="3" />
  711 + </list>
  712 + </option>
181 </State> 713 </State>
182 </value> 714 </value>
183 </entry> 715 </entry>
184 </map> 716 </map>
185 </option> 717 </option>
  718 + <option name="RECENT_FILTERS">
  719 + <map>
  720 + <entry key="Branch">
  721 + <value>
  722 + <list />
  723 + </value>
  724 + </entry>
  725 + <entry key="User">
  726 + <value>
  727 + <list />
  728 + </value>
  729 + </entry>
  730 + </map>
  731 + </option>
186 </component> 732 </component>
187 <component name="VcsManagerConfiguration"> 733 <component name="VcsManagerConfiguration">
188 <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> 734 <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
  735 + <MESSAGE value="盘点明细页面" />
  736 + <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
  737 + <MESSAGE value="添加入库单历史" />
  738 + <MESSAGE value="修复入库历史controller冲突" />
  739 + <MESSAGE value="添加物料类别" />
  740 + <MESSAGE value="添加系统参数配置" />
  741 + <MESSAGE value="删除入库单" />
  742 + <MESSAGE value="自动生成盘点首选项表" />
  743 + <MESSAGE value="添加逻辑删除配置" />
  744 + <option name="LAST_COMMIT_MESSAGE" value="添加逻辑删除配置" />
189 </component> 745 </component>
190 <component name="XDebuggerManager"> 746 <component name="XDebuggerManager">
191 <breakpoint-manager> 747 <breakpoint-manager>
192 <breakpoints> 748 <breakpoints>
193 - <line-breakpoint enabled="true" type="java-line">  
194 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java</url>  
195 - <line>207</line>  
196 - <option name="timeStamp" value="3" /> 749 + <line-breakpoint type="java-line">
  750 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
  751 + <line>5</line>
  752 + <properties />
  753 + <option name="timeStamp" value="1" />
  754 + </line-breakpoint>
  755 + <line-breakpoint type="java-line">
  756 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
  757 + <line>60</line>
  758 + <properties />
  759 + <option name="timeStamp" value="4" />
197 </line-breakpoint> 760 </line-breakpoint>
198 <line-breakpoint enabled="true" type="java-line"> 761 <line-breakpoint enabled="true" type="java-line">
199 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java</url>  
200 - <line>99</line>  
201 - <option name="timeStamp" value="6" /> 762 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
  763 + <line>49</line>
  764 + <properties />
  765 + <option name="timeStamp" value="16" />
202 </line-breakpoint> 766 </line-breakpoint>
203 <line-breakpoint enabled="true" type="java-line"> 767 <line-breakpoint enabled="true" type="java-line">
204 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java</url>  
205 - <line>73</line>  
206 - <option name="timeStamp" value="7" /> 768 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
  769 + <line>216</line>
  770 + <properties />
  771 + <option name="timeStamp" value="19" />
207 </line-breakpoint> 772 </line-breakpoint>
208 <line-breakpoint enabled="true" type="java-line"> 773 <line-breakpoint enabled="true" type="java-line">
209 - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java</url>  
210 - <line>117</line>  
211 - <option name="timeStamp" value="11" /> 774 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
  775 + <line>241</line>
  776 + <properties />
  777 + <option name="timeStamp" value="20" />
212 </line-breakpoint> 778 </line-breakpoint>
213 <line-breakpoint enabled="true" type="java-line"> 779 <line-breakpoint enabled="true" type="java-line">
214 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url> 780 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
215 <line>163</line> 781 <line>163</line>
216 - <option name="timeStamp" value="12" /> 782 + <properties />
  783 + <option name="timeStamp" value="22" />
  784 + </line-breakpoint>
  785 + <line-breakpoint enabled="true" type="java-line">
  786 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
  787 + <line>181</line>
  788 + <properties />
  789 + <option name="timeStamp" value="23" />
  790 + </line-breakpoint>
  791 + <line-breakpoint enabled="true" type="java-line">
  792 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
  793 + <line>92</line>
  794 + <properties />
  795 + <option name="timeStamp" value="24" />
217 </line-breakpoint> 796 </line-breakpoint>
218 </breakpoints> 797 </breakpoints>
219 </breakpoint-manager> 798 </breakpoint-manager>
220 </component> 799 </component>
  800 + <component name="editorHistoryManager">
  801 + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml">
  802 + <provider selected="true" editor-type-id="text-editor" />
  803 + </entry>
  804 + <entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml">
  805 + <provider selected="true" editor-type-id="text-editor">
  806 + <state relative-caret-position="-828" />
  807 + </provider>
  808 + </entry>
  809 + <entry file="file://$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml">
  810 + <provider selected="true" editor-type-id="text-editor">
  811 + <state relative-caret-position="-360" />
  812 + </provider>
  813 + </entry>
  814 + <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
  815 + <provider selected="true" editor-type-id="text-editor" />
  816 + </entry>
  817 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html">
  818 + <provider selected="true" editor-type-id="text-editor">
  819 + <state relative-caret-position="-314">
  820 + <caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
  821 + </state>
  822 + </provider>
  823 + </entry>
  824 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  825 + <provider selected="true" editor-type-id="text-editor">
  826 + <state relative-caret-position="-72" />
  827 + </provider>
  828 + </entry>
  829 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  830 + <provider selected="true" editor-type-id="text-editor">
  831 + <state relative-caret-position="-1268">
  832 + <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
  833 + </state>
  834 + </provider>
  835 + </entry>
  836 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  837 + <provider selected="true" editor-type-id="text-editor">
  838 + <state relative-caret-position="236">
  839 + <caret line="36" selection-start-line="36" selection-end-line="36" />
  840 + </state>
  841 + </provider>
  842 + </entry>
  843 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/service/TaskDetailService.java">
  844 + <provider selected="true" editor-type-id="text-editor">
  845 + <state relative-caret-position="60">
  846 + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
  847 + </state>
  848 + </provider>
  849 + </entry>
  850 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
  851 + <provider selected="true" editor-type-id="text-editor">
  852 + <state relative-caret-position="240">
  853 + <caret line="15" column="102" selection-start-line="15" selection-start-column="102" selection-end-line="15" selection-end-column="102" />
  854 + </state>
  855 + </provider>
  856 + </entry>
  857 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  858 + <provider selected="true" editor-type-id="text-editor">
  859 + <state relative-caret-position="468">
  860 + <caret line="37" selection-start-line="37" selection-end-line="37" />
  861 + </state>
  862 + </provider>
  863 + </entry>
  864 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <state relative-caret-position="340">
  867 + <caret line="24" column="112" selection-start-line="24" selection-start-column="112" selection-end-line="24" selection-end-column="112" />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state relative-caret-position="2">
  874 + <caret line="440" column="18" lean-forward="true" selection-start-line="440" selection-start-column="18" selection-end-line="440" selection-end-column="18" />
  875 + </state>
  876 + </provider>
  877 + </entry>
  878 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
  879 + <provider selected="true" editor-type-id="text-editor">
  880 + <state relative-caret-position="426">
  881 + <caret line="366" column="57" selection-start-line="366" selection-start-column="57" selection-end-line="366" selection-end-column="57" />
  882 + </state>
  883 + </provider>
  884 + </entry>
  885 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
  886 + <provider selected="true" editor-type-id="text-editor">
  887 + <state relative-caret-position="120">
  888 + <caret line="11" selection-start-line="11" selection-end-line="11" />
  889 + </state>
  890 + </provider>
  891 + </entry>
  892 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
  893 + <provider selected="true" editor-type-id="text-editor">
  894 + <state relative-caret-position="280">
  895 + <caret line="14" column="77" selection-start-line="14" selection-start-column="77" selection-end-line="14" selection-end-column="77" />
  896 + </state>
  897 + </provider>
  898 + </entry>
  899 + </component>
221 </project> 900 </project>
222 \ No newline at end of file 901 \ No newline at end of file
src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
  View file @eddd690
@@ -11,7 +11,7 @@ import lombok.Data; @@ -11,7 +11,7 @@ import lombok.Data;
11 import java.io.Serializable; 11 import java.io.Serializable;
12 import java.util.Date; 12 import java.util.Date;
13 13
14 -@ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail") 14 +@ApiModel(value="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail")
15 @Data 15 @Data
16 @TableName(value = "filter_config_detail") 16 @TableName(value = "filter_config_detail")
17 public class FilterConfigDetail implements Serializable { 17 public class FilterConfigDetail implements Serializable {
@@ -83,14 +83,14 @@ public class FilterConfigDetail implements Serializable { @@ -83,14 +83,14 @@ public class FilterConfigDetail implements Serializable {
83 */ 83 */
84 @TableField(value = "systemCreated") 84 @TableField(value = "systemCreated")
85 @ApiModelProperty(value="是否系统创建") 85 @ApiModelProperty(value="是否系统创建")
86 - private Integer systemCreated; 86 + private Boolean systemCreated;
87 87
88 /** 88 /**
89 * 是否自定义SQL 89 * 是否自定义SQL
90 */ 90 */
91 @TableField(value = "customSql") 91 @TableField(value = "customSql")
92 @ApiModelProperty(value="是否自定义SQL") 92 @ApiModelProperty(value="是否自定义SQL")
93 - private String customSql; 93 + private Boolean customSql;
94 94
95 /** 95 /**
96 * 创建时间 96 * 创建时间
src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
  View file @eddd690
@@ -11,7 +11,7 @@ import lombok.Data; @@ -11,7 +11,7 @@ import lombok.Data;
11 import java.io.Serializable; 11 import java.io.Serializable;
12 import java.util.Date; 12 import java.util.Date;
13 13
14 -@ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader") 14 +@ApiModel(value="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader")
15 @Data 15 @Data
16 @TableName(value = "filter_config_header") 16 @TableName(value = "filter_config_header")
17 public class FilterConfigHeader implements Serializable { 17 public class FilterConfigHeader implements Serializable {
@@ -62,7 +62,7 @@ public class FilterConfigHeader implements Serializable { @@ -62,7 +62,7 @@ public class FilterConfigHeader implements Serializable {
62 */ 62 */
63 @TableField(value = "systemCreated") 63 @TableField(value = "systemCreated")
64 @ApiModelProperty(value="是否系统创建") 64 @ApiModelProperty(value="是否系统创建")
65 - private Integer systemCreated; 65 + private Boolean systemCreated;
66 66
67 /** 67 /**
68 * 创建时间 68 * 创建时间
src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
  View file @eddd690
@@ -4,24 +4,30 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -4,24 +4,30 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.metadata.IPage; 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
7 import com.huaheng.common.utils.StringUtils; 8 import com.huaheng.common.utils.StringUtils;
8 import com.huaheng.common.utils.security.ShiroUtils; 9 import com.huaheng.common.utils.security.ShiroUtils;
9 import com.huaheng.framework.aspectj.lang.annotation.Log; 10 import com.huaheng.framework.aspectj.lang.annotation.Log;
10 import com.huaheng.framework.aspectj.lang.constant.BusinessType; 11 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
11 import com.huaheng.framework.web.controller.BaseController; 12 import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
12 import com.huaheng.framework.web.page.PageDomain; 14 import com.huaheng.framework.web.page.PageDomain;
13 import com.huaheng.framework.web.page.TableDataInfo; 15 import com.huaheng.framework.web.page.TableDataInfo;
14 import com.huaheng.framework.web.page.TableSupport; 16 import com.huaheng.framework.web.page.TableSupport;
15 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference; 17 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
16 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService; 18 import com.huaheng.pc.config.cycleCountPreference.service.CycleCountPreferenceService;
  19 +import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
17 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail; 20 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
  21 +import io.swagger.annotations.ApiOperation;
  22 +import io.swagger.annotations.ApiParam;
  23 +import org.apache.shiro.authz.annotation.RequiresPermissions;
18 import org.springframework.stereotype.Controller; 24 import org.springframework.stereotype.Controller;
19 -import org.springframework.web.bind.annotation.GetMapping;  
20 -import org.springframework.web.bind.annotation.PostMapping;  
21 -import org.springframework.web.bind.annotation.RequestMapping;  
22 -import org.springframework.web.bind.annotation.ResponseBody; 25 +import org.springframework.ui.ModelMap;
  26 +import org.springframework.web.bind.annotation.*;
23 27
24 import javax.annotation.Resource; 28 import javax.annotation.Resource;
  29 +import java.util.ArrayList;
  30 +import java.util.Date;
25 import java.util.List; 31 import java.util.List;
26 32
27 @Controller 33 @Controller
@@ -58,7 +64,13 @@ public class cycleCountPreferenceController extends BaseController { @@ -58,7 +64,13 @@ public class cycleCountPreferenceController extends BaseController {
58 StringUtils.isNotEmpty(createdBegin), CycleCountPreference::getCreated, createdBegin) 64 StringUtils.isNotEmpty(createdBegin), CycleCountPreference::getCreated, createdBegin)
59 .le(StringUtils.isNotEmpty(createdEnd), CycleCountPreference::getCreated, createdEnd)//创建时间范围 65 .le(StringUtils.isNotEmpty(createdEnd), CycleCountPreference::getCreated, createdEnd)//创建时间范围
60 .eq(CycleCountPreference::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库 66 .eq(CycleCountPreference::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
61 - .eq(cycleCountPreference.getId() != null, CycleCountPreference::getId, cycleCountPreference.getId())//库存明细ID 67 + .eq(StringUtils.isNotEmpty(cycleCountPreference.getCode()), CycleCountPreference::getCode, cycleCountPreference.getCode())//首选项编码
  68 + .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLocation()),CycleCountPreference::getPromptLocation,cycleCountPreference.getPromptLocation())//提示货位
  69 + .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptLpn()),CycleCountPreference::getPromptLpn,cycleCountPreference.getPromptLpn())//提示PLN
  70 + .eq(StringUtils.isNotEmpty(cycleCountPreference.getPromptItem()),CycleCountPreference::getPromptItem,cycleCountPreference.getPromptItem())//提示物料
  71 + .eq(StringUtils.isNotEmpty(cycleCountPreference.getLastUpdatedBy()),CycleCountPreference::getLastUpdatedBy,cycleCountPreference.getLastUpdatedBy())//更新人
  72 + .eq(StringUtils.isNotEmpty(cycleCountPreference.getCreatedBy()),CycleCountPreference::getCreatedBy,cycleCountPreference.getCreatedBy())//创建人
  73 +
62 .orderByDesc(CycleCountPreference::getId); 74 .orderByDesc(CycleCountPreference::getId);
63 75
64 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) { 76 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
@@ -73,7 +85,69 @@ public class cycleCountPreferenceController extends BaseController { @@ -73,7 +85,69 @@ public class cycleCountPreferenceController extends BaseController {
73 85
74 } 86 }
75 87
  88 + /**
  89 + * 新增盘点首选项
  90 + */
  91 + @GetMapping("/add")
  92 + public String add() {
  93 + return prefix + "/add";
  94 + }
76 95
  96 + /**
  97 + * 新增保存盘点首选项
  98 + */
  99 + //@RequiresPermissions("config:receiptPreference:add")
  100 + @Log(title = "配置-盘点首选项", operating = "新增盘点首选项", action = BusinessType.INSERT)
  101 + @PostMapping("/addSave")
  102 + @ResponseBody
  103 + public AjaxResult addSave(CycleCountPreference cycleCountPreference) {
  104 + cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
  105 + cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
  106 + cycleCountPreference.setCreated(new Date());
  107 + cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
  108 +
  109 + return toAjax(cycleCountPreferenceService.save(cycleCountPreference));
  110 + }
  111 +
  112 + /**
  113 + * 修改盘点首选项
  114 + */
  115 + @GetMapping("/edit/{id}")
  116 + public String edit(@PathVariable Integer id, ModelMap mmap) {
  117 + mmap.put("cycleCountPreference", cycleCountPreferenceService.getById(id));
  118 + return prefix + "/edit";
  119 + }
  120 +
  121 + /**
  122 + * 修改保存盘点首选项
  123 + */
  124 + //@RequiresPermissions("config:receiptPreference:edit")
  125 + @Log(title = "通用-盘点首选项", operating = "修改盘点首选项", action = BusinessType.UPDATE)
  126 + @PostMapping("/edit")
  127 + @ResponseBody
  128 + public AjaxResult editSave(CycleCountPreference cycleCountPreference) {
  129 + cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
  130 + cycleCountPreference.setLastUpdated(new Date());
  131 + return toAjax(cycleCountPreferenceService.updateById(cycleCountPreference));
  132 + }
  133 +
  134 + /**
  135 + * 删除盘点首选项
  136 + */
  137 + //@RequiresPermissions("config:receiptPreference:remove")
  138 + @Log(title = "通用-盘点首选项", operating = "删除盘点首选项", action = BusinessType.DELETE)
  139 + @PostMapping( "/remove")
  140 + @ResponseBody
  141 + public AjaxResult remove(String ids) {
  142 + if (StringUtils.isEmpty(ids)){
  143 + return AjaxResult.error("id不能为空");
  144 + }
  145 + List<Integer> list = new ArrayList<>();
  146 + for (Integer id : Convert.toIntArray(ids)) {
  147 + list.add(id);
  148 + }
  149 + return toAjax(cycleCountPreferenceService.removeByIds(list));
  150 + }
77 151
78 152
79 153
src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java
  View file @eddd690
1 package com.huaheng.pc.config.cycleCountPreference.domain; 1 package com.huaheng.pc.config.cycleCountPreference.domain;
2 2
  3 +import com.alibaba.druid.sql.visitor.functions.Char;
3 import com.baomidou.mybatisplus.annotation.IdType; 4 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 5 import com.baomidou.mybatisplus.annotation.TableField;
5 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
@@ -47,21 +48,21 @@ public class CycleCountPreference implements Serializable { @@ -47,21 +48,21 @@ public class CycleCountPreference implements Serializable {
47 */ 48 */
48 @TableField(value = "promptLocation") 49 @TableField(value = "promptLocation")
49 @ApiModelProperty(value="系统提示货位") 50 @ApiModelProperty(value="系统提示货位")
50 - private Integer promptLocation; 51 + private String promptLocation;
51 52
52 /** 53 /**
53 * 系统提示LPN 54 * 系统提示LPN
54 */ 55 */
55 @TableField(value = "promptLpn") 56 @TableField(value = "promptLpn")
56 @ApiModelProperty(value="系统提示LPN") 57 @ApiModelProperty(value="系统提示LPN")
57 - private Integer promptLpn; 58 + private String promptLpn;
58 59
59 /** 60 /**
60 * 系统提示物料 61 * 系统提示物料
61 */ 62 */
62 @TableField(value = "promptItem") 63 @TableField(value = "promptItem")
63 @ApiModelProperty(value="系统提示物料") 64 @ApiModelProperty(value="系统提示物料")
64 - private Integer promptItem; 65 + private String promptItem;
65 66
66 /** 67 /**
67 * 显示库存数量 68 * 显示库存数量
@@ -82,7 +83,7 @@ public class CycleCountPreference implements Serializable { @@ -82,7 +83,7 @@ public class CycleCountPreference implements Serializable {
82 */ 83 */
83 @TableField(value = "Enable") 84 @TableField(value = "Enable")
84 @ApiModelProperty(value="有效") 85 @ApiModelProperty(value="有效")
85 - private Integer enable; 86 + private Boolean enable;
86 87
87 /** 88 /**
88 * 创建时间 89 * 创建时间
src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java
  View file @eddd690
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty; @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
10 import java.io.Serializable; 10 import java.io.Serializable;
11 import java.util.Date; 11 import java.util.Date;
12 12
13 -@ApiModel(value="com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference") 13 +@ApiModel(value="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference")
14 @TableName(value = "shipment_preference") 14 @TableName(value = "shipment_preference")
15 public class ShipmentPreference implements Serializable { 15 public class ShipmentPreference implements Serializable {
16 /** 16 /**
@@ -81,14 +81,14 @@ public class ShipmentPreference implements Serializable { @@ -81,14 +81,14 @@ public class ShipmentPreference implements Serializable {
81 */ 81 */
82 @TableField(value = "allowCross") 82 @TableField(value = "allowCross")
83 @ApiModelProperty(value="允许越库") 83 @ApiModelProperty(value="允许越库")
84 - private Integer allowCross; 84 + private Boolean allowCross;
85 85
86 /** 86 /**
87 * 允许未质检的出库 87 * 允许未质检的出库
88 */ 88 */
89 @TableField(value = "allowQcCheckResult") 89 @TableField(value = "allowQcCheckResult")
90 @ApiModelProperty(value="允许未质检的出库") 90 @ApiModelProperty(value="允许未质检的出库")
91 - private Integer allowQcCheckResult; 91 + private Boolean allowQcCheckResult;
92 92
93 /** 93 /**
94 * 显示库存数量 94 * 显示库存数量
@@ -382,39 +382,19 @@ public class ShipmentPreference implements Serializable { @@ -382,39 +382,19 @@ public class ShipmentPreference implements Serializable {
382 this.autoAssignLPN = autoAssignLPN; 382 this.autoAssignLPN = autoAssignLPN;
383 } 383 }
384 384
385 - /**  
386 - * 获取允许越库  
387 - *  
388 - * @return allowCross - 允许越库  
389 - */  
390 - public Integer getAllowCross() { 385 + public Boolean getAllowCross() {
391 return allowCross; 386 return allowCross;
392 } 387 }
393 388
394 - /**  
395 - * 设置允许越库  
396 - *  
397 - * @param allowCross 允许越库  
398 - */  
399 - public void setAllowCross(Integer allowCross) { 389 + public void setAllowCross(Boolean allowCross) {
400 this.allowCross = allowCross; 390 this.allowCross = allowCross;
401 } 391 }
402 392
403 - /**  
404 - * 获取允许未质检的出库  
405 - *  
406 - * @return allowQcCheckResult - 允许未质检的出库  
407 - */  
408 - public Integer getAllowQcCheckResult() { 393 + public Boolean getAllowQcCheckResult() {
409 return allowQcCheckResult; 394 return allowQcCheckResult;
410 } 395 }
411 396
412 - /**  
413 - * 设置允许未质检的出库  
414 - *  
415 - * @param allowQcCheckResult 允许未质检的出库  
416 - */  
417 - public void setAllowQcCheckResult(Integer allowQcCheckResult) { 397 + public void setAllowQcCheckResult(Boolean allowQcCheckResult) {
418 this.allowQcCheckResult = allowQcCheckResult; 398 this.allowQcCheckResult = allowQcCheckResult;
419 } 399 }
420 400
src/main/java/com/huaheng/pc/config/shipmentType/config/shipmentTypeController.java 0 → 100644
  View file @eddd690
  1 +package com.huaheng.pc.config.shipmentType.config;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
  8 +import com.huaheng.common.utils.StringUtils;
  9 +import com.huaheng.common.utils.security.ShiroUtils;
  10 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  11 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  12 +import com.huaheng.framework.web.controller.BaseController;
  13 +import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.framework.web.page.PageDomain;
  15 +import com.huaheng.framework.web.page.TableDataInfo;
  16 +import com.huaheng.framework.web.page.TableSupport;
  17 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
  18 +import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
  19 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  20 +import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
  21 +import io.swagger.annotations.ApiParam;
  22 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  23 +import org.springframework.beans.factory.annotation.Autowired;
  24 +import org.springframework.stereotype.Controller;
  25 +import org.springframework.ui.ModelMap;
  26 +import org.springframework.web.bind.annotation.*;
  27 +
  28 +import javax.annotation.Resource;
  29 +import java.util.ArrayList;
  30 +import java.util.List;
  31 +
  32 +@Controller
  33 +@RequestMapping("/config/shipmentType")
  34 +public class shipmentTypeController extends BaseController {
  35 +
  36 + @Resource
  37 + private ShipmentTypeService shipmentTypeService;
  38 + @Autowired
  39 + private ShipmentHeaderService shipmentHeaderService;
  40 +
  41 + private String prefix = "config/shipmentType";
  42 +
  43 + @RequiresPermissions("config:shipmentType:view")
  44 + @GetMapping()
  45 + public String shipmentType() {
  46 + return prefix + "/shipmentType";
  47 + }
  48 +
  49 + /**
  50 + * 查询出库类型
  51 + */
  52 + @RequiresPermissions("config:shipmentType:list")
  53 + @Log(title = "配置-出库类型",operating = "出库类型列表", action = BusinessType.GRANT)
  54 + @PostMapping("/list")
  55 + @ResponseBody
  56 + public TableDataInfo list(@ApiParam(name="shipmentType",value="编码、类型") ShipmentType shipmentType,
  57 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  58 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  59 + LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  60 + PageDomain pageDomain = TableSupport.buildPageRequest();
  61 + Integer pageNum = pageDomain.getPageNum();
  62 + Integer pageSize = pageDomain.getPageSize();
  63 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ShipmentType::getCreated, createdBegin)
  64 + .lt(StringUtils.isNotEmpty(createdEnd), ShipmentType::getCreated, createdEnd)
  65 + .eq(StringUtils.isNotEmpty(shipmentType.getCode()), ShipmentType::getCode, shipmentType.getCode())
  66 + .eq(StringUtils.isNotEmpty(shipmentType.getReferType()), ShipmentType::getReferType, shipmentType.getReferType())
  67 + .like(StringUtils.isNotEmpty(shipmentType.getName()), ShipmentType::getName, shipmentType.getName())
  68 + .in(ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList())
  69 + .eq(ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode());
  70 +
  71 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  72 + /*使用分页查询*/
  73 + Page<ShipmentType> page = new Page<>(pageNum, pageSize);
  74 + IPage<ShipmentType> iPage = shipmentTypeService.page(page, lambdaQueryWrapper);
  75 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  76 + } else {
  77 + List<ShipmentType> list = shipmentTypeService.list(lambdaQueryWrapper);
  78 + return getDataTable(list);
  79 + }
  80 + }
  81 +
  82 + /**
  83 + * 新增出库类型
  84 + */
  85 + @GetMapping("/add")
  86 + public String add() {
  87 + return prefix + "/add";
  88 + }
  89 +
  90 + /**
  91 + * 新增出库类型
  92 + */
  93 + @RequiresPermissions("config:shipmentType:add")
  94 + @Log(title = "配置-出库类型",operating = "新增出库类型", action = BusinessType.INSERT)
  95 + @PostMapping("/add")
  96 + @ResponseBody
  97 + public AjaxResult addSave(ShipmentType shipmentType) {
  98 + shipmentType.setWarehouseCode(ShiroUtils.getWarehouseCode());
  99 + shipmentType.setCreatedBy(ShiroUtils.getLoginName());
  100 + shipmentType.setLastUpdatedBy(ShiroUtils.getLoginName());
  101 + return toAjax(shipmentTypeService.save(shipmentType ));
  102 + }
  103 +
  104 + /**
  105 + * 修改出库类型
  106 + */
  107 + @GetMapping("/edit/{id}")
  108 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  109 + ShipmentType shipmentType = shipmentTypeService.getById(id);
  110 + mmap.put("shipmentType", shipmentType);
  111 + return prefix + "/edit";
  112 + }
  113 +
  114 + /**
  115 + * 修改保存出库类型
  116 + */
  117 + @RequiresPermissions("config:shipmentType:edit")
  118 + @Log(title = "配置-出库类型",operating = "修改出库类型", action = BusinessType.UPDATE)
  119 + @PostMapping("/edit")
  120 + @ResponseBody
  121 + public AjaxResult editSave(ShipmentType shipmentType) {
  122 + shipmentType.setLastUpdatedBy(ShiroUtils.getLoginName());
  123 + return toAjax(shipmentTypeService.updateById(shipmentType));
  124 + }
  125 +
  126 + /**
  127 + * 删除出库
  128 + */
  129 + @RequiresPermissions("config:shipmentType:remove")
  130 + @Log(title = "配置-出库管理",operating = "修改出库", action = BusinessType.DELETE)
  131 + @PostMapping( "/remove")
  132 + @ResponseBody
  133 + public AjaxResult remove(String ids) {
  134 + if (StringUtils.isEmpty(ids)) {
  135 + return AjaxResult.error("id不能为空");
  136 + }
  137 + List<Integer> list = new ArrayList<>();
  138 + for (Integer id : Convert.toIntArray(ids)) {
  139 + ShipmentType shipmentType = shipmentTypeService.getById(id);
  140 + LambdaQueryWrapper<ShipmentHeader> lambda = Wrappers.lambdaQuery();
  141 + lambda.eq(ShipmentHeader::getShipmentType, shipmentType.getCode());
  142 + List<ShipmentHeader> receiptHeaderList = shipmentHeaderService.list(lambda);
  143 + if (receiptHeaderList.size() == 0){
  144 + list.add(id);
  145 + } else {
  146 + return AjaxResult.error("类型"+shipmentType.getCode()+"存在出库单，不能删除");
  147 + }
  148 + }
  149 + return toAjax(shipmentTypeService.removeByIds(list));
  150 + }
  151 +}
src/main/java/com/huaheng/pc/shipment/shipmentType/domain/ShipmentType.java renamed to src/main/java/com/huaheng/pc/config/shipmentType/domain/ShipmentType.java
  View file @eddd690
1 -package com.huaheng.pc.shipment.shipmentType.domain; 1 +package com.huaheng.pc.config.shipmentType.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.IdType; 3 import com.baomidou.mybatisplus.annotation.IdType;
4 import com.baomidou.mybatisplus.annotation.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
7 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
  9 +
9 import java.io.Serializable; 10 import java.io.Serializable;
10 import java.util.Date; 11 import java.util.Date;
11 12
@@ -41,6 +42,13 @@ public class ShipmentType implements Serializable { @@ -41,6 +42,13 @@ public class ShipmentType implements Serializable {
41 private String code; 42 private String code;
42 43
43 /** 44 /**
  45 + * 编码
  46 + */
  47 + @TableField(value = "name")
  48 + @ApiModelProperty(value="编码")
  49 + private String name;
  50 +
  51 + /**
44 * 关联订单类型 52 * 关联订单类型
45 */ 53 */
46 @TableField(value = "referType") 54 @TableField(value = "referType")
@@ -59,7 +67,7 @@ public class ShipmentType implements Serializable { @@ -59,7 +67,7 @@ public class ShipmentType implements Serializable {
59 */ 67 */
60 @TableField(value = "enable") 68 @TableField(value = "enable")
61 @ApiModelProperty(value="是否启用") 69 @ApiModelProperty(value="是否启用")
62 - private String enable; 70 + private Boolean enable;
63 71
64 /** 72 /**
65 * 创建时间 73 * 创建时间
@@ -124,33 +132,6 @@ public class ShipmentType implements Serializable { @@ -124,33 +132,6 @@ public class ShipmentType implements Serializable {
124 @ApiModelProperty(value="自定义字段4") 132 @ApiModelProperty(value="自定义字段4")
125 private String userDef4; 133 private String userDef4;
126 134
127 - /**  
128 - * 自定义字段5  
129 - */  
130 - @TableField(value = "userDef5")  
131 - @ApiModelProperty(value="自定义字段5")  
132 - private String userDef5;  
133 -  
134 - /**  
135 - * 自定义字段6  
136 - */  
137 - @TableField(value = "userDef6")  
138 - @ApiModelProperty(value="自定义字段6")  
139 - private String userDef6;  
140 -  
141 - /**  
142 - * 自定义字段7  
143 - */  
144 - @TableField(value = "userDef7")  
145 - @ApiModelProperty(value="自定义字段7")  
146 - private String userDef7;  
147 -  
148 - /**  
149 - * 自定义字段8  
150 - */  
151 - @TableField(value = "userDef8")  
152 - @ApiModelProperty(value="自定义字段8")  
153 - private String userDef8;  
154 135
155 /** 136 /**
156 * 处理标记 137 * 处理标记
@@ -167,6 +148,8 @@ public class ShipmentType implements Serializable { @@ -167,6 +148,8 @@ public class ShipmentType implements Serializable {
167 148
168 public static final String COL_CODE = "code"; 149 public static final String COL_CODE = "code";
169 150
  151 + public static final String COL_NAME= "name";
  152 +
170 public static final String COL_REFERTYPE = "referType"; 153 public static final String COL_REFERTYPE = "referType";
171 154
172 public static final String COL_SHIPMENTFLOW = "shipmentFlow"; 155 public static final String COL_SHIPMENTFLOW = "shipmentFlow";
@@ -191,14 +174,6 @@ public class ShipmentType implements Serializable { @@ -191,14 +174,6 @@ public class ShipmentType implements Serializable {
191 174
192 public static final String COL_USERDEF4 = "userDef4"; 175 public static final String COL_USERDEF4 = "userDef4";
193 176
194 - public static final String COL_USERDEF5 = "userDef5";  
195 -  
196 - public static final String COL_USERDEF6 = "userDef6";  
197 -  
198 - public static final String COL_USERDEF7 = "userDef7";  
199 -  
200 - public static final String COL_USERDEF8 = "userDef8";  
201 -  
202 public static final String COL_PROCESSSTAMP = "processStamp"; 177 public static final String COL_PROCESSSTAMP = "processStamp";
203 178
204 /** 179 /**
@@ -273,6 +248,14 @@ public class ShipmentType implements Serializable { @@ -273,6 +248,14 @@ public class ShipmentType implements Serializable {
273 this.code = code; 248 this.code = code;
274 } 249 }
275 250
  251 + public String getName() {
  252 + return name;
  253 + }
  254 +
  255 + public void setName(String name) {
  256 + this.name = name;
  257 + }
  258 +
276 /** 259 /**
277 * 获取关联订单类型 260 * 获取关联订单类型
278 * 261 *
@@ -309,21 +292,11 @@ public class ShipmentType implements Serializable { @@ -309,21 +292,11 @@ public class ShipmentType implements Serializable {
309 this.shipmentFlow = shipmentFlow; 292 this.shipmentFlow = shipmentFlow;
310 } 293 }
311 294
312 - /**  
313 - * 获取是否启用  
314 - *  
315 - * @return enable - 是否启用  
316 - */  
317 - public String getEnable() { 295 + public Boolean getEnable() {
318 return enable; 296 return enable;
319 } 297 }
320 298
321 - /**  
322 - * 设置是否启用  
323 - *  
324 - * @param enable 是否启用  
325 - */  
326 - public void setEnable(String enable) { 299 + public void setEnable(Boolean enable) {
327 this.enable = enable; 300 this.enable = enable;
328 } 301 }
329 302
@@ -489,77 +462,6 @@ public class ShipmentType implements Serializable { @@ -489,77 +462,6 @@ public class ShipmentType implements Serializable {
489 this.userDef4 = userDef4; 462 this.userDef4 = userDef4;
490 } 463 }
491 464
492 - /**  
493 - * 获取自定义字段5  
494 - *  
495 - * @return userDef5 - 自定义字段5  
496 - */  
497 - public String getUserDef5() {  
498 - return userDef5;  
499 - }  
500 -  
501 - /**  
502 - * 设置自定义字段5  
503 - *  
504 - * @param userDef5 自定义字段5  
505 - */  
506 - public void setUserDef5(String userDef5) {  
507 - this.userDef5 = userDef5;  
508 - }  
509 -  
510 - /**  
511 - * 获取自定义字段6  
512 - *  
513 - * @return userDef6 - 自定义字段6  
514 - */  
515 - public String getUserDef6() {  
516 - return userDef6;  
517 - }  
518 -  
519 - /**  
520 - * 设置自定义字段6  
521 - *  
522 - * @param userDef6 自定义字段6  
523 - */  
524 - public void setUserDef6(String userDef6) {  
525 - this.userDef6 = userDef6;  
526 - }  
527 -  
528 - /**  
529 - * 获取自定义字段7  
530 - *  
531 - * @return userDef7 - 自定义字段7  
532 - */  
533 - public String getUserDef7() {  
534 - return userDef7;  
535 - }  
536 -  
537 - /**  
538 - * 设置自定义字段7  
539 - *  
540 - * @param userDef7 自定义字段7  
541 - */  
542 - public void setUserDef7(String userDef7) {  
543 - this.userDef7 = userDef7;  
544 - }  
545 -  
546 - /**  
547 - * 获取自定义字段8  
548 - *  
549 - * @return userDef8 - 自定义字段8  
550 - */  
551 - public String getUserDef8() {  
552 - return userDef8;  
553 - }  
554 -  
555 - /**  
556 - * 设置自定义字段8  
557 - *  
558 - * @param userDef8 自定义字段8  
559 - */  
560 - public void setUserDef8(String userDef8) {  
561 - this.userDef8 = userDef8;  
562 - }  
563 465
564 /** 466 /**
565 * 获取处理标记 467 * 获取处理标记
src/main/java/com/huaheng/pc/shipment/shipmentType/mapper/ShipmentTypeMapper.java renamed to src/main/java/com/huaheng/pc/config/shipmentType/mapper/ShipmentTypeMapper.java
  View file @eddd690
1 -package com.huaheng.pc.shipment.shipmentType.mapper; 1 +package com.huaheng.pc.config.shipmentType.mapper;
2 2
3 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 -import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType; 4 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
5 5
6 public interface ShipmentTypeMapper extends BaseMapper<ShipmentType> { 6 public interface ShipmentTypeMapper extends BaseMapper<ShipmentType> {
7 } 7 }
8 \ No newline at end of file 8 \ No newline at end of file
src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeService.java renamed to src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java
  View file @eddd690
1 -package com.huaheng.pc.shipment.shipmentType.service; 1 +package com.huaheng.pc.config.shipmentType.service;
2 2
3 -import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;  
4 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
  5 +
5 public interface ShipmentTypeService extends IService<ShipmentType>{ 6 public interface ShipmentTypeService extends IService<ShipmentType>{
6 7
7 8
src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java 0 → 100644
  View file @eddd690
  1 +package com.huaheng.pc.config.shipmentType.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
  5 +import com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +@Service
  9 +public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService {
  10 +
  11 +}
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @eddd690
@@ -16,6 +16,8 @@ import com.huaheng.framework.web.page.TableSupport; @@ -16,6 +16,8 @@ import com.huaheng.framework.web.page.TableSupport;
16 import com.huaheng.pc.config.material.service.MaterialServiceImpl; 16 import com.huaheng.pc.config.material.service.MaterialServiceImpl;
17 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; 17 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
18 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; 18 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
  19 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  20 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl;
19 import org.apache.shiro.authz.annotation.RequiresPermissions; 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
20 import org.springframework.stereotype.Controller; 22 import org.springframework.stereotype.Controller;
21 import org.springframework.web.bind.annotation.*; 23 import org.springframework.web.bind.annotation.*;
@@ -32,8 +34,7 @@ public class InventoryHeaderController extends BaseController @@ -32,8 +34,7 @@ public class InventoryHeaderController extends BaseController
32 { 34 {
33 private String prefix = "inventory/inventoryHeader"; 35 private String prefix = "inventory/inventoryHeader";
34 36
35 - @Resource  
36 - private MaterialServiceImpl materialService; 37 +
37 @Resource 38 @Resource
38 private InventoryHeaderService inventoryHeaderService; 39 private InventoryHeaderService inventoryHeaderService;
39 40
@@ -64,7 +65,7 @@ public class InventoryHeaderController extends BaseController @@ -64,7 +65,7 @@ public class InventoryHeaderController extends BaseController
64 .eq(InventoryHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())//仓库 65 .eq(InventoryHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())//仓库
65 .eq(StringUtils.isNotEmpty(inventoryHeader.getLocationCode()),InventoryHeader::getLocationCode,inventoryHeader.getLocationCode()) //库位 66 .eq(StringUtils.isNotEmpty(inventoryHeader.getLocationCode()),InventoryHeader::getLocationCode,inventoryHeader.getLocationCode()) //库位
66 .eq(StringUtils.isNotEmpty(inventoryHeader.getContainerCode()),InventoryHeader::getContainerCode,inventoryHeader.getContainerCode())//容器 67 .eq(StringUtils.isNotEmpty(inventoryHeader.getContainerCode()),InventoryHeader::getContainerCode,inventoryHeader.getContainerCode())//容器
67 - //.eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主 68 + .eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主
68 .eq(StringUtils.isNotEmpty(inventoryHeader.getCreatedBy()),InventoryHeader::getCreatedBy,inventoryHeader.getCreatedBy())//创建用户 69 .eq(StringUtils.isNotEmpty(inventoryHeader.getCreatedBy()),InventoryHeader::getCreatedBy,inventoryHeader.getCreatedBy())//创建用户
69 .eq(StringUtils.isNotEmpty(inventoryHeader.getLastUpdatedBy()),InventoryHeader::getLastUpdatedBy,inventoryHeader.getLastUpdatedBy())//更新用户 70 .eq(StringUtils.isNotEmpty(inventoryHeader.getLastUpdatedBy()),InventoryHeader::getLastUpdatedBy,inventoryHeader.getLastUpdatedBy())//更新用户
70 .orderByDesc(InventoryHeader::getId); 71 .orderByDesc(InventoryHeader::getId);
@@ -80,6 +81,7 @@ public class InventoryHeaderController extends BaseController @@ -80,6 +81,7 @@ public class InventoryHeaderController extends BaseController
80 } 81 }
81 82
82 } 83 }
  84 +
83 /** 85 /**
84 * 移库页面 86 * 移库页面
85 * */ 87 * */
@@ -93,8 +95,8 @@ public class InventoryHeaderController extends BaseController @@ -93,8 +95,8 @@ public class InventoryHeaderController extends BaseController
93 @PostMapping("/transfer") 95 @PostMapping("/transfer")
94 @ResponseBody 96 @ResponseBody
95 public AjaxResult transfer(String sourceLocation, String destinationLocation){ 97 public AjaxResult transfer(String sourceLocation, String destinationLocation){
96 -  
97 - return inventoryHeaderService.transfer(sourceLocation,destinationLocation); 98 + String companyCode="";
  99 + return inventoryHeaderService.transfer(sourceLocation,destinationLocation,companyCode);
98 } 100 }
99 101
100 /**出库查看*/ 102 /**出库查看*/
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
  View file @eddd690
@@ -9,11 +9,12 @@ import org.springframework.stereotype.Service; @@ -9,11 +9,12 @@ import org.springframework.stereotype.Service;
9 public interface InventoryHeaderService extends IService<InventoryHeader> { 9 public interface InventoryHeaderService extends IService<InventoryHeader> {
10 10
11 11
12 - public AjaxResult transfer (String sourceLocation, String destinationLocation);  
13 -  
14 12
15 public AjaxResult createCheckOutTask (String ids); 13 public AjaxResult createCheckOutTask (String ids);
16 14
  15 +
  16 + public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode);
  17 +
17 } 18 }
18 19
19 20
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
  View file @eddd690
@@ -3,7 +3,9 @@ package com.huaheng.pc.inventory.inventoryHeader.service; @@ -3,7 +3,9 @@ package com.huaheng.pc.inventory.inventoryHeader.service;
3 import com.huaheng.framework.web.domain.AjaxResult; 3 import com.huaheng.framework.web.domain.AjaxResult;
4 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; 4 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
5 import com.huaheng.pc.task.taskDetail.service.TaskDetailService; 5 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
  6 +import com.huaheng.pc.task.taskDetail.service.TaskDetailServiceImpl;
6 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService; 7 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  8 +import com.huaheng.pc.task.taskHeader.service.TaskHeaderServiceImpl;
7 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 10 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9 import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper; 11 import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper;
@@ -15,25 +17,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe @@ -15,25 +17,25 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
15 17
16 18
17 @Resource 19 @Resource
18 - private TaskHeaderService taskHeaderService; 20 + private TaskHeaderServiceImpl taskHeaderServiceImpl;
19 @Resource 21 @Resource
20 - private TaskDetailService taskDetailService; 22 + private TaskDetailServiceImpl taskDetailServiceImpl;
21 23
22 24
23 /** 25 /**
24 * 移库 26 * 移库
25 * */ 27 * */
26 - @Override  
27 - public AjaxResult transfer(String sourceLocation, String destinationLocation) {  
28 - //生成移库任务  
29 28
  29 + public AjaxResult transfer(String sourceLocation, String destinationLocation, String companyCode) {
  30 + //生成移库任务
  31 + taskHeaderServiceImpl.createTransferTask(sourceLocation,destinationLocation,companyCode);
30 return AjaxResult.success("移库任务生成成功！"); 32 return AjaxResult.success("移库任务生成成功！");
31 } 33 }
32 34
33 /** 35 /**
34 * 出库查看 36 * 出库查看
35 * */ 37 * */
36 - @Override 38 +
37 public AjaxResult createCheckOutTask(String ids) { 39 public AjaxResult createCheckOutTask(String ids) {
38 //生成出库查看任务 40 //生成出库查看任务
39 41
src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeServiceImpl.java deleted
View file @75e1744
1 -package com.huaheng.pc.shipment.shipmentType.service;  
2 -  
3 -import org.springframework.stereotype.Service;  
4 -import javax.annotation.Resource;  
5 -import java.util.List;  
6 -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;  
7 -import com.huaheng.pc.shipment.shipmentType.mapper.ShipmentTypeMapper;  
8 -import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;  
9 -import com.huaheng.pc.shipment.shipmentType.service.ShipmentTypeService;  
10 -@Service  
11 -public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService{  
12 -  
13 -}  
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
  View file @eddd690
@@ -218,12 +218,6 @@ public class TaskDetail implements Serializable { @@ -218,12 +218,6 @@ public class TaskDetail implements Serializable {
218 @ApiModelProperty(value="属性3") 218 @ApiModelProperty(value="属性3")
219 private String attribute3; 219 private String attribute3;
220 220
221 - /**  
222 - * 属性4  
223 - */  
224 - @TableField(value = "attribute4")  
225 - @ApiModelProperty(value="属性4")  
226 - private String attribute4;  
227 221
228 /** 222 /**
229 * 批次 223 * 批次
@@ -377,41 +371,6 @@ public class TaskDetail implements Serializable { @@ -377,41 +371,6 @@ public class TaskDetail implements Serializable {
377 private String userDef3; 371 private String userDef3;
378 372
379 /** 373 /**
380 - * 自定义字段4  
381 - */  
382 - @TableField(value = "userDef4")  
383 - @ApiModelProperty(value="自定义字段4")  
384 - private String userDef4;  
385 -  
386 - /**  
387 - * 自定义字段5  
388 - */  
389 - @TableField(value = "userDef5")  
390 - @ApiModelProperty(value="自定义字段5")  
391 - private String userDef5;  
392 -  
393 - /**  
394 - * 自定义字段6  
395 - */  
396 - @TableField(value = "userDef6")  
397 - @ApiModelProperty(value="自定义字段6")  
398 - private String userDef6;  
399 -  
400 - /**  
401 - * 自定义字段7  
402 - */  
403 - @TableField(value = "userDef7")  
404 - @ApiModelProperty(value="自定义字段7")  
405 - private String userDef7;  
406 -  
407 - /**  
408 - * 自定义字段8  
409 - */  
410 - @TableField(value = "userDef8")  
411 - @ApiModelProperty(value="自定义字段8")  
412 - private String userDef8;  
413 -  
414 - /**  
415 * 处理标记 374 * 处理标记
416 */ 375 */
417 @TableField(value = "processStamp") 376 @TableField(value = "processStamp")
@@ -479,7 +438,6 @@ public class TaskDetail implements Serializable { @@ -479,7 +438,6 @@ public class TaskDetail implements Serializable {
479 438
480 public static final String COL_ATTRIBUTE3 = "attribute3"; 439 public static final String COL_ATTRIBUTE3 = "attribute3";
481 440
482 - public static final String COL_ATTRIBUTE4 = "attribute4";  
483 441
484 public static final String COL_BATCH = "batch"; 442 public static final String COL_BATCH = "batch";
485 443
@@ -525,15 +483,5 @@ public class TaskDetail implements Serializable { @@ -525,15 +483,5 @@ public class TaskDetail implements Serializable {
525 483
526 public static final String COL_USERDEF3 = "userDef3"; 484 public static final String COL_USERDEF3 = "userDef3";
527 485
528 - public static final String COL_USERDEF4 = "userDef4";  
529 -  
530 - public static final String COL_USERDEF5 = "userDef5";  
531 -  
532 - public static final String COL_USERDEF6 = "userDef6";  
533 -  
534 - public static final String COL_USERDEF7 = "userDef7";  
535 -  
536 - public static final String COL_USERDEF8 = "userDef8";  
537 -  
538 public static final String COL_PROCESSSTAMP = "processStamp"; 486 public static final String COL_PROCESSSTAMP = "processStamp";
539 } 487 }
540 \ No newline at end of file 488 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java
  View file @eddd690
@@ -280,40 +280,6 @@ public class TaskHeader implements Serializable { @@ -280,40 +280,6 @@ public class TaskHeader implements Serializable {
280 @ApiModelProperty(value="同步标志 0：需要同步 10：同步成功 20：同步失败") 280 @ApiModelProperty(value="同步标志 0：需要同步 10：同步成功 20：同步失败")
281 private String userDef3; 281 private String userDef3;
282 282
283 - /**  
284 - * 自定义字段4  
285 - */  
286 - @TableField(value = "userDef4")  
287 - @ApiModelProperty(value="自定义字段4")  
288 - private String userDef4;  
289 -  
290 - /**  
291 - * 自定义字段5  
292 - */  
293 - @TableField(value = "userDef5")  
294 - @ApiModelProperty(value="自定义字段5")  
295 - private String userDef5;  
296 -  
297 - /**  
298 - * 自定义字段6  
299 - */  
300 - @TableField(value = "userDef6")  
301 - @ApiModelProperty(value="自定义字段6")  
302 - private String userDef6;  
303 -  
304 - /**  
305 - * 自定义字段7  
306 - */  
307 - @TableField(value = "userDef7")  
308 - @ApiModelProperty(value="自定义字段7")  
309 - private String userDef7;  
310 -  
311 - /**  
312 - * 自定义字段8  
313 - */  
314 - @TableField(value = "userDef8")  
315 - @ApiModelProperty(value="自定义字段8")  
316 - private String userDef8;  
317 283
318 /** 284 /**
319 * 处理标记 285 * 处理标记
@@ -400,15 +366,5 @@ public class TaskHeader implements Serializable { @@ -400,15 +366,5 @@ public class TaskHeader implements Serializable {
400 366
401 public static final String COL_USERDEF3 = "userDef3"; 367 public static final String COL_USERDEF3 = "userDef3";
402 368
403 - public static final String COL_USERDEF4 = "userDef4";  
404 -  
405 - public static final String COL_USERDEF5 = "userDef5";  
406 -  
407 - public static final String COL_USERDEF6 = "userDef6";  
408 -  
409 - public static final String COL_USERDEF7 = "userDef7";  
410 -  
411 - public static final String COL_USERDEF8 = "userDef8";  
412 -  
413 public static final String COL_PROCESSSTAMP = "processStamp"; 369 public static final String COL_PROCESSSTAMP = "processStamp";
414 } 370 }
415 \ No newline at end of file 371 \ No newline at end of file
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
  View file @eddd690
@@ -22,4 +22,6 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{ @@ -22,4 +22,6 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
22 22
23 // List<Map<String, Object>> getReceiptTask(@Param("taskId") Integer taskId); 23 // List<Map<String, Object>> getReceiptTask(@Param("taskId") Integer taskId);
24 24
  25 + public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode);
  26 +
25 } 27 }
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @eddd690
@@ -19,7 +19,6 @@ import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction @@ -19,7 +19,6 @@ import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction
19 import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService; 19 import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
20 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail; 20 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
21 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService; 21 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
22 -import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;  
23 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; 22 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
24 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService; 23 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
25 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail; 24 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
@@ -27,21 +26,18 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainer @@ -27,21 +26,18 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainer
27 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader; 26 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
28 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService; 27 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
29 import com.huaheng.pc.task.taskDetail.domain.TaskDetail; 28 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
30 -import com.huaheng.pc.task.taskDetail.mapper.TaskDetailMapper;  
31 import com.huaheng.pc.task.taskDetail.service.TaskDetailService; 29 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
32 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel; 30 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
33 -import com.sun.jmx.snmp.tasks.Task; 31 +
34 import org.springframework.beans.factory.annotation.Autowired; 32 import org.springframework.beans.factory.annotation.Autowired;
35 import org.springframework.stereotype.Service; 33 import org.springframework.stereotype.Service;
36 import java.math.BigDecimal; 34 import java.math.BigDecimal;
37 import java.util.Date; 35 import java.util.Date;
38 import java.util.List; 36 import java.util.List;
39 import java.util.Map; 37 import java.util.Map;
40 -  
41 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 38 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
42 import com.huaheng.pc.task.taskHeader.domain.TaskHeader; 39 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
43 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper; 40 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
44 -import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;  
45 import org.springframework.transaction.annotation.Transactional; 41 import org.springframework.transaction.annotation.Transactional;
46 42
47 import javax.annotation.Resource; 43 import javax.annotation.Resource;
@@ -435,5 +431,90 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea @@ -435,5 +431,90 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
435 // return taskHeaderMapper.getReceiptTask(taskId) ; 431 // return taskHeaderMapper.getReceiptTask(taskId) ;
436 // } 432 // }
437 433
  434 + /**
  435 + * 立库移库
  436 + * */
  437 + @Transactional
  438 + public AjaxResult createTransferTask(String sourceLocation, String destinationLocation, String companyCode) {
  439 + /* Location temp1 = new Location();
  440 + temp1.setCode(sourceLocation);
  441 + temp1.setWarehouseId(ShiroUtils.getWarehouseId());
  442 + Location loc1 = locationService.selectFirstEntity(temp1);
  443 + if(loc1==null){
  444 + return AjaxResult.error("源库位："+sourceLocation+"未找到");
  445 + }
  446 + if(!loc1.getStatus().equals("empty")){
  447 + return AjaxResult.error("源库位："+sourceLocation+"状态非空闲");
  448 + }
  449 + if(StringUtils.isEmpty(loc1.getContainerCode())){
  450 + return AjaxResult.error("源库位："+sourceLocation+"不存在托盘");
  451 + }
  452 + //这里增加组盘校验，如果此托盘存在未完成的组盘数据，则不能移库
  453 + //校验入库组盘
  454 + int count1 = inventoryService.getUncompleteReceiptContainer(sourceLocation,ShiroUtils.getWarehouseId());
  455 + if(count1>0){
  456 + return AjaxResult.error("源库位："+sourceLocation+"存在入库组盘，不能移库");
  457 + }
  458 + int count2 = inventoryService.getUncompleteShipmentContainer(sourceLocation,ShiroUtils.getWarehouseId());
  459 + if(count2>0){
  460 + return AjaxResult.error("源库位："+sourceLocation+"存在出库组盘，不能移库");
  461 + }
  462 +
  463 + Location temp2 = new Location();
  464 + temp2.setWarehouseId(ShiroUtils.getWarehouseId());
  465 + temp2.setCode(destinationLocation);
  466 + Location loc2 = locationService.selectFirstEntity(temp2);
  467 + if(loc2 == null){
  468 + return AjaxResult.error("目标库位："+destinationLocation+"未找到");
  469 + }
  470 + if(!loc2.getStatus().equals("empty")){
  471 + return AjaxResult.error("目标库位："+destinationLocation+"状态非空闲");
  472 + }
  473 + if(StringUtils.isNotEmpty(loc2.getContainerCode())){
  474 + return AjaxResult.error("目标库位："+destinationLocation+"已存在托盘");
  475 + }
  476 + int count3 = inventoryService.getUncompleteReceiptContainer(destinationLocation,ShiroUtils.getWarehouseId());
  477 + if(count3>0){
  478 + return AjaxResult.error("目标库位："+sourceLocation+"存在入库组盘，不能移库");
  479 + }
  480 + //hack：这里暂时写死第五层不能往其他四层移库
  481 + if(loc1.getLayer()==5){
  482 + if(loc2.getLayer()<4){
  483 + return AjaxResult.error("高货位不能往底货位移库");
  484 + }
  485 + }
  486 + Task task = new Task();
  487 + task.setWarehouseId(ShiroUtils.getWarehouseId());
  488 + task.setWarehouseCode(ShiroUtils.getWarehouseCode());
  489 + task.setCompanyId(ShiroUtils.getCompanyIdList().get(0));//获取第一个货主
  490 + task.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
  491 + //这里默认一个0
  492 + task.setPriority(0);
  493 + task.setType((short)800);
  494 + //对移库来说，这个没啥用
  495 + task.setStation(null);
  496 + task.setContainerCode(loc1.getContainerCode());
  497 + task.setFirstStatus((short)1);
  498 + task.setLastStatus((short)1);
  499 + task.setBeginTime(new Date());
  500 + task.setSourceLocation(sourceLocation);
  501 + task.setDestinationLocation(destinationLocation);
  502 + task.setCreated(new Date());
  503 + task.setCreatedBy(ShiroUtils.getLoginName());
  504 + insert(task);
  505 + //更新货位状态为预定
  506 + loc1.setStatus("lock");
  507 + loc2.setStatus("lock");
  508 + locationService.updateByModel(loc1);
  509 + locationService.updateByModel(loc2);
  510 + return AjaxResult.success(task.getId());*/
  511 + return null;
  512 + }
  513 +
  514 +
  515 +
  516 +
  517 +
  518 +
438 519
439 } 520 }
src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml
  View file @eddd690
@@ -7,12 +7,12 @@ @@ -7,12 +7,12 @@
7 <result column="code" jdbcType="VARCHAR" property="code" /> 7 <result column="code" jdbcType="VARCHAR" property="code" />
8 <result column="name" jdbcType="VARCHAR" property="name" /> 8 <result column="name" jdbcType="VARCHAR" property="name" />
9 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> 9 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
10 - <result column="promptLocation" jdbcType="INTEGER" property="promptLocation" />  
11 - <result column="promptLpn" jdbcType="INTEGER" property="promptLpn" />  
12 - <result column="promptItem" jdbcType="INTEGER" property="promptItem" /> 10 + <result column="promptLocation" jdbcType="VARCHAR" property="promptLocation" />
  11 + <result column="promptLpn" jdbcType="VARCHAR" property="promptLpn" />
  12 + <result column="promptItem" jdbcType="VARCHAR" property="promptItem" />
13 <result column="promptQuantity" jdbcType="INTEGER" property="promptQuantity" /> 13 <result column="promptQuantity" jdbcType="INTEGER" property="promptQuantity" />
14 <result column="allowAddNewInventory" jdbcType="INTEGER" property="allowAddNewInventory" /> 14 <result column="allowAddNewInventory" jdbcType="INTEGER" property="allowAddNewInventory" />
15 - <result column="Enable" jdbcType="INTEGER" property="enable" /> 15 + <result column="Enable" jdbcType="BOOLEAN" property="enable" />
16 <result column="created" jdbcType="TIMESTAMP" property="created" /> 16 <result column="created" jdbcType="TIMESTAMP" property="created" />
17 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> 17 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
18 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> 18 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
  View file @eddd690
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper"> 3 +<mapper namespace="com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper">
4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail"> 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> 12 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
13 <result column="description" jdbcType="VARCHAR" property="description" /> 13 <result column="description" jdbcType="VARCHAR" property="description" />
14 <result column="statement" jdbcType="LONGVARCHAR" property="statement" /> 14 <result column="statement" jdbcType="LONGVARCHAR" property="statement" />
15 - <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />  
16 - <result column="customSql" jdbcType="LONGVARCHAR" property="customSql" /> 15 + <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
  16 + <result column="customSql" jdbcType="BIT" property="customSql" />
17 <result column="created" jdbcType="TIMESTAMP" property="created" /> 17 <result column="created" jdbcType="TIMESTAMP" property="created" />
18 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> 18 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
19 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> 19 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -23,10 +23,6 @@ @@ -23,10 +23,6 @@
23 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 23 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
24 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 24 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
25 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 25 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
26 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
27 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
28 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
29 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
30 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 26 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
31 <result column="filterName" jdbcType="VARCHAR" property="filterName" /> 27 <result column="filterName" jdbcType="VARCHAR" property="filterName" />
32 </resultMap> 28 </resultMap>
@@ -34,7 +30,7 @@ @@ -34,7 +30,7 @@
34 <!--@mbg.generated--> 30 <!--@mbg.generated-->
35 id, headerId, code, moduleType, recordType, filterCode, warehouseCode, description, 31 id, headerId, code, moduleType, recordType, filterCode, warehouseCode, description,
36 `statement`, systemCreated, customSql, created, createdBy, lastUpdated, lastUpdatedBy, 32 `statement`, systemCreated, customSql, created, createdBy, lastUpdated, lastUpdatedBy,
37 - version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 33 + version, userDef1, userDef2, userDef3, userDef4,
38 processStamp, filterName 34 processStamp, filterName
39 </sql> 35 </sql>
40 </mapper> 36 </mapper>
41 \ No newline at end of file 37 \ No newline at end of file
src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
  View file @eddd690
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper"> 3 +<mapper namespace="com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader"> 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <result column="filterCode" jdbcType="VARCHAR" property="filterCode" /> 9 <result column="filterCode" jdbcType="VARCHAR" property="filterCode" />
10 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> 10 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
11 <result column="description" jdbcType="VARCHAR" property="description" /> 11 <result column="description" jdbcType="VARCHAR" property="description" />
12 - <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" /> 12 + <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
13 <result column="created" jdbcType="TIMESTAMP" property="created" /> 13 <result column="created" jdbcType="TIMESTAMP" property="created" />
14 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> 14 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
15 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> 15 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -19,10 +19,6 @@ @@ -19,10 +19,6 @@
19 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 19 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
20 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 20 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
21 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 21 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
22 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
23 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
24 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
25 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
26 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 22 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
27 <result column="filterName" jdbcType="VARCHAR" property="filterName" /> 23 <result column="filterName" jdbcType="VARCHAR" property="filterName" />
28 </resultMap> 24 </resultMap>
@@ -30,6 +26,6 @@ @@ -30,6 +26,6 @@
30 <!--@mbg.generated--> 26 <!--@mbg.generated-->
31 id, moduleType, recordType, filterCode, warehouseCode, description, systemCreated, 27 id, moduleType, recordType, filterCode, warehouseCode, description, systemCreated,
32 created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, 28 created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
33 - userDef4, userDef5, userDef6, userDef7, userDef8, processStamp, filterName 29 + userDef4, processStamp, filterName
34 </sql> 30 </sql>
35 </mapper> 31 </mapper>
36 \ No newline at end of file 32 \ No newline at end of file
src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
  View file @eddd690
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.shipmentPreference.mapper.ShipmentPreferenceMapper"> 3 +<mapper namespace="com.huaheng.pc.config.shipmentPreference.mapper.ShipmentPreferenceMapper">
4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference"> 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 <result column="shipmentPickingLocRange" jdbcType="VARCHAR" property="shipmentPickingLocRange" /> 12 <result column="shipmentPickingLocRange" jdbcType="VARCHAR" property="shipmentPickingLocRange" />
13 <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" /> 13 <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
14 <result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" /> 14 <result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" />
15 - <result column="allowCross" jdbcType="INTEGER" property="allowCross" />  
16 - <result column="allowQcCheckResult" jdbcType="INTEGER" property="allowQcCheckResult" /> 15 + <result column="allowCross" jdbcType="BIT" property="allowCross" />
  16 + <result column="allowQcCheckResult" jdbcType="BIT" property="allowQcCheckResult" />
17 <result column="showInventoryQty" jdbcType="INTEGER" property="showInventoryQty" /> 17 <result column="showInventoryQty" jdbcType="INTEGER" property="showInventoryQty" />
18 <result column="groupPickup" jdbcType="INTEGER" property="groupPickup" /> 18 <result column="groupPickup" jdbcType="INTEGER" property="groupPickup" />
19 <result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" /> 19 <result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" />
src/main/resources/mybatis/shipment/ShipmentTypeMapper.xml renamed to src/main/resources/mybatis/config/ShipmentTypeMapper.xml
  View file @eddd690
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 -<mapper namespace="com.huaheng.pc.shipment.shipmentType.mapper.ShipmentTypeMapper">  
4 - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentType.domain.ShipmentType"> 3 +<mapper namespace="com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentType.domain.ShipmentType">
5 <!--@mbg.generated--> 5 <!--@mbg.generated-->
6 <id column="id" jdbcType="INTEGER" property="id" /> 6 <id column="id" jdbcType="INTEGER" property="id" />
7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> 7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <result column="code" jdbcType="VARCHAR" property="code" /> 9 <result column="code" jdbcType="VARCHAR" property="code" />
10 <result column="referType" jdbcType="VARCHAR" property="referType" /> 10 <result column="referType" jdbcType="VARCHAR" property="referType" />
11 <result column="shipmentFlow" jdbcType="VARCHAR" property="shipmentFlow" /> 11 <result column="shipmentFlow" jdbcType="VARCHAR" property="shipmentFlow" />
12 - <result column="enable" jdbcType="VARCHAR" property="enable" /> 12 + <result column="enable" jdbcType="BIT" property="enable" />
13 <result column="created" jdbcType="TIMESTAMP" property="created" /> 13 <result column="created" jdbcType="TIMESTAMP" property="created" />
14 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> 14 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
15 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> 15 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -19,16 +19,12 @@ @@ -19,16 +19,12 @@
19 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 19 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
20 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 20 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
21 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> 21 <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
22 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
23 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
24 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
25 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
26 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 22 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
27 </resultMap> 23 </resultMap>
28 <sql id="Base_Column_List"> 24 <sql id="Base_Column_List">
29 <!--@mbg.generated--> 25 <!--@mbg.generated-->
30 id, warehouseCode, companyCode, code, referType, shipmentFlow, `enable`, created, 26 id, warehouseCode, companyCode, code, referType, shipmentFlow, `enable`, created,
31 createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, 27 createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
32 - userDef5, userDef6, userDef7, userDef8, processStamp 28 + processStamp
33 </sql> 29 </sql>
34 </mapper> 30 </mapper>
35 \ No newline at end of file 31 \ No newline at end of file
src/main/resources/mybatis/task/TaskDetailMapper.xml
  View file @eddd690
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
21 <result column="fromZone" jdbcType="VARCHAR" property="fromZone" /> 21 <result column="fromZone" jdbcType="VARCHAR" property="fromZone" />
22 <result column="toZone" jdbcType="VARCHAR" property="toZone" /> 22 <result column="toZone" jdbcType="VARCHAR" property="toZone" />
23 <result column="attributeId" jdbcType="INTEGER" property="attributeId" /> 23 <result column="attributeId" jdbcType="INTEGER" property="attributeId" />
24 - <result column="enable" jdbcType="INTEGER" property="enable" />  
25 <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" /> 24 <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
26 <result column="referenceId" jdbcType="INTEGER" property="referenceId" /> 25 <result column="referenceId" jdbcType="INTEGER" property="referenceId" />
27 <result column="referenceLineId" jdbcType="INTEGER" property="referenceLineId" /> 26 <result column="referenceLineId" jdbcType="INTEGER" property="referenceLineId" />
@@ -29,7 +28,6 @@ @@ -29,7 +28,6 @@
29 <result column="attribute1" jdbcType="VARCHAR" property="attribute1" /> 28 <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
30 <result column="attribute2" jdbcType="VARCHAR" property="attribute2" /> 29 <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
31 <result column="attribute3" jdbcType="VARCHAR" property="attribute3" /> 30 <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
32 - <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />  
33 <result column="batch" jdbcType="VARCHAR" property="batch" /> 31 <result column="batch" jdbcType="VARCHAR" property="batch" />
34 <result column="lot" jdbcType="VARCHAR" property="lot" /> 32 <result column="lot" jdbcType="VARCHAR" property="lot" />
35 <result column="projectNo" jdbcType="VARCHAR" property="projectNo" /> 33 <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
@@ -52,22 +50,16 @@ @@ -52,22 +50,16 @@
52 <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> 50 <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
53 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 51 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
54 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 52 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
55 - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />  
56 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
57 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
58 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
59 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
60 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 53 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
61 </resultMap> 54 </resultMap>
62 <sql id="Base_Column_List"> 55 <sql id="Base_Column_List">
63 <!--@mbg.generated--> 56 <!--@mbg.generated-->
64 id, taskId, taskCode, taskType, internalTaskType, warehouseCode, companyCode, materialCode, 57 id, taskId, taskCode, taskType, internalTaskType, warehouseCode, companyCode, materialCode,
65 materialName, materialSpec, materialUnit, qty, fromLocation, toLocation, containerCode, 58 materialName, materialSpec, materialUnit, qty, fromLocation, toLocation, containerCode,
66 - fromZone, toZone, attributeId, `enable`, referenceCode, referenceId, referenceLineId, 59 + fromZone, toZone, attributeId, referenceCode, referenceId, referenceLineId,
67 assignedUser, attribute1, attribute2, attribute3, attribute4, batch, lot, projectNo, 60 assignedUser, attribute1, attribute2, attribute3, attribute4, batch, lot, projectNo,
68 qcCheck, manufactureDate, expirationDate, agingDate, inventorySts, waveId, fromInventoryId, 61 qcCheck, manufactureDate, expirationDate, agingDate, inventorySts, waveId, fromInventoryId,
69 toInventoryId, confirmedBy, groupNum, groupIndex, created, createdBy, lastUpdated, 62 toInventoryId, confirmedBy, groupNum, groupIndex, created, createdBy, lastUpdated,
70 - lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,  
71 - userDef7, userDef8, processStamp 63 + lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp
72 </sql> 64 </sql>
73 </mapper> 65 </mapper>
74 \ No newline at end of file 66 \ No newline at end of file
src/main/resources/mybatis/task/TaskHeaderMapper.xml
  View file @eddd690
@@ -13,7 +13,6 @@ @@ -13,7 +13,6 @@
13 <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" /> 13 <result column="referenceCode" jdbcType="VARCHAR" property="referenceCode" />
14 <result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" /> 14 <result column="assignedUser" jdbcType="VARCHAR" property="assignedUser" />
15 <result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" /> 15 <result column="confirmedBy" jdbcType="VARCHAR" property="confirmedBy" />
16 - <result column="enable" jdbcType="INTEGER" property="enable" />  
17 <result column="waveId" jdbcType="INTEGER" property="waveId" /> 16 <result column="waveId" jdbcType="INTEGER" property="waveId" />
18 <result column="pickingCartCode" jdbcType="VARCHAR" property="pickingCartCode" /> 17 <result column="pickingCartCode" jdbcType="VARCHAR" property="pickingCartCode" />
19 <result column="pickingCartPos" jdbcType="VARCHAR" property="pickingCartPos" /> 18 <result column="pickingCartPos" jdbcType="VARCHAR" property="pickingCartPos" />
@@ -40,11 +39,6 @@ @@ -40,11 +39,6 @@
40 <result column="userDef1" jdbcType="VARCHAR" property="userDef1" /> 39 <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
41 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> 40 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
42 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> 41 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
43 - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />  
44 - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />  
45 - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />  
46 - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />  
47 - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />  
48 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> 42 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
49 </resultMap> 43 </resultMap>
50 <select id="getReceiptTask" resultType="java.util.Map"> 44 <select id="getReceiptTask" resultType="java.util.Map">
@@ -60,11 +54,11 @@ @@ -60,11 +54,11 @@
60 <sql id="Base_Column_List"> 54 <sql id="Base_Column_List">
61 <!--@mbg.generated--> 55 <!--@mbg.generated-->
62 id, code, warehouseCode, companyCode, taskType, internalTaskType, referenceId, referenceCode, 56 id, code, warehouseCode, companyCode, taskType, internalTaskType, referenceId, referenceCode,
63 - assignedUser, confirmedBy, `enable`, waveId, pickingCartCode, pickingCartPos, containerCode, 57 + assignedUser, confirmedBy, waveId, pickingCartCode, pickingCartPos, containerCode,
64 startPickDateTime, endPickDateTime, rebatchLoc, finishRebatch, rebatchGroupCode, 58 startPickDateTime, endPickDateTime, rebatchLoc, finishRebatch, rebatchGroupCode,
65 allowRebatch, taskProcessType, rebinBench, rebined, startRebinDateTime, endRebinDateTime, 59 allowRebatch, taskProcessType, rebinBench, rebined, startRebinDateTime, endRebinDateTime,
66 rebinedBy, exceptionCode, exceptionHandledBy, created, createdBy, lastUpdated, lastUpdatedBy, 60 rebinedBy, exceptionCode, exceptionHandledBy, created, createdBy, lastUpdated, lastUpdatedBy,
67 - version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 61 + version, userDef1, userDef2, userDef3,
68 processStamp 62 processStamp
69 </sql> 63 </sql>
70 </mapper> 64 </mapper>
71 \ No newline at end of file 65 \ No newline at end of file
src/main/resources/templates/config/cycleCountPreference/add.html
  View file @eddd690
@@ -4,32 +4,32 @@ @@ -4,32 +4,32 @@
4 <head th:include="include :: header"></head> 4 <head th:include="include :: header"></head>
5 <body class="white-bg"> 5 <body class="white-bg">
6 <div class="wrapper wrapper-content animated fadeInRight ibox-content"> 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 - <form class="form-horizontal m" id="form-receiptPreference-add"> 7 + <form class="form-horizontal m" id="form-cycleCountPreference-add">
8 <div class="form-group"> 8 <div class="form-group">
9 - <label class="col-sm-3 control-label">编码：</label> 9 + <label class="col-sm-3 control-label">盘点首选项编码：</label>
10 <div class="col-sm-8"> 10 <div class="col-sm-8">
11 <input id="code" name="code" class="form-control" type="text"> 11 <input id="code" name="code" class="form-control" type="text">
12 </div> 12 </div>
13 </div> 13 </div>
14 <div class="form-group"> 14 <div class="form-group">
15 - <label class="col-sm-3 control-label">名称：</label> 15 + <label class="col-sm-3 control-label">盘点首选项名称：</label>
16 <div class="col-sm-8"> 16 <div class="col-sm-8">
17 <input id="name" name="name" class="form-control" type="text"> 17 <input id="name" name="name" class="form-control" type="text">
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 - <label class="col-sm-3 control-label">入库流程：</label> 21 + <label class="col-sm-3 control-label">系统提示货位：</label>
22 <div class="col-sm-8"> 22 <div class="col-sm-8">
23 - <input id="receiptFlow" name="receiptFlow" class="form-control" type="text"> 23 + <input id="promptLocation" name="promptLocation" class="form-control" type="text">
24 </div> 24 </div>
25 </div> 25 </div>
26 <div class="form-group"> 26 <div class="form-group">
27 - <label class="col-sm-3 control-label">自动生成托盘号：</label> 27 + <label class="col-sm-3 control-label">系统提示LPN：</label>
28 <div class="col-sm-8"> 28 <div class="col-sm-8">
29 - <input id="autoAssignLPN" name="autoAssignLPN" class="form-control" type="text"> 29 + <input id="promptLpn" name="promptLpn" class="form-control" type="text">
30 </div> 30 </div>
31 </div> 31 </div>
32 - <div class="form-group"> 32 + <!-- <div class="form-group">
33 <label class="col-sm-3 control-label">允许超收：</label> 33 <label class="col-sm-3 control-label">允许超收：</label>
34 <div class="col-sm-8"> 34 <div class="col-sm-8">
35 <div class="onoffswitch"> 35 <div class="onoffswitch">
@@ -40,101 +40,29 @@ @@ -40,101 +40,29 @@
40 </label> 40 </label>
41 </div> 41 </div>
42 </div> 42 </div>
43 - </div>  
44 - <div class="form-group">  
45 - <label class="col-sm-3 control-label">允许超收范围：</label>  
46 - <div class="col-sm-8">  
47 - <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control" type="text">  
48 - </div>  
49 - </div>  
50 - <div class="form-group">  
51 - <label class="col-sm-3 control-label">自动定位：</label>  
52 - <div class="col-sm-8">  
53 - <input id="autoLocate" name="autoLocate" class="form-control" type="text">  
54 - </div>  
55 - </div>  
56 - <div class="form-group">  
57 - <label class="col-sm-3 control-label">RF显示未收数量：</label>  
58 - <div class="col-sm-8">  
59 - <input id="showOpenQty" name="showOpenQty" class="form-control" type="text">  
60 - </div>  
61 - </div>  
62 - <div class="form-group">  
63 - <label class="col-sm-3 control-label">RF组车收货：</label>  
64 - <div class="col-sm-8">  
65 - <input id="groupPutaway" name="groupPutaway" class="form-control" type="text">  
66 - </div>  
67 - </div>  
68 - <div class="form-group">  
69 - <label class="col-sm-3 control-label">人工组盘：</label>  
70 - <div class="col-sm-8">  
71 - <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text">  
72 - </div>  
73 - </div>  
74 - <div class="form-group">  
75 - <label class="col-sm-3 control-label">定位规则：</label>  
76 - <div class="col-sm-8">  
77 - <input id="locationRule" name="locationRule" class="form-control" type="text">  
78 - </div>  
79 - </div>  
80 - <div class="form-group">  
81 - <label class="col-sm-3 control-label">空库位规则：</label>  
82 - <div class="col-sm-8">  
83 - <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text">  
84 - </div>  
85 - </div>  
86 - <div class="form-group">  
87 - <label class="col-sm-3 control-label">RF逐件收货：</label>  
88 - <div class="col-sm-8">  
89 - <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text">  
90 - </div>  
91 - </div>  
92 - <div class="form-group">  
93 - <label class="col-sm-3 control-label">RF自动提交收货：</label>  
94 - <div class="col-sm-8">  
95 - <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text">  
96 - </div>  
97 - </div>  
98 - <div class="form-group">  
99 - <label class="col-sm-3 control-label">abc分类：</label>  
100 - <div class="col-sm-8">  
101 - <input id="abcClass" name="abcClass" class="form-control" type="text">  
102 - </div>  
103 - </div>  
104 - <div class="form-group">  
105 - <label class="col-sm-3 control-label">保质期（天）：</label>  
106 - <div class="col-sm-8">  
107 - <input id="daysToExpire" name="daysToExpire" class="form-control" type="text">  
108 - </div>  
109 - </div>  
110 - <div class="form-group">  
111 - <label class="col-sm-3 control-label">临期预警（天）：</label>  
112 - <div class="col-sm-8">  
113 - <input id="expiringDays" name="expiringDays" class="form-control" type="text">  
114 - </div>  
115 - </div> 43 + </div>-->
116 <div class="form-group"> 44 <div class="form-group">
117 - <label class="col-sm-3 control-label">收货预警(天)：</label> 45 + <label class="col-sm-3 control-label">系统提示物料：</label>
118 <div class="col-sm-8"> 46 <div class="col-sm-8">
119 - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text"> 47 + <input id="promptItem" name="promptItem" class="form-control" type="text">
120 </div> 48 </div>
121 </div> 49 </div>
122 <div class="form-group"> 50 <div class="form-group">
123 - <label class="col-sm-3 control-label">RF快速上架：</label> 51 + <label class="col-sm-3 control-label">显示库存数量：</label>
124 <div class="col-sm-8"> 52 <div class="col-sm-8">
125 - <input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text"> 53 + <input id="promptQuantity" name="promptQuantity" class="form-control" type="text">
126 </div> 54 </div>
127 </div> 55 </div>
128 <div class="form-group"> 56 <div class="form-group">
129 - <label class="col-sm-3 control-label">属性模板：</label> 57 + <label class="col-sm-3 control-label">允许添加库存：</label>
130 <div class="col-sm-8"> 58 <div class="col-sm-8">
131 - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text"> 59 + <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text">
132 </div> 60 </div>
133 </div> 61 </div>
134 <div class="form-group"> 62 <div class="form-group">
135 - <label class="col-sm-3 control-label">快速入库：</label> 63 + <label class="col-sm-3 control-label">RF逐件盘点：</label>
136 <div class="col-sm-8"> 64 <div class="col-sm-8">
137 - <input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text"> 65 + <input id="countByPiece" name="countByPiece" class="form-control" type="text">
138 </div> 66 </div>
139 </div> 67 </div>
140 <!--<div class="form-group"> 68 <!--<div class="form-group">
@@ -167,19 +95,19 @@ @@ -167,19 +95,19 @@
167 <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">--> 95 <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
168 <!--</div>--> 96 <!--</div>-->
169 <!--</div>--> 97 <!--</div>-->
170 - <!--<div class="form-group"> -->  
171 - <!--<label class="col-sm-3 control-label">是否有效：</label>-->  
172 - <!--<div class="col-sm-8">-->  
173 - <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->  
174 - <!--<div class="onoffswitch">-->  
175 - <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->  
176 - <!--<label class="onoffswitch-label" for="enable">-->  
177 - <!--<span class="onoffswitch-inner"></span>-->  
178 - <!--<span class="onoffswitch-switch"></span>-->  
179 - <!--</label>-->  
180 - <!--</div>-->  
181 - <!--</div>-->  
182 - <!--</div>--> 98 + <div class="form-group">
  99 + <label class="col-sm-3 control-label">是否有效：</label>
  100 + <div class="col-sm-8">
  101 + <!--<input id="enable" name="enable" class="form-control" type="text">-->
  102 + <div class="onoffswitch">
  103 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
  104 + <label class="onoffswitch-label" for="enable">
  105 + <span class="onoffswitch-inner"></span>
  106 + <span class="onoffswitch-switch"></span>
  107 + </label>
  108 + </div>
  109 + </div>
  110 + </div>
183 <!--<div class="form-group"> --> 111 <!--<div class="form-group"> -->
184 <!--<label class="col-sm-3 control-label">是否删除：</label>--> 112 <!--<label class="col-sm-3 control-label">是否删除：</label>-->
185 <!--<div class="col-sm-8">--> 113 <!--<div class="col-sm-8">-->
@@ -218,7 +146,7 @@ @@ -218,7 +146,7 @@
218 <!--</div>--> 146 <!--</div>-->
219 <div class="form-group"> 147 <div class="form-group">
220 <div class="form-control-static col-sm-offset-9"> 148 <div class="form-control-static col-sm-offset-9">
221 - <button type="submit" class="btn btn-primary">提交</button> 149 + <input type="submit" class="btn btn-primary" value="提交">
222 <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button> 150 <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
223 </div> 151 </div>
224 </div> 152 </div>
@@ -226,8 +154,8 @@ @@ -226,8 +154,8 @@
226 </div> 154 </div>
227 <div th:include="include::footer"></div> 155 <div th:include="include::footer"></div>
228 <script type="text/javascript"> 156 <script type="text/javascript">
229 - var prefix = ctx + "config/receiptPreference";  
230 - $("#form-receiptPreference-add").validate({ 157 + var prefix = ctx + "config/cycleCountPreference";
  158 + $("#form-cycleCountPreference-add").validate({
231 rules:{ 159 rules:{
232 code:{ 160 code:{
233 required: true, 161 required: true,
@@ -235,41 +163,26 @@ @@ -235,41 +163,26 @@
235 name:{ 163 name:{
236 required: true, 164 required: true,
237 }, 165 },
238 - autoAssignLPN:{  
239 - required: true,  
240 - },  
241 - allowOverReceiving:{  
242 - required: true,  
243 - },  
244 - allowOverReceivingQty:{  
245 - required: true,  
246 - },  
247 - autoLocate: {  
248 - required: true,  
249 - },  
250 - showOpenQty: {  
251 - required: true,  
252 - },  
253 - groupPutaway: { 166 + promptLocation:{
254 required: true, 167 required: true,
255 }, 168 },
256 - manuallyBuildLPN: { 169 + promptLpn:{
257 required: true, 170 required: true,
258 }, 171 },
259 - checkinByPiece: { 172 + promptItem:{
260 required: true, 173 required: true,
261 }, 174 },
262 - pieceConfirm: { 175 + promptQuantity: {
263 required: true, 176 required: true,
264 }, 177 },
265 - allowQuickPutaway: { 178 + allowAddNewInventory: {
266 required: true, 179 required: true,
267 } 180 }
268 }, 181 },
269 submitHandler: function(form) { 182 submitHandler: function(form) {
270 - var tableValue = $.common.getTableValue("#form-receiptPreference-add");  
271 - tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));  
272 - $.operate.save(prefix + "/edit", tableValue); 183 + var tableValue = $.common.getTableValue("#form-cycleCountPreference-add");
  184 + //tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
  185 + $.operate.save(prefix + "/addSave", tableValue);
273 } 186 }
274 }); 187 });
275 </script> 188 </script>
src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html
  View file @eddd690
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 -<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> 2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.w3.org/1999/xhtml">
3 <meta charset="utf-8"> 3 <meta charset="utf-8">
4 <head th:include="include :: header"></head> 4 <head th:include="include :: header"></head>
5 <body class="gray-bg"> 5 <body class="gray-bg">
@@ -13,9 +13,6 @@ @@ -13,9 +13,6 @@
13 盘点首选项编码：<input type="text" name="code"/> 13 盘点首选项编码：<input type="text" name="code"/>
14 </li> 14 </li>
15 <li> 15 <li>
16 - 盘点首选项名称：<input type="text" name="name"/>  
17 - </li>  
18 - <li>  
19 提示货位：<input type="text" name="promptLocation"/> 16 提示货位：<input type="text" name="promptLocation"/>
20 </li> 17 </li>
21 <li> 18 <li>
@@ -45,12 +42,9 @@ @@ -45,12 +42,9 @@
45 </form> 42 </form>
46 </div> 43 </div>
47 <div class="btn-group hidden-xs" id="toolbar" role="group"> 44 <div class="btn-group hidden-xs" id="toolbar" role="group">
48 - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:receiptPreference:add"> 45 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" >
49 <i class="fa fa-plus"></i> 新增 46 <i class="fa fa-plus"></i> 新增
50 </a> 47 </a>
51 - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:receiptPreference:remove">  
52 - <i class="fa fa-trash-o"></i> 删除  
53 - </a>  
54 </div> 48 </div>
55 49
56 <div class="col-sm-12 select-info"> 50 <div class="col-sm-12 select-info">
@@ -94,7 +88,7 @@ @@ -94,7 +88,7 @@
94 }, 88 },
95 { 89 {
96 field : 'promptLocation', 90 field : 'promptLocation',
97 - title : '系统提示货位' 91 + title : '系统提示货位',
98 }, 92 },
99 { 93 {
100 field : 'promptLpn', 94 field : 'promptLpn',
@@ -119,12 +113,12 @@ @@ -119,12 +113,12 @@
119 { 113 {
120 field : 'created', 114 field : 'created',
121 title : '创建时间', 115 title : '创建时间',
122 - visible : false 116 + visible : true
123 }, 117 },
124 { 118 {
125 field : 'createdBy', 119 field : 'createdBy',
126 title : '创建用户', 120 title : '创建用户',
127 - visible : false 121 + visible : true
128 }, 122 },
129 { 123 {
130 field : 'lastUpdated', 124 field : 'lastUpdated',
@@ -172,8 +166,8 @@ @@ -172,8 +166,8 @@
172 align: 'center', 166 align: 'center',
173 formatter: function(value, row, index) { 167 formatter: function(value, row, index) {
174 var actions = []; 168 var actions = [];
175 - actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');  
176 - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>'); 169 + actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>修改</a> ');
  170 + actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
177 return actions.join(''); 171 return actions.join('');
178 } 172 }
179 }] 173 }]
src/main/resources/templates/config/cycleCountPreference/edit.html
  View file @eddd690
@@ -4,161 +4,100 @@ @@ -4,161 +4,100 @@
4 <head th:include="include :: header"></head> 4 <head th:include="include :: header"></head>
5 <body class="white-bg"> 5 <body class="white-bg">
6 <div class="wrapper wrapper-content animated fadeInRight ibox-content"> 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 - <form class="form-horizontal m" id="form-receiptPreference-edit" th:object="${receiptPreference}">  
8 - <input id="id" name="id" th:field="*{id}"> 7 + <form class="form-horizontal m" id="form-cycleCountPreference-edit" th:object="${cycleCountPreference}">
9 <div class="form-group"> 8 <div class="form-group">
10 - <label class="col-sm-3 control-label">编码：</label> 9 + <label class="col-sm-3 control-label">ID：</label>
11 <div class="col-sm-8"> 10 <div class="col-sm-8">
12 - <input id="code" name="code" class="form-control" type="text" th:field="*{code}">  
13 - </div>  
14 - </div>  
15 - <div class="form-group">  
16 - <label class="col-sm-3 control-label">名称：</label>  
17 - <div class="col-sm-8">  
18 - <input id="name" name="name" class="form-control" type="text" th:field="*{name}"> 11 + <input id="id" name="id" class="form-control" type="text" th:field="*{id}" readonly="readonly">
19 </div> 12 </div>
20 </div> 13 </div>
21 <div class="form-group"> 14 <div class="form-group">
22 - <label class="col-sm-3 control-label">入库流程：</label> 15 + <label class="col-sm-3 control-label">盘点首选项编码：</label>
23 <div class="col-sm-8"> 16 <div class="col-sm-8">
24 - <input id="receiptFlow" name="receiptFlow" class="form-control" type="text" th:field="*{receiptFlow}">  
25 - </div>  
26 - </div>  
27 - <div class="form-group">  
28 - <label class="col-sm-3 control-label">自动生成托盘号：</label>  
29 - <div class="col-sm-8">  
30 - <input id="autoAssignLPN" name="autoAssignLPN" class="form-control" type="text" th:field="*{autoAssignLPN}">  
31 - </div>  
32 - </div>  
33 - <div class="form-group">  
34 - <label class="col-sm-3 control-label">允许超收：</label>  
35 - <div class="col-sm-8">  
36 - <div class="onoffswitch">  
37 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowOverReceiving"  
38 - name="allowOverReceiving" th:field="*{allowOverReceiving}">  
39 - <label class="onoffswitch-label" for="allowOverReceiving">  
40 - <span class="onoffswitch-inner"></span>  
41 - <span class="onoffswitch-switch"></span>  
42 - </label>  
43 - </div>  
44 - </div>  
45 - </div>  
46 - <div class="form-group">  
47 - <label class="col-sm-3 control-label">允许超收范围：</label>  
48 - <div class="col-sm-8">  
49 - <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control" type="text" th:field="*{allowOverReceivingQty}">  
50 - </div>  
51 - </div>  
52 - <div class="form-group">  
53 - <label class="col-sm-3 control-label">自动定位：</label>  
54 - <div class="col-sm-8">  
55 - <input id="autoLocate" name="autoLocate" class="form-control" type="text" th:field="*{autoLocate}"> 17 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
56 </div> 18 </div>
57 </div> 19 </div>
58 <div class="form-group"> 20 <div class="form-group">
59 - <label class="col-sm-3 control-label">RF显示未收数量：</label> 21 + <label class="col-sm-3 control-label">盘点首选项名称：</label>
60 <div class="col-sm-8"> 22 <div class="col-sm-8">
61 - <input id="showOpenQty" name="showOpenQty" class="form-control" type="text" th:field="*{showOpenQty}"> 23 + <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
62 </div> 24 </div>
63 </div> 25 </div>
64 <div class="form-group"> 26 <div class="form-group">
65 - <label class="col-sm-3 control-label">RF组车收货：</label> 27 + <label class="col-sm-3 control-label">仓库：</label>
66 <div class="col-sm-8"> 28 <div class="col-sm-8">
67 - <input id="groupPutaway" name="groupPutaway" class="form-control" type="text" th:field="*{groupPutaway}"> 29 + <input id="warehouseCode" name="warehouseCode" class="form-control" type="text" th:field="*{warehouseCode}" readonly="readonly">
68 </div> 30 </div>
69 </div> 31 </div>
70 <div class="form-group"> 32 <div class="form-group">
71 - <label class="col-sm-3 control-label">人工组盘：</label> 33 + <label class="col-sm-3 control-label">系统提示货位：</label>
72 <div class="col-sm-8"> 34 <div class="col-sm-8">
73 - <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text" th:field="*{manuallyBuildLPN}"> 35 + <input id="promptLocation" name="promptLocation" class="form-control" type="text" th:field="*{promptLocation}">
74 </div> 36 </div>
75 </div> 37 </div>
76 <div class="form-group"> 38 <div class="form-group">
77 - <label class="col-sm-3 control-label">定位规则：</label> 39 + <label class="col-sm-3 control-label">系统提示LPN：</label>
78 <div class="col-sm-8"> 40 <div class="col-sm-8">
79 - <input id="locationRule" name="locationRule" class="form-control" type="text" th:field="*{locationRule}"> 41 + <input id="promptLpn" name="promptLpn" class="form-control" type="text" th:field="*{promptLpn}">
80 </div> 42 </div>
81 </div> 43 </div>
82 - <div class="form-group">  
83 - <label class="col-sm-3 control-label">空库位规则：</label> 44 + <!--<div class="form-group">
  45 + <label class="col-sm-3 control-label">系统提示LPN：</label>
84 <div class="col-sm-8"> 46 <div class="col-sm-8">
85 - <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}"> 47 + <div class="onoffswitch">
  48 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn"
  49 + name="promptLpn" th:field="*{promptLpn}">
  50 + <label class="onoffswitch-label" for="promptLpn">
  51 + <span class="onoffswitch-inner"></span>
  52 + <span class="onoffswitch-switch"></span>
  53 + </label>
  54 + </div>
86 </div> 55 </div>
87 - </div> 56 + </div>-->
88 <div class="form-group"> 57 <div class="form-group">
89 - <label class="col-sm-3 control-label">RF逐件收货：</label> 58 + <label class="col-sm-3 control-label">系统提示物料：</label>
90 <div class="col-sm-8"> 59 <div class="col-sm-8">
91 - <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}"> 60 + <input id="promptItem" name="promptItem" class="form-control" type="text" th:field="*{promptItem}">
92 </div> 61 </div>
93 </div> 62 </div>
94 <div class="form-group"> 63 <div class="form-group">
95 - <label class="col-sm-3 control-label">RF自动提交收货：</label> 64 + <label class="col-sm-3 control-label">显示库存数量：</label>
96 <div class="col-sm-8"> 65 <div class="col-sm-8">
97 - <input id="pieceConfirm" name="pieceConfirm" class="form-control" type="text" th:field="*{pieceConfirm}"> 66 + <input id="promptQuantity" name="promptQuantity" class="form-control" type="text" th:field="*{promptQuantity}">
98 </div> 67 </div>
99 </div> 68 </div>
100 <div class="form-group"> 69 <div class="form-group">
101 - <label class="col-sm-3 control-label">abc分类：</label> 70 + <label class="col-sm-3 control-label">允许添加库存：</label>
102 <div class="col-sm-8"> 71 <div class="col-sm-8">
103 - <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}"> 72 + <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text" th:field="*{allowAddNewInventory}">
104 </div> 73 </div>
105 </div> 74 </div>
106 <div class="form-group"> 75 <div class="form-group">
107 - <label class="col-sm-3 control-label">保质期（天）：</label> 76 + <label class="col-sm-3 control-label">RF逐件盘点：</label>
108 <div class="col-sm-8"> 77 <div class="col-sm-8">
109 - <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}"> 78 + <input id="countByPiece" name="countByPiece" class="form-control" type="text" th:field="*{countByPiece}">
110 </div> 79 </div>
111 </div> 80 </div>
112 <div class="form-group"> 81 <div class="form-group">
113 - <label class="col-sm-3 control-label">临期预警（天）：</label> 82 + <label class="col-sm-3 control-label">数据版本：</label>
114 <div class="col-sm-8"> 83 <div class="col-sm-8">
115 - <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}"> 84 + <input id="version" name="version" class="form-control" type="text" th:field="*{version}">
116 </div> 85 </div>
117 </div> 86 </div>
118 <div class="form-group"> 87 <div class="form-group">
119 - <label class="col-sm-3 control-label">收货预警(天)：</label>  
120 - <div class="col-sm-8">  
121 - <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">  
122 - </div> 88 + <label class="col-sm-3 control-label">创建时间：</label>
  89 + <div class="col-sm-8">
  90 + <input id="created" name="created" class="form-control" type="text" th:field="*{created}" readonly="readonly">
123 </div> 91 </div>
124 - <div class="form-group">  
125 - <label class="col-sm-3 control-label">RF快速上架：</label>  
126 - <div class="col-sm-8">  
127 - <input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text" th:field="*{allowQuickPutaway}">  
128 - </div>  
129 </div> 92 </div>
130 <div class="form-group"> 93 <div class="form-group">
131 - <label class="col-sm-3 control-label">属性模板：</label>  
132 - <div class="col-sm-8">  
133 - <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">  
134 - </div> 94 + <label class="col-sm-3 control-label">创建者：</label>
  95 + <div class="col-sm-8">
  96 + <input id="createdBy" name="createdBy" class="form-control" type="text" th:field="*{createdBy}" readonly="readonly">
135 </div> 97 </div>
136 - <div class="form-group">  
137 - <label class="col-sm-3 control-label">快速入库：</label>  
138 - <div class="col-sm-8">  
139 - <input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text" th:field="*{useQuickCheckIn}">  
140 - </div>  
141 </div> 98 </div>
142 - <!--<div class="form-group">  
143 - <label class="col-sm-3 control-label">数据版本：</label>  
144 - <div class="col-sm-8">  
145 - <input id="version" name="version" class="form-control" type="text">  
146 - </div>  
147 - </div>-->  
148 - <!--<div class="form-group"> -->  
149 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
150 - <!--<div class="col-sm-8">-->  
151 - <!--<input id="created" name="created" class="form-control" type="text">-->  
152 - <!--</div>-->  
153 - <!--</div>-->  
154 - <!--<div class="form-group"> -->  
155 - <!--<label class="col-sm-3 control-label">创建者：</label>-->  
156 - <!--<div class="col-sm-8">-->  
157 - <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->  
158 - <!--</div>-->  
159 - <!--</div>-->  
160 <!--<div class="form-group"> --> 99 <!--<div class="form-group"> -->
161 - <!--<label class="col-sm-3 control-label">创建时间：</label>--> 100 + <!--<label class="col-sm-3 control-label">更新时间：</label>-->
162 <!--<div class="col-sm-8">--> 101 <!--<div class="col-sm-8">-->
163 <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">--> 102 <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
164 <!--</div>--> 103 <!--</div>-->
@@ -169,19 +108,25 @@ @@ -169,19 +108,25 @@
169 <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">--> 108 <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
170 <!--</div>--> 109 <!--</div>-->
171 <!--</div>--> 110 <!--</div>-->
172 - <!--<div class="form-group"> -->  
173 - <!--<label class="col-sm-3 control-label">是否有效：</label>-->  
174 - <!--<div class="col-sm-8">-->  
175 - <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->  
176 - <!--<div class="onoffswitch">-->  
177 - <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->  
178 - <!--<label class="onoffswitch-label" for="enable">-->  
179 - <!--<span class="onoffswitch-inner"></span>-->  
180 - <!--<span class="onoffswitch-switch"></span>-->  
181 - <!--</label>-->  
182 - <!--</div>-->  
183 - <!--</div>-->  
184 - <!--</div>--> 111 + <div class="form-group">
  112 + <label class="col-sm-3 control-label">处理标记：</label>
  113 + <div class="col-sm-8">
  114 + <input id="processStamp" name="processStamp" class="form-control" type="text" th:field="*{processStamp}" />
  115 + </div>
  116 + </div>
  117 + <!--<div class="form-group">
  118 + <label class="col-sm-3 control-label">是否有效：</label>
  119 + <div class="col-sm-8">
  120 + &lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;
  121 + <div class="onoffswitch">
  122 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
  123 + <label class="onoffswitch-label" for="enable">
  124 + <span class="onoffswitch-inner"></span>
  125 + <span class="onoffswitch-switch"></span>
  126 + </label>
  127 + </div>
  128 + </div>
  129 + </div>-->
185 <!--<div class="form-group"> --> 130 <!--<div class="form-group"> -->
186 <!--<label class="col-sm-3 control-label">是否删除：</label>--> 131 <!--<label class="col-sm-3 control-label">是否删除：</label>-->
187 <!--<div class="col-sm-8">--> 132 <!--<div class="col-sm-8">-->
@@ -220,7 +165,7 @@ @@ -220,7 +165,7 @@
220 <!--</div>--> 165 <!--</div>-->
221 <div class="form-group"> 166 <div class="form-group">
222 <div class="form-control-static col-sm-offset-9"> 167 <div class="form-control-static col-sm-offset-9">
223 - <button type="submit" class="btn btn-primary">提交</button> 168 + <input type="submit" class="btn btn-primary" value="提交">
224 <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button> 169 <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
225 </div> 170 </div>
226 </div> 171 </div>
@@ -228,8 +173,8 @@ @@ -228,8 +173,8 @@
228 </div> 173 </div>
229 <div th:include="include::footer"></div> 174 <div th:include="include::footer"></div>
230 <script type="text/javascript"> 175 <script type="text/javascript">
231 - var prefix = ctx + "config/receiptPreference";  
232 - $("#form-receiptPreference-edit").validate({ 176 + var prefix = ctx + "config/cycleCountPreference";
  177 + $("#form-cycleCountPreference-edit").validate({
233 rules:{ 178 rules:{
234 code:{ 179 code:{
235 required: true, 180 required: true,
@@ -237,40 +182,28 @@ @@ -237,40 +182,28 @@
237 name:{ 182 name:{
238 required: true, 183 required: true,
239 }, 184 },
240 - autoAssignLPN:{  
241 - required: true,  
242 - },  
243 - allowOverReceiving:{  
244 - required: true,  
245 - },  
246 - allowOverReceivingQty:{  
247 - required: true,  
248 - },  
249 - autoLocate: {  
250 - required: true,  
251 - },  
252 - showOpenQty: { 185 + warehouseCode:{
253 required: true, 186 required: true,
254 }, 187 },
255 - groupPutaway: { 188 + promptLocation:{
256 required: true, 189 required: true,
257 }, 190 },
258 - manuallyBuildLPN: { 191 + promptLpn:{
259 required: true, 192 required: true,
260 }, 193 },
261 - checkinByPiece: { 194 + promptItem: {
262 required: true, 195 required: true,
263 }, 196 },
264 - pieceConfirm: { 197 + promptQuantity: {
265 required: true, 198 required: true,
266 }, 199 },
267 - allowQuickPutaway: { 200 + allowAddNewInventory: {
268 required: true, 201 required: true,
269 } 202 }
270 }, 203 },
271 submitHandler: function(form) { 204 submitHandler: function(form) {
272 - var tableValue = $.common.getTableValue("#form-receiptPreference-edi");  
273 - tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked')); 205 + var tableValue = $.common.getTableValue("#form-cycleCountPreference-edit");
  206 + /*tableValue = formValueReplace(tableValue, "id", $("input[name='id']").is(':checked'));*/
274 $.operate.save(prefix + "/edit", tableValue); 207 $.operate.save(prefix + "/edit", tableValue);
275 } 208 }
276 }); 209 });
src/main/resources/templates/config/filterConfigDetail/add.html
  View file @eddd690
@@ -39,19 +39,35 @@ @@ -39,19 +39,35 @@
39 <div class="form-group"> 39 <div class="form-group">
40 <label class="col-sm-3 control-label">全SQL：</label> 40 <label class="col-sm-3 control-label">全SQL：</label>
41 <div class="col-sm-8"> 41 <div class="col-sm-8">
42 - <input id="statement" name="statement" class="description" type="text"> 42 + <input id="statement" name="statement" class="form-control" type="text">
43 </div> 43 </div>
44 </div> 44 </div>
45 <div class="form-group"> 45 <div class="form-group">
46 <label class="col-sm-3 control-label">是否系统创建：</label> 46 <label class="col-sm-3 control-label">是否系统创建：</label>
47 <div class="col-sm-8"> 47 <div class="col-sm-8">
48 - <input id="systemCreated" name="systemCreated" class="form-control" type="text"> 48 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  49 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" checked="checked"
  50 + class="radio_select">
  51 + <label for="systemCreated1">是</label>
  52 + </div>
  53 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  54 + <input type="radio" id="systemCreated2" name="systemCreated" value="false">
  55 + <label for="systemCreated2">否</label>
  56 + </div>
49 </div> 57 </div>
50 </div> 58 </div>
51 <div class="form-group"> 59 <div class="form-group">
52 <label class="col-sm-3 control-label">是否自定义SQL：</label> 60 <label class="col-sm-3 control-label">是否自定义SQL：</label>
53 <div class="col-sm-8"> 61 <div class="col-sm-8">
54 - <input id="customSql" name="customSql" class="form-control" type="text"> 62 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  63 + <input type="radio" id="customSql1" name="customSql" value="true" checked="checked"
  64 + class="radio_select">
  65 + <label for="customSql1">是</label>
  66 + </div>
  67 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  68 + <input type="radio" id="customSql2" name="customSql" value="false">
  69 + <label for="customSql2">否</label>
  70 + </div>
55 </div> 71 </div>
56 </div> 72 </div>
57 <div class="form-group"> 73 <div class="form-group">
src/main/resources/templates/config/filterConfigDetail/edit.html
  View file @eddd690
@@ -46,13 +46,29 @@ @@ -46,13 +46,29 @@
46 <div class="form-group"> 46 <div class="form-group">
47 <label class="col-sm-3 control-label">是否系统创建：</label> 47 <label class="col-sm-3 control-label">是否系统创建：</label>
48 <div class="col-sm-8"> 48 <div class="col-sm-8">
49 - <input id="systemCreated" name="systemCreated" class="form-control" type="text" th:field="*{systemCreated}"> 49 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  50 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" th:field="*{systemCreated}"
  51 + class="radio_select">
  52 + <label for="systemCreated1">是</label>
  53 + </div>
  54 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  55 + <input type="radio" id="systemCreated2" name="systemCreated" value="false" th:field="*{systemCreated}">
  56 + <label for="systemCreated2">否</label>
  57 + </div>
50 </div> 58 </div>
51 </div> 59 </div>
52 <div class="form-group"> 60 <div class="form-group">
53 <label class="col-sm-3 control-label">是否自定义SQL：</label> 61 <label class="col-sm-3 control-label">是否自定义SQL：</label>
54 <div class="col-sm-8"> 62 <div class="col-sm-8">
55 - <input id="customSql" name="customSql" class="form-control" type="text" th:field="*{customSql}"> 63 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  64 + <input type="radio" id="customSql1" name="customSql" value="true" th:field="*{customSql}"
  65 + class="radio_select">
  66 + <label for="customSql1">是</label>
  67 + </div>
  68 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  69 + <input type="radio" id="customSql2" name="customSql" value="false" th:field="*{customSql}">
  70 + <label for="customSql2">否</label>
  71 + </div>
56 </div> 72 </div>
57 </div> 73 </div>
58 <div class="form-group"> 74 <div class="form-group">
src/main/resources/templates/config/filterConfigDetail/filterConfigDetail.html
  View file @eddd690
@@ -83,7 +83,27 @@ @@ -83,7 +83,27 @@
83 }, 83 },
84 { 84 {
85 field : 'systemCreated', 85 field : 'systemCreated',
86 - title : '是否系统创建' 86 + title : '是否系统创建',
  87 + formatter: function (value, item, index) {
  88 + if (value==true) {
  89 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  90 + }
  91 + else if (value==false) {
  92 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  93 + }
  94 + }
  95 + },
  96 + {
  97 + field : 'customSql',
  98 + title : '是否自定义SQL',
  99 + formatter: function (value, item, index) {
  100 + if (value==true) {
  101 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  102 + }
  103 + else if (value==false) {
  104 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  105 + }
  106 + }
87 }, 107 },
88 { 108 {
89 field : 'version', 109 field : 'version',
src/main/resources/templates/config/filterConfigHeader/add.html
  View file @eddd690
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 -<html lang="zh" xmlns:th="http://www.thymeleaf.org"> 2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 <meta charset="utf-8"> 3 <meta charset="utf-8">
4 <head th:include="include :: header"></head> 4 <head th:include="include :: header"></head>
5 <body class="white-bg"> 5 <body class="white-bg">
@@ -35,7 +35,26 @@ @@ -35,7 +35,26 @@
35 <input id="description" name="description" class="form-control" type="text"> 35 <input id="description" name="description" class="form-control" type="text">
36 </div> 36 </div>
37 </div> 37 </div>
38 - 38 + <!--<div class="form-group">-->
  39 + <!--<label class="col-sm-3 control-label">是否系统创建：</label>-->
  40 + <!--<div class="col-sm-8">-->
  41 + <!--<input id="systemCreated" name="systemCreated" class="form-control" type="text">-->
  42 + <!--</div>-->
  43 + <!--</div>-->
  44 + <div class="form-group">
  45 + <label class="col-sm-3 control-label">是否系统创建：</label>
  46 + <div class="col-sm-8">
  47 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  48 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" checked="checked"
  49 + class="radio_select">
  50 + <label for="systemCreated1">是</label>
  51 + </div>
  52 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  53 + <input type="radio" id="systemCreated2" name="systemCreated" value="false">
  54 + <label for="systemCreated2">否</label>
  55 + </div>
  56 + </div>
  57 + </div>
39 <div class="form-group"> 58 <div class="form-group">
40 <div class="form-control-static col-sm-offset-9"> 59 <div class="form-control-static col-sm-offset-9">
41 <button type="submit" class="btn btn-primary">提交</button> 60 <button type="submit" class="btn btn-primary">提交</button>
@@ -48,18 +67,18 @@ @@ -48,18 +67,18 @@
48 <script type="text/javascript"> 67 <script type="text/javascript">
49 var prefix = ctx + "config/filterConfigHeader"; 68 var prefix = ctx + "config/filterConfigHeader";
50 $("#form-filterConfigHeader-add").validate({ 69 $("#form-filterConfigHeader-add").validate({
51 - rules:{  
52 - moduleType:{  
53 - required:true, 70 + rules: {
  71 + moduleType: {
  72 + required: true,
54 }, 73 },
55 - recordType:{  
56 - required:true, 74 + recordType: {
  75 + required: true,
57 }, 76 },
58 - filterCode:{  
59 - required:true, 77 + filterCode: {
  78 + required: true,
60 }, 79 },
61 }, 80 },
62 - submitHandler: function(form) { 81 + submitHandler: function (form) {
63 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize()); 82 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
64 var tableValue = $.common.getTableValue("#form-filterConfigHeader-add"); 83 var tableValue = $.common.getTableValue("#form-filterConfigHeader-add");
65 $.operate.save(prefix + "/add", tableValue); 84 $.operate.save(prefix + "/add", tableValue);
src/main/resources/templates/config/filterConfigHeader/edit.html
  View file @eddd690
@@ -36,6 +36,32 @@ @@ -36,6 +36,32 @@
36 <input id="description" name="description" class="form-control" type="text" th:field="*{description}"> 36 <input id="description" name="description" class="form-control" type="text" th:field="*{description}">
37 </div> 37 </div>
38 </div> 38 </div>
  39 + <!--<div class="form-group">-->
  40 + <!--<label class="col-sm-3 control-label">是否系统创建：</label>-->
  41 + <!--<div class="col-sm-8">-->
  42 + <!--<div class="onoffswitch">-->
  43 + <!--<input type="checkbox" th:checked="${systemCreated}" class="onoffswitch-checkbox" id="systemCreated" name="systemCreated">-->
  44 + <!--<label class="onoffswitch-label" for="systemCreated">-->
  45 + <!--<span class="onoffswitch-inner"></span>-->
  46 + <!--<span class="onoffswitch-switch"></span>-->
  47 + <!--</label>-->
  48 + <!--</div>-->
  49 + <!--</div>-->
  50 + <!--</div>-->
  51 + <div class="form-group">
  52 + <label class="col-sm-3 control-label">是否系统创建：</label>
  53 + <div class="col-sm-8">
  54 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  55 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" th:field="*{systemCreated}"
  56 + class="radio_select">
  57 + <label for="systemCreated1">是</label>
  58 + </div>
  59 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  60 + <input type="radio" id="systemCreated2" name="systemCreated" value="false" th:field="*{systemCreated}">
  61 + <label for="systemCreated2">否</label>
  62 + </div>
  63 + </div>
  64 + </div>
39 <div class="form-group"> 65 <div class="form-group">
40 <div class="form-control-static col-sm-offset-9"> 66 <div class="form-control-static col-sm-offset-9">
41 <button type="submit" class="btn btn-primary">提交</button> 67 <button type="submit" class="btn btn-primary">提交</button>
src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html
  View file @eddd690
@@ -112,8 +112,16 @@ @@ -112,8 +112,16 @@
112 title : '描述' 112 title : '描述'
113 }, 113 },
114 { 114 {
115 - field : 'description',  
116 - title : '是否系统创建' 115 + field : 'systemCreated',
  116 + title : '是否系统创建',
  117 + formatter: function (value, item, index) {
  118 + if (value==true) {
  119 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  120 + }
  121 + else if (value==false) {
  122 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  123 + }
  124 + }
117 }, 125 },
118 { 126 {
119 field : 'version', 127 field : 'version',
src/main/resources/templates/config/shipmentPreference/add.html
  View file @eddd690
@@ -50,13 +50,29 @@ @@ -50,13 +50,29 @@
50 <div class="form-group"> 50 <div class="form-group">
51 <label class="col-sm-3 control-label">允许越库：</label> 51 <label class="col-sm-3 control-label">允许越库：</label>
52 <div class="col-sm-8"> 52 <div class="col-sm-8">
53 - <input id="allowCross" name="allowCross" class="form-control" type="text"> 53 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  54 + <input type="radio" id="allowCross1" name="allowCross" value="true" checked="checked"
  55 + class="radio_select">
  56 + <label for="allowCross1">是</label>
  57 + </div>
  58 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  59 + <input type="radio" id="allowCross2" name="allowCross" value="false">
  60 + <label for="allowCross2">否</label>
  61 + </div>
54 </div> 62 </div>
55 </div> 63 </div>
56 <div class="form-group"> 64 <div class="form-group">
57 <label class="col-sm-3 control-label">允许未质检的出库：</label> 65 <label class="col-sm-3 control-label">允许未质检的出库：</label>
58 <div class="col-sm-8"> 66 <div class="col-sm-8">
59 - <input id="allowQcCheckResult" name="allowQcCheckResult" class="form-control" type="text"> 67 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  68 + <input type="radio" id="allowQcCheckResult1" name="allowQcCheckResult" value="true" checked="checked"
  69 + class="radio_select">
  70 + <label for="allowQcCheckResult1">是</label>
  71 + </div>
  72 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  73 + <input type="radio" id="allowQcCheckResult2" name="allowQcCheckResult" value="false">
  74 + <label for="allowQcCheckResult2">否</label>
  75 + </div>
60 </div> 76 </div>
61 </div> 77 </div>
62 <div class="form-group"> 78 <div class="form-group">
src/main/resources/templates/config/shipmentPreference/edit.html
  View file @eddd690
@@ -51,14 +51,29 @@ @@ -51,14 +51,29 @@
51 <div class="form-group"> 51 <div class="form-group">
52 <label class="col-sm-3 control-label">允许越库：</label> 52 <label class="col-sm-3 control-label">允许越库：</label>
53 <div class="col-sm-8"> 53 <div class="col-sm-8">
54 - <input id="allowCross" name="allowCross" class="form-control" type="text" th:field="*{allowCross}"> 54 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  55 + <input type="radio" id="allowCross1" name="allowCross" value="true" th:field="*{allowCross}"
  56 + class="radio_select">
  57 + <label for="allowCross1">是</label>
  58 + </div>
  59 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  60 + <input type="radio" id="allowCross2" name="allowCross" value="false" th:field="*{allowCross}">
  61 + <label for="allowCross2">否</label>
  62 + </div>
55 </div> 63 </div>
56 </div> 64 </div>
57 <div class="form-group"> 65 <div class="form-group">
58 <label class="col-sm-3 control-label">允许未质检的出库：</label> 66 <label class="col-sm-3 control-label">允许未质检的出库：</label>
59 <div class="col-sm-8"> 67 <div class="col-sm-8">
60 - <input id="allowQcCheckResult" name="allowQcCheckResult" class="form-control"  
61 - type="text" th:field="*{allowQcCheckResult}"> 68 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  69 + <input type="radio" id="allowQcCheckResult1" name="allowQcCheckResult" value="true" th:field="*{allowQcCheckResult}"
  70 + class="radio_select">
  71 + <label for="allowQcCheckResult1">是</label>
  72 + </div>
  73 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  74 + <input type="radio" id="allowQcCheckResult2" name="allowQcCheckResult" value="false" th:field="*{allowQcCheckResult}">
  75 + <label for="allowQcCheckResult2">否</label>
  76 + </div>
62 </div> 77 </div>
63 </div> 78 </div>
64 <div class="form-group"> 79 <div class="form-group">
src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
  View file @eddd690
@@ -102,11 +102,27 @@ @@ -102,11 +102,27 @@
102 }, 102 },
103 { 103 {
104 field : 'allowCross', 104 field : 'allowCross',
105 - title : '允许越库' 105 + title : '允许越库',
  106 + formatter: function (value, item, index) {
  107 + if (value==true) {
  108 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  109 + }
  110 + else if (value==false) {
  111 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  112 + }
  113 + }
106 }, 114 },
107 { 115 {
108 field : 'allowQcCheckResult', 116 field : 'allowQcCheckResult',
109 - title : '允许未质检的出库' 117 + title : '允许未质检的出库',
  118 + formatter: function (value, item, index) {
  119 + if (value==true) {
  120 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  121 + }
  122 + else if (value==false) {
  123 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  124 + }
  125 + }
110 }, 126 },
111 { 127 {
112 field : 'showInventoryQty', 128 field : 'showInventoryQty',
src/main/resources/templates/config/shipmentType/add.html 0 → 100644
  View file @eddd690
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-receiptType-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">编码：</label>
  10 + <div class="col-sm-8">
  11 + <input id="code" name="code" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">名称：</label>
  16 + <div class="col-sm-8">
  17 + <input id="name" name="name" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">货主编码：</label>
  22 + <div class="col-sm-8">
  23 + <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
  24 + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
  25 + </select>
  26 + </div>
  27 + </div>
  28 + <!--<div class="form-group"> -->
  29 + <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
  30 + <!--<div class="col-sm-8">-->
  31 + <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
  32 + <!--</div>-->
  33 + <!--</div>-->
  34 + <!--<div class="form-group"> -->
  35 + <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
  36 + <!--<div class="col-sm-8">-->
  37 + <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
  38 + <!--</div>-->
  39 + <!--</div>-->
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">关联订单类型：</label>
  42 + <div class="col-sm-8">
  43 + <input id="referType" name="referType" class="form-control" type="text">
  44 + </div>
  45 + </div>
  46 + <div class="form-group">
  47 + <label class="col-sm-3 control-label">出库流程：</label>
  48 + <div class="col-sm-8">
  49 + <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}">
  50 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  51 + </select>
  52 + </div>
  53 + </div>
  54 + <!--<div class="form-group">
  55 + <label class="col-sm-3 control-label">数据版本：</label>
  56 + <div class="col-sm-8">
  57 + <input id="version" name="version" class="form-control" type="text">
  58 + </div>
  59 + </div>-->
  60 + <!--<div class="form-group"> -->
  61 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  62 + <!--<div class="col-sm-8">-->
  63 + <!--<input id="created" name="created" class="form-control" type="text">-->
  64 + <!--</div>-->
  65 + <!--</div>-->
  66 + <!--<div class="form-group"> -->
  67 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  68 + <!--<div class="col-sm-8">-->
  69 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  70 + <!--</div>-->
  71 + <!--</div>-->
  72 + <!--<div class="form-group"> -->
  73 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  74 + <!--<div class="col-sm-8">-->
  75 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  76 + <!--</div>-->
  77 + <!--</div>-->
  78 + <!--<div class="form-group"> -->
  79 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  80 + <!--<div class="col-sm-8">-->
  81 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  82 + <!--</div>-->
  83 + <!--</div>-->
  84 + <!--<div class="form-group"> -->
  85 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  86 + <!--<div class="col-sm-8">-->
  87 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  88 + <!--<div class="onoffswitch">-->
  89 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  90 + <!--<label class="onoffswitch-label" for="enable">-->
  91 + <!--<span class="onoffswitch-inner"></span>-->
  92 + <!--<span class="onoffswitch-switch"></span>-->
  93 + <!--</label>-->
  94 + <!--</div>-->
  95 + <!--</div>-->
  96 + <!--</div>-->
  97 + <!--<div class="form-group"> -->
  98 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  99 + <!--<div class="col-sm-8">-->
  100 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  101 + <!--</div>-->
  102 + <!--</div>-->
  103 + <!--<div class="form-group"> -->
  104 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  105 + <!--<div class="col-sm-8">-->
  106 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  107 + <!--</div>-->
  108 + <!--</div>-->
  109 + <!--<div class="form-group"> -->
  110 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  111 + <!--<div class="col-sm-8">-->
  112 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  113 + <!--</div>-->
  114 + <!--</div>-->
  115 + <!--<div class="form-group"> -->
  116 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  117 + <!--<div class="col-sm-8">-->
  118 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  119 + <!--</div>-->
  120 + <!--</div>-->
  121 + <!--<div class="form-group"> -->
  122 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  123 + <!--<div class="col-sm-8">-->
  124 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  125 + <!--</div>-->
  126 + <!--</div>-->
  127 + <!--<div class="form-group"> -->
  128 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  129 + <!--<div class="col-sm-8">-->
  130 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  131 + <!--</div>-->
  132 + <!--</div>-->
  133 + <div class="form-group">
  134 + <label class="col-sm-3 control-label">是否启用：</label>
  135 + <div class="col-sm-8">
  136 + <div class="onoffswitch">
  137 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
  138 + <label class="onoffswitch-label" for="enable">
  139 + <span class="onoffswitch-inner"></span>
  140 + <span class="onoffswitch-switch"></span>
  141 + </label>
  142 + </div>
  143 + </div>
  144 + </div>
  145 + <div class="form-group">
  146 + <div class="form-control-static col-sm-offset-9">
  147 + <button type="submit" class="btn btn-primary">提交</button>
  148 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  149 + </div>
  150 + </div>
  151 + </form>
  152 +</div>
  153 +<div th:include="include::footer"></div>
  154 +<script type="text/javascript">
  155 + var prefix = ctx + "config/shipmentType";
  156 + $("#form-receiptType-add").validate({
  157 + rules:{
  158 + code:{
  159 + required:true,
  160 + },
  161 + name:{
  162 + required:true,
  163 + },
  164 + shipmentFlow:{
  165 + required:true,
  166 + },
  167 + },
  168 + submitHandler: function(form) {
  169 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  170 + var tableValue = $.common.getTableValue("#form-receiptType-add");
  171 + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  172 + tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
  173 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  174 + $.operate.save(prefix + "/add", tableValue);
  175 + }
  176 + });
  177 +</script>
  178 +</body>
  179 +</html>
src/main/resources/templates/config/shipmentType/edit.html 0 → 100644
  View file @eddd690
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-shipmentType-edit" th:object="${shipmentType}">
  8 + <input name="id" type="hidden" th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">编码：</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">名字：</label>
  17 + <div class="col-sm-8">
  18 + <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">货主编码：</label>
  23 + <div class="col-sm-8">
  24 + <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"
  25 + th:field="*{companyCode}">
  26 + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
  27 + </select>
  28 + </div>
  29 + </div>
  30 + <!--<div class="form-group"> -->
  31 + <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
  32 + <!--<div class="col-sm-8">-->
  33 + <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
  34 + <!--</div>-->
  35 + <!--</div>-->
  36 + <!--<div class="form-group"> -->
  37 + <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
  38 + <!--<div class="col-sm-8">-->
  39 + <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
  40 + <!--</div>-->
  41 + <!--</div>-->
  42 + <div class="form-group">
  43 + <label class="col-sm-3 control-label">关联订单类型：</label>
  44 + <div class="col-sm-8">
  45 + <input id="referType" name="referType" class="form-control" type="text" th:field="*{referType}">
  46 + </div>
  47 + </div>
  48 + <div class="form-group">
  49 + <label class="col-sm-3 control-label">出库流程：</label>
  50 + <div class="col-sm-8">
  51 + <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}" th:field="*{receiptFlow}">
  52 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  53 + </select>
  54 + </div>
  55 + </div>
  56 + <!--<div class="form-group">
  57 + <label class="col-sm-3 control-label">数据版本：</label>
  58 + <div class="col-sm-8">
  59 + <input id="version" name="version" class="form-control" type="text">
  60 + </div>
  61 + </div>-->
  62 + <!--<div class="form-group"> -->
  63 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  64 + <!--<div class="col-sm-8">-->
  65 + <!--<input id="created" name="created" class="form-control" type="text">-->
  66 + <!--</div>-->
  67 + <!--</div>-->
  68 + <!--<div class="form-group"> -->
  69 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  70 + <!--<div class="col-sm-8">-->
  71 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  72 + <!--</div>-->
  73 + <!--</div>-->
  74 + <!--<div class="form-group"> -->
  75 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  76 + <!--<div class="col-sm-8">-->
  77 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  78 + <!--</div>-->
  79 + <!--</div>-->
  80 + <!--<div class="form-group"> -->
  81 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  82 + <!--<div class="col-sm-8">-->
  83 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  84 + <!--</div>-->
  85 + <!--</div>-->
  86 + <!--<div class="form-group"> -->
  87 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  88 + <!--<div class="col-sm-8">-->
  89 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  90 + <!--<div class="onoffswitch">-->
  91 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  92 + <!--<label class="onoffswitch-label" for="enable">-->
  93 + <!--<span class="onoffswitch-inner"></span>-->
  94 + <!--<span class="onoffswitch-switch"></span>-->
  95 + <!--</label>-->
  96 + <!--</div>-->
  97 + <!--</div>-->
  98 + <!--</div>-->
  99 + <!--<div class="form-group"> -->
  100 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  101 + <!--<div class="col-sm-8">-->
  102 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  103 + <!--</div>-->
  104 + <!--</div>-->
  105 + <!--<div class="form-group"> -->
  106 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  107 + <!--<div class="col-sm-8">-->
  108 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  109 + <!--</div>-->
  110 + <!--</div>-->
  111 + <!--<div class="form-group"> -->
  112 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  113 + <!--<div class="col-sm-8">-->
  114 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  115 + <!--</div>-->
  116 + <!--</div>-->
  117 + <!--<div class="form-group"> -->
  118 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  119 + <!--<div class="col-sm-8">-->
  120 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  121 + <!--</div>-->
  122 + <!--</div>-->
  123 + <!--<div class="form-group"> -->
  124 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  125 + <!--<div class="col-sm-8">-->
  126 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  127 + <!--</div>-->
  128 + <!--</div>-->
  129 + <!--<div class="form-group"> -->
  130 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  131 + <!--<div class="col-sm-8">-->
  132 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  133 + <!--</div>-->
  134 + <!--</div>-->
  135 + <div class="form-group">
  136 + <label class="col-sm-3 control-label">是否启用：</label>
  137 + <div class="col-sm-8">
  138 + <div class="onoffswitch">
  139 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
  140 + <label class="onoffswitch-label" for="enable">
  141 + <span class="onoffswitch-inner"></span>
  142 + <span class="onoffswitch-switch"></span>
  143 + </label>
  144 + </div>
  145 + </div>
  146 + </div>
  147 + <div class="form-group">
  148 + <div class="form-control-static col-sm-offset-9">
  149 + <button type="submit" class="btn btn-primary">提交</button>
  150 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  151 + </div>
  152 + </div>
  153 + </form>
  154 +</div>
  155 +<div th:include="include::footer"></div>
  156 +<script type="text/javascript">
  157 + var prefix = ctx + "config/shipmentType";
  158 + $("#form-receiptType-edit").validate({
  159 + rules:{
  160 + code:{
  161 + required:true,
  162 + },
  163 + name:{
  164 + required:true,
  165 + },
  166 + shipmentFlow:{
  167 + required:true,
  168 + },
  169 + },
  170 + submitHandler: function(form) {
  171 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  172 + var tableValue = $.common.getTableValue("#form-shipmentType-edit");
  173 + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  174 + tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
  175 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  176 + $.operate.save(prefix + "/edit", tableValue);
  177 + }
  178 + });
  179 +</script>
  180 +</body>
  181 +</html>
src/main/resources/templates/config/shipmentType/shipmentType.html 0 → 100644
  View file @eddd690
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <form id="shipmentType-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 编码：<input type="text" name="code"/>
  14 + </li>
  15 + <li>
  16 + 名称：<input type="text" name="name"/>
  17 + </li>
  18 + <li class="time">
  19 + <label>创建时间： </label>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  21 + <span>-</span>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  23 + </li>
  24 + <li>
  25 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  26 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  27 + </li>
  28 + </ul>
  29 + </div>
  30 + </form>
  31 + </div>
  32 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  33 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:shipmentType:add">
  34 + <i class="fa fa-plus"></i> 新增
  35 + </a>
  36 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:shipmentType:remove">
  37 + <i class="fa fa-trash-o"></i> 删除
  38 + </a>
  39 + </div>
  40 +
  41 + <div class="col-sm-12 select-info">
  42 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  43 + </div>
  44 + <div>
  45 + </div>
  46 + <div th:include="include :: footer"></div>
  47 + <script th:inline="javascript">
  48 + var editFlag = [[${@permission.hasPermi('config:shipmentType:edit')}]];
  49 + var removeFlag = [[${@permission.hasPermi('config:shipmentType:remove')}]];
  50 + var prefix = ctx + "config/shipmentType";
  51 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  52 + $(function() {
  53 + var options = {
  54 + url: prefix + "/list",
  55 + createUrl: prefix + "/add",
  56 + updateUrl: prefix + "/edit/{id}",
  57 + removeUrl: prefix + "/remove",
  58 + modalName: "出库单类型",
  59 + search: false,
  60 + columns: [{
  61 + checkbox: true
  62 + },
  63 + {
  64 + field : 'id',
  65 + title : '出库单类型Id'
  66 + },
  67 + {
  68 + field : 'code',
  69 + title : '类型编码'
  70 + },
  71 + {
  72 + field : 'name',
  73 + title : '名称'
  74 + },
  75 + {
  76 + field : 'companyCode',
  77 + title : '货主编码',
  78 + visible:false
  79 + },
  80 + {
  81 + field : 'warehouseCode',
  82 + title : '仓库编码',
  83 + visible:false
  84 + },
  85 + {
  86 + field : 'referType',
  87 + title : '关联订单类型'
  88 + },
  89 + {
  90 + field : 'shipmentFlow',
  91 + title : '出库流程'
  92 + },
  93 + {
  94 + field : 'created',
  95 + title : '创建时间'
  96 + },
  97 + {
  98 + field : 'createdBy',
  99 + title : '创建用户'
  100 + },
  101 + {
  102 + field : 'lastUpdated',
  103 + title : '更新时间'
  104 + },
  105 + {
  106 + field : 'lastUpdatedBy',
  107 + title : '更新用户'
  108 + },
  109 + {
  110 + field : 'enable',
  111 + title : '是否有效',
  112 + formatter: function(value, row, index) {
  113 + return $.table.selectDictLabel(datas, value);
  114 + },
  115 + align: 'center',
  116 + },
  117 + {
  118 + field : 'version',
  119 + title : '数据版本',
  120 + visible : false
  121 + },
  122 + {
  123 + field : 'processStamp',
  124 + title : '处理标记',
  125 + visible : false
  126 + },
  127 + {
  128 + field : 'userDef1',
  129 + title : '自定义字段1' ,
  130 + visible:false
  131 + },
  132 + {
  133 + field : 'userDef2',
  134 + title : '自定义字段2' ,
  135 + visible:false
  136 + },
  137 + {
  138 + field : 'userDef3',
  139 + title : '自定义字段3' ,
  140 + visible:false
  141 + },
  142 + {
  143 + field : 'userDef4',
  144 + title : '自定义字段4' ,
  145 + visible:false
  146 + },
  147 + {
  148 + title: '操作',
  149 + align: 'center',
  150 + formatter: function(value, row, index) {
  151 + var actions = [];
  152 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  153 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  154 + return actions.join('');
  155 + }
  156 + }]
  157 + };
  158 + $.table.init(options);
  159 + });
  160 + </script>
  161 +</body>
  162 +</html>
0 \ No newline at end of file 163 \ No newline at end of file
src/main/resources/templates/inventory/inventoryHeader/transfer.html
  View file @eddd690
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </div> 34 </div>
35 <div th:include="include::footer"></div> 35 <div th:include="include::footer"></div>
36 <script type="text/javascript"> 36 <script type="text/javascript">
37 - var prefix = ctx + "inventory/inventorytransfer" 37 + var prefix = ctx + "inventory/inventoryHeader"
38 $("#form-inventory-transfer").validate({ 38 $("#form-inventory-transfer").validate({
39 rules:{ 39 rules:{
40 sourceLocation:{ 40 sourceLocation:{