wms / wms_xiaogangabu · Commits

Commit b8cd0774defdcded742ab9688abd759d4d3fbd05

Authored by pengcheng
2 parents c2e6f4c2 e8e59ce9
develop ... test

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

Inline Side-by-side
Showing 13 changed files with 1134 additions and 158 deletions
.idea/compiler.xml
  View file @b8cd077
... ... @@ -6,8 +6,8 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="WMSV1" />
10 9 <module name="huaheng" />
  10 + <module name="wms2" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ... @@ -15,6 +15,7 @@
15 15 <option name="ADDITIONAL_OPTIONS_OVERRIDE">
16 16 <module name="WMSV1" options="-parameters" />
17 17 <module name="huaheng" options="-parameters" />
  18 + <module name="wms2" options="-parameters" />
18 19 </option>
19 20 </component>
20 21 </project>
21 22 \ No newline at end of file
... ...
.idea/workspace.xml
  View file @b8cd077
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkComplete.html" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" afterDir="false" />
7   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkHeader/checkHeader.html" afterDir="false" />
  4 + <list default="true" id="1fe4ff20-6474-45ee-a361-9572a808e9c9" name="Default Changelist" comment="">
8 5 <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
9 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/domain/CheckDetail.java" afterDir="false" />
11 7 </list>
12 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 9 <option name="SHOW_DIALOG" value="false" />
... ... @@ -33,61 +29,395 @@
33 29 </path>
34 30 <path>
35 31 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
36   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  32 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
  33 + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
37 34 </path>
38 35 <path>
39 36 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
40   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  37 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
41 38 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
  39 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
42 40 </path>
43 41 <path>
44 42 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
45   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
  43 + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
46 44 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
47   - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
  45 + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
  46 + <item name="task_detail: table" type="285a2a93:MysqlImplModel$Table" />
  47 + </path>
  48 + <path>
  49 + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
  50 + <item name="@localhost" type="feb32156:DbDataSourceImpl" />
48 51 </path>
49 52 <path>
50 53 <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
51 54 <item name="@localhost" type="feb32156:DbDataSourceImpl" />
52 55 <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
53   - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
54   - <item name="checking_register: table" type="285a2a93:MysqlImplModel$Table" />
55 56 </path>
56 57 </expand>
57 58 <select />
58 59 </component>
  60 + <component name="FileEditorManager">
  61 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  62 + <file pinned="false" current-in-tab="true">
  63 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state relative-caret-position="140">
  66 + <caret line="500" lean-forward="true" selection-start-line="500" selection-end-line="500" />
  67 + <folding>
  68 + <element signature="imports" expanded="true" />
  69 + </folding>
  70 + </state>
  71 + </provider>
  72 + </entry>
  73 + </file>
  74 + <file pinned="false" current-in-tab="false">
  75 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java">
  76 + <provider selected="true" editor-type-id="text-editor">
  77 + <state relative-caret-position="-157">
  78 + <caret line="173" column="28" selection-start-line="173" selection-start-column="10" selection-end-line="173" selection-end-column="28" />
  79 + </state>
  80 + </provider>
  81 + </entry>
  82 + </file>
  83 + <file pinned="false" current-in-tab="false">
  84 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java">
  85 + <provider selected="true" editor-type-id="text-editor">
  86 + <state relative-caret-position="226">
  87 + <caret line="347" column="1" selection-start-line="347" selection-start-column="1" selection-end-line="347" selection-end-column="1" />
  88 + </state>
  89 + </provider>
  90 + </entry>
  91 + </file>
  92 + <file pinned="false" current-in-tab="false">
  93 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java">
  94 + <provider selected="true" editor-type-id="text-editor">
  95 + <state relative-caret-position="19">
  96 + <caret line="193" column="37" lean-forward="true" selection-start-line="193" selection-start-column="37" selection-end-line="193" selection-end-column="37" />
  97 + <folding>
  98 + <element signature="e#14321#14322#0" expanded="true" />
  99 + <element signature="e#14357#14358#0" expanded="true" />
  100 + </folding>
  101 + </state>
  102 + </provider>
  103 + </entry>
  104 + </file>
  105 + <file pinned="false" current-in-tab="false">
  106 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
  107 + <provider selected="true" editor-type-id="text-editor">
  108 + <state relative-caret-position="266">
  109 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  110 + </state>
  111 + </provider>
  112 + </entry>
  113 + </file>
  114 + <file pinned="false" current-in-tab="false">
  115 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
  116 + <provider selected="true" editor-type-id="text-editor">
  117 + <state relative-caret-position="1596">
  118 + <caret line="112" column="26" selection-start-line="112" selection-start-column="16" selection-end-line="112" selection-end-column="26" />
  119 + </state>
  120 + </provider>
  121 + </entry>
  122 + </file>
  123 + <file pinned="false" current-in-tab="false">
  124 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
  125 + <provider selected="true" editor-type-id="text-editor">
  126 + <state relative-caret-position="1653">
  127 + <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />
  128 + </state>
  129 + </provider>
  130 + </entry>
  131 + </file>
  132 + <file pinned="false" current-in-tab="false">
  133 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
  134 + <provider selected="true" editor-type-id="text-editor">
  135 + <state relative-caret-position="4484">
  136 + <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />
  137 + </state>
  138 + </provider>
  139 + </entry>
  140 + </file>
  141 + </leaf>
  142 + </component>
59 143 <component name="FileTemplateManagerImpl">
60 144 <option name="RECENT_TEMPLATES">
61 145 <list>
  146 + <option value="CSS File" />
62 147 <option value="Class" />
63 148 <option value="HTML File" />
64 149 </list>
65 150 </option>
66 151 </component>
  152 + <component name="FindInProjectRecents">
  153 + <findStrings>
  154 + <find>a</find>
  155 + </findStrings>
  156 + </component>
67 157 <component name="Git.Settings">
68   - <option name="RECENT_BRANCH_BY_REPOSITORY">
69   - <map>
70   - <entry key="$PROJECT_DIR$" value="master" />
71   - </map>
72   - </option>
73 158 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
74 159 </component>
75   - <component name="IgnoredFileRootStore">
76   - <option name="generatedRoots">
77   - <set>
78   - <option value="E:\code\wms2\.idea" />
79   - </set>
  160 + <component name="IdeDocumentHistory">
  161 + <option name="CHANGED_PATHS">
  162 + <list>
  163 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" />
  164 + <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
  165 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />
  166 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
  167 + <option value="G:/网星联创/千金电玩城后台管理/ticketManager/src/com/ticket/server/back/player/entity/PlayerInfo.java" />
  168 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java" />
  169 + </list>
  170 + </option>
  171 + </component>
  172 + <component name="JsFlowSettings">
  173 + <service-enabled>true</service-enabled>
  174 + <exe-path />
  175 + <other-services-enabled>true</other-services-enabled>
  176 + <auto-save>true</auto-save>
  177 + </component>
  178 + <component name="MavenImportPreferences">
  179 + <option name="importingSettings">
  180 + <MavenImportingSettings>
  181 + <option name="importAutomatically" value="true" />
  182 + </MavenImportingSettings>
80 183 </option>
81 184 </component>
82   - <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  185 + <component name="ProjectFrameBounds" extendedState="6">
  186 + <option name="x" value="470" />
  187 + <option name="width" value="980" />
  188 + <option name="height" value="1030" />
  189 + </component>
  190 + <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
83 191 <component name="ProjectLevelVcsManager">
84 192 <ConfirmationsSetting value="2" id="Add" />
85 193 </component>
  194 + <component name="ProjectView">
  195 + <navigator proportions="" version="1">
  196 + <foldersAlwaysOnTop value="true" />
  197 + </navigator>
  198 + <panes>
  199 + <pane id="Scope" />
  200 + <pane id="PackagesPane" />
  201 + <pane id="ProjectPane">
  202 + <subPane>
  203 + <expand>
  204 + <path>
  205 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  206 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  207 + </path>
  208 + <path>
  209 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  210 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  211 + <item name="src" type="462c0819:PsiDirectoryNode" />
  212 + </path>
  213 + <path>
  214 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  215 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  216 + <item name="src" type="462c0819:PsiDirectoryNode" />
  217 + <item name="main" type="462c0819:PsiDirectoryNode" />
  218 + </path>
  219 + <path>
  220 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  221 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  222 + <item name="src" type="462c0819:PsiDirectoryNode" />
  223 + <item name="main" type="462c0819:PsiDirectoryNode" />
  224 + <item name="java" type="462c0819:PsiDirectoryNode" />
  225 + </path>
  226 + <path>
  227 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  228 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  229 + <item name="src" type="462c0819:PsiDirectoryNode" />
  230 + <item name="main" type="462c0819:PsiDirectoryNode" />
  231 + <item name="java" type="462c0819:PsiDirectoryNode" />
  232 + <item name="com" type="462c0819:PsiDirectoryNode" />
  233 + </path>
  234 + <path>
  235 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  236 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  237 + <item name="src" type="462c0819:PsiDirectoryNode" />
  238 + <item name="main" type="462c0819:PsiDirectoryNode" />
  239 + <item name="java" type="462c0819:PsiDirectoryNode" />
  240 + <item name="com" type="462c0819:PsiDirectoryNode" />
  241 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  242 + </path>
  243 + <path>
  244 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  245 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  246 + <item name="src" type="462c0819:PsiDirectoryNode" />
  247 + <item name="main" type="462c0819:PsiDirectoryNode" />
  248 + <item name="java" type="462c0819:PsiDirectoryNode" />
  249 + <item name="com" type="462c0819:PsiDirectoryNode" />
  250 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  251 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  252 + </path>
  253 + <path>
  254 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  255 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  256 + <item name="src" type="462c0819:PsiDirectoryNode" />
  257 + <item name="main" type="462c0819:PsiDirectoryNode" />
  258 + <item name="java" type="462c0819:PsiDirectoryNode" />
  259 + <item name="com" type="462c0819:PsiDirectoryNode" />
  260 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  261 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  262 + <item name="receipt" type="462c0819:PsiDirectoryNode" />
  263 + </path>
  264 + <path>
  265 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  266 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  267 + <item name="src" type="462c0819:PsiDirectoryNode" />
  268 + <item name="main" type="462c0819:PsiDirectoryNode" />
  269 + <item name="java" type="462c0819:PsiDirectoryNode" />
  270 + <item name="com" type="462c0819:PsiDirectoryNode" />
  271 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  272 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  273 + <item name="receipt" type="462c0819:PsiDirectoryNode" />
  274 + <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />
  275 + </path>
  276 + <path>
  277 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  278 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  279 + <item name="src" type="462c0819:PsiDirectoryNode" />
  280 + <item name="main" type="462c0819:PsiDirectoryNode" />
  281 + <item name="java" type="462c0819:PsiDirectoryNode" />
  282 + <item name="com" type="462c0819:PsiDirectoryNode" />
  283 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  284 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  285 + <item name="receipt" type="462c0819:PsiDirectoryNode" />
  286 + <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />
  287 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  288 + </path>
  289 + <path>
  290 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  291 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  292 + <item name="src" type="462c0819:PsiDirectoryNode" />
  293 + <item name="main" type="462c0819:PsiDirectoryNode" />
  294 + <item name="java" type="462c0819:PsiDirectoryNode" />
  295 + <item name="com" type="462c0819:PsiDirectoryNode" />
  296 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  297 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  298 + <item name="receipt" type="462c0819:PsiDirectoryNode" />
  299 + <item name="receiptContainerHeader" type="462c0819:PsiDirectoryNode" />
  300 + <item name="domain" type="462c0819:PsiDirectoryNode" />
  301 + </path>
  302 + <path>
  303 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  304 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  305 + <item name="src" type="462c0819:PsiDirectoryNode" />
  306 + <item name="main" type="462c0819:PsiDirectoryNode" />
  307 + <item name="java" type="462c0819:PsiDirectoryNode" />
  308 + <item name="com" type="462c0819:PsiDirectoryNode" />
  309 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  310 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  311 + <item name="task" type="462c0819:PsiDirectoryNode" />
  312 + </path>
  313 + <path>
  314 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  315 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  316 + <item name="src" type="462c0819:PsiDirectoryNode" />
  317 + <item name="main" type="462c0819:PsiDirectoryNode" />
  318 + <item name="java" type="462c0819:PsiDirectoryNode" />
  319 + <item name="com" type="462c0819:PsiDirectoryNode" />
  320 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  321 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  322 + <item name="task" type="462c0819:PsiDirectoryNode" />
  323 + <item name="taskDetail" type="462c0819:PsiDirectoryNode" />
  324 + </path>
  325 + <path>
  326 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  327 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  328 + <item name="src" type="462c0819:PsiDirectoryNode" />
  329 + <item name="main" type="462c0819:PsiDirectoryNode" />
  330 + <item name="java" type="462c0819:PsiDirectoryNode" />
  331 + <item name="com" type="462c0819:PsiDirectoryNode" />
  332 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  333 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  334 + <item name="task" type="462c0819:PsiDirectoryNode" />
  335 + <item name="taskDetail" type="462c0819:PsiDirectoryNode" />
  336 + <item name="domain" type="462c0819:PsiDirectoryNode" />
  337 + </path>
  338 + <path>
  339 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  340 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  341 + <item name="src" type="462c0819:PsiDirectoryNode" />
  342 + <item name="main" type="462c0819:PsiDirectoryNode" />
  343 + <item name="java" type="462c0819:PsiDirectoryNode" />
  344 + <item name="com" type="462c0819:PsiDirectoryNode" />
  345 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  346 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  347 + <item name="task" type="462c0819:PsiDirectoryNode" />
  348 + <item name="taskHeader" 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="controller" 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="task" 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="task" type="462c0819:PsiDirectoryNode" />
  408 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
  409 + </path>
  410 + </expand>
  411 + <select />
  412 + </subPane>
  413 + </pane>
  414 + </panes>
  415 + </component>
86 416 <component name="PropertiesComponent">
87 417 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
88   - <property name="DatabaseDriversLRU" value="mysql" />
89 418 <property name="DefaultHtmlFileTemplate" value="HTML File" />
90 419 <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
  420 + <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
91 421 <property name="RequestMappingsPanelOrder0" value="0" />
92 422 <property name="RequestMappingsPanelOrder1" value="1" />
93 423 <property name="RequestMappingsPanelWidth0" value="75" />
... ... @@ -95,22 +425,23 @@
95 425 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
96 426 <property name="WebServerToolWindowFactoryState" value="false" />
97 427 <property name="aspect.path.notification.shown" value="true" />
98   - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
  428 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1567762826101" />
  429 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-glgd" />
  430 + <property name="list.type.of.created.stylesheet" value="CSS" />
99 431 <property name="node.js.detected.package.eslint" value="true" />
100   - <property name="node.js.detected.package.tslint" value="true" />
101 432 <property name="node.js.path.for.package.eslint" value="project" />
102 433 <property name="node.js.path.for.package.tslint" value="project" />
103 434 <property name="node.js.selected.package.eslint" value="(autodetect)" />
104 435 <property name="node.js.selected.package.tslint" value="(autodetect)" />
105   - <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
106   - </component>
107   - <component name="RecentsManager">
108   - <key name="MoveFile.RECENT_KEYS">
109   - <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
110   - <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
111   - </key>
  436 + <property name="nodejs_package_manager_path" value="npm" />
  437 + <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
112 438 </component>
113 439 <component name="RunDashboard">
  440 + <option name="configurationTypes">
  441 + <set>
  442 + <option value="SpringBootApplicationConfigurationType" />
  443 + </set>
  444 + </option>
114 445 <option name="ruleStates">
115 446 <list>
116 447 <RuleState>
... ... @@ -121,6 +452,7 @@
121 452 </RuleState>
122 453 </list>
123 454 </option>
  455 + <option name="contentProportion" value="0.056010928" />
124 456 </component>
125 457 <component name="RunManager">
126 458 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
... ... @@ -133,25 +465,13 @@
133 465 <option name="Make" enabled="true" />
134 466 </method>
135 467 </configuration>
136   - <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
137   - <module name="WMSV1" />
138   - <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
139   - <option name="ALTERNATIVE_JRE_PATH" />
140   - <method v="2">
141   - <option name="Make" enabled="true" />
142   - </method>
143   - </configuration>
144 468 </component>
145 469 <component name="ServiceViewManager">
146 470 <option name="allServicesViewState">
147 471 <serviceView>
  472 + <option name="contentProportion" value="0.17857143" />
148 473 <treeState>
149   - <expand>
150   - <path>
151   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
152   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
153   - </path>
154   - </expand>
  474 + <expand />
155 475 <select />
156 476 </treeState>
157 477 </serviceView>
... ... @@ -162,45 +482,141 @@
162 482 </component>
163 483 <component name="TaskManager">
164 484 <task active="true" id="Default" summary="Default task">
165   - <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
166   - <created>1565160110910</created>
  485 + <changelist id="1fe4ff20-6474-45ee-a361-9572a808e9c9" name="Default Changelist" comment="" />
  486 + <created>1566977677142</created>
167 487 <option name="number" value="Default" />
168 488 <option name="presentableId" value="Default" />
169   - <updated>1565160110910</updated>
170   - <workItem from="1565160112236" duration="11971000" />
171   - <workItem from="1565224833241" duration="14642000" />
172   - <workItem from="1565242153135" duration="1476000" />
173   - <workItem from="1565259513116" duration="148000" />
174   - <workItem from="1565311988064" duration="7176000" />
175   - <workItem from="1565328536669" duration="797000" />
176   - <workItem from="1567937269900" duration="1065000" />
177   - <workItem from="1567939943746" duration="865000" />
178   - <workItem from="1567950680620" duration="3139000" />
  489 + <updated>1566977677142</updated>
  490 + <workItem from="1566977678336" duration="306000" />
  491 + <workItem from="1566978429560" duration="9246000" />
  492 + <workItem from="1567038752582" duration="12361000" />
  493 + <workItem from="1567057373550" duration="15293000" />
  494 + <workItem from="1567125196953" duration="16752000" />
  495 + <workItem from="1567643852002" duration="245000" />
  496 + <workItem from="1567731382438" duration="17009000" />
179 497 </task>
180   - <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
181   - <created>1565226427512</created>
  498 + <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
  499 + <created>1566983055587</created>
182 500 <option name="number" value="00001" />
183 501 <option name="presentableId" value="LOCAL-00001" />
184 502 <option name="project" value="LOCAL" />
185   - <updated>1565226427512</updated>
  503 + <updated>1566983055587</updated>
186 504 </task>
187   - <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
188   - <created>1565256884822</created>
  505 + <task id="LOCAL-00002" summary="添加入库单历史">
  506 + <created>1566987011007</created>
189 507 <option name="number" value="00002" />
190 508 <option name="presentableId" value="LOCAL-00002" />
191 509 <option name="project" value="LOCAL" />
192   - <updated>1565256884822</updated>
  510 + <updated>1566987011007</updated>
193 511 </task>
194   - <task id="LOCAL-00003" summary="修改库区service">
195   - <created>1565259481656</created>
  512 + <task id="LOCAL-00003" summary="修复入库历史controller冲突">
  513 + <created>1567039165473</created>
196 514 <option name="number" value="00003" />
197 515 <option name="presentableId" value="LOCAL-00003" />
198 516 <option name="project" value="LOCAL" />
199   - <updated>1565259481656</updated>
  517 + <updated>1567039165473</updated>
200 518 </task>
201   - <option name="localTasksCounter" value="4" />
  519 + <task id="LOCAL-00004" summary="添加物料类别">
  520 + <created>1567047135508</created>
  521 + <option name="number" value="00004" />
  522 + <option name="presentableId" value="LOCAL-00004" />
  523 + <option name="project" value="LOCAL" />
  524 + <updated>1567047135508</updated>
  525 + </task>
  526 + <task id="LOCAL-00005" summary="添加系统参数配置">
  527 + <created>1567065008303</created>
  528 + <option name="number" value="00005" />
  529 + <option name="presentableId" value="LOCAL-00005" />
  530 + <option name="project" value="LOCAL" />
  531 + <updated>1567065008303</updated>
  532 + </task>
  533 + <task id="LOCAL-00006" summary="删除入库单">
  534 + <created>1567065196899</created>
  535 + <option name="number" value="00006" />
  536 + <option name="presentableId" value="LOCAL-00006" />
  537 + <option name="project" value="LOCAL" />
  538 + <updated>1567065196899</updated>
  539 + </task>
  540 + <task id="LOCAL-00007" summary="自动生成盘点首选项表">
  541 + <created>1567068662565</created>
  542 + <option name="number" value="00007" />
  543 + <option name="presentableId" value="LOCAL-00007" />
  544 + <option name="project" value="LOCAL" />
  545 + <updated>1567068662565</updated>
  546 + </task>
  547 + <task id="LOCAL-00008" summary="添加逻辑删除配置">
  548 + <created>1567069834248</created>
  549 + <option name="number" value="00008" />
  550 + <option name="presentableId" value="LOCAL-00008" />
  551 + <option name="project" value="LOCAL" />
  552 + <updated>1567069834248</updated>
  553 + </task>
  554 + <task id="LOCAL-00009" summary="出库任务完成。新增allocationId字段">
  555 + <created>1567672551433</created>
  556 + <option name="number" value="00009" />
  557 + <option name="presentableId" value="LOCAL-00009" />
  558 + <option name="project" value="LOCAL" />
  559 + <updated>1567672551433</updated>
  560 + </task>
  561 + <task id="LOCAL-00010" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  562 + <created>1567684393294</created>
  563 + <option name="number" value="00010" />
  564 + <option name="presentableId" value="LOCAL-00010" />
  565 + <option name="project" value="LOCAL" />
  566 + <updated>1567684393294</updated>
  567 + </task>
  568 + <task id="LOCAL-00011" summary="出库完成完善">
  569 + <created>1567762768238</created>
  570 + <option name="number" value="00011" />
  571 + <option name="presentableId" value="LOCAL-00011" />
  572 + <option name="project" value="LOCAL" />
  573 + <updated>1567762768238</updated>
  574 + </task>
  575 + <option name="localTasksCounter" value="12" />
202 576 <servers />
203 577 </component>
  578 + <component name="TimeTrackingManager">
  579 + <option name="totallyTimeSpent" value="39317000" />
  580 + </component>
  581 + <component name="ToolWindowManager">
  582 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  583 + <layout>
  584 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2191689" />
  585 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  586 + <window_info id="Designer" order="2" />
  587 + <window_info id="Image Layers" order="3" />
  588 + <window_info id="Capture Tool" order="4" />
  589 + <window_info id="UI Designer" order="5" />
  590 + <window_info id="Favorites" order="6" side_tool="true" />
  591 + <window_info id="Web" order="7" side_tool="true" />
  592 + <window_info anchor="bottom" id="Message" order="0" />
  593 + <window_info anchor="bottom" id="Find" order="1" />
  594 + <window_info anchor="bottom" id="Run" order="2" />
  595 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  596 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  597 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  598 + <window_info anchor="bottom" id="TODO" order="6" />
  599 + <window_info anchor="bottom" id="Spring" order="7" />
  600 + <window_info anchor="bottom" id="Terminal" order="8" />
  601 + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
  602 + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5013405" side_tool="true" weight="0.2719547" />
  603 + <window_info anchor="bottom" id="Messages" order="11" weight="0.18696883" />
  604 + <window_info anchor="bottom" id="Java Enterprise" order="12" />
  605 + <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
  606 + <window_info anchor="bottom" id="Version Control" order="14" weight="0.3286119" />
  607 + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49865952" weight="0.30169973" />
  608 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  609 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  610 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  611 + <window_info anchor="right" id="Maven" order="3" />
  612 + <window_info anchor="right" id="Palette" order="4" />
  613 + <window_info anchor="right" id="Capture Analysis" order="5" />
  614 + <window_info anchor="right" id="Database" order="6" />
  615 + <window_info anchor="right" id="Palette&#9;" order="7" />
  616 + <window_info anchor="right" id="Theme Preview" order="8" />
  617 + <window_info anchor="right" id="Bean Validation" order="9" />
  618 + </layout>
  619 + </component>
204 620 <component name="TypeScriptGeneratedFilesManager">
205 621 <option name="version" value="1" />
206 622 </component>
... ... @@ -210,18 +626,289 @@
210 626 <entry key="MAIN">
211 627 <value>
212 628 <State>
  629 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  630 + <collection />
  631 + </option>
  632 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  633 + <collection />
  634 + </option>
213 635 <option name="COLUMN_ORDER" />
214 636 </State>
215 637 </value>
216 638 </entry>
217 639 </map>
218 640 </option>
  641 + <option name="RECENT_FILTERS">
  642 + <map>
  643 + <entry key="Branch">
  644 + <value>
  645 + <list />
  646 + </value>
  647 + </entry>
  648 + <entry key="User">
  649 + <value>
  650 + <list />
  651 + </value>
  652 + </entry>
  653 + </map>
  654 + </option>
219 655 </component>
220 656 <component name="VcsManagerConfiguration">
221   - <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
222   - <MESSAGE value="添加库位、库位类型增删改查接口" />
223   - <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
224   - <MESSAGE value="修改库区service" />
225   - <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
  657 + <MESSAGE value="盘点明细页面" />
  658 + <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
  659 + <MESSAGE value="添加入库单历史" />
  660 + <MESSAGE value="修复入库历史controller冲突" />
  661 + <MESSAGE value="添加物料类别" />
  662 + <MESSAGE value="添加系统参数配置" />
  663 + <MESSAGE value="删除入库单" />
  664 + <MESSAGE value="自动生成盘点首选项表" />
  665 + <MESSAGE value="添加逻辑删除配置" />
  666 + <MESSAGE value="库存和任务移库相关" />
  667 + <MESSAGE value="库存移库生成和完成逻辑" />
  668 + <MESSAGE value="xml" />
  669 + <MESSAGE value="出库任务完成。新增allocationId字段" />
  670 + <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java&#10;#&#9;src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
  671 + <MESSAGE value="出库完成完善" />
  672 + <option name="LAST_COMMIT_MESSAGE" value="出库完成完善" />
  673 + </component>
  674 + <component name="XDebuggerManager">
  675 + <breakpoint-manager>
  676 + <breakpoints>
  677 + <line-breakpoint type="java-line">
  678 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
  679 + <line>5</line>
  680 + <properties />
  681 + <option name="timeStamp" value="1" />
  682 + </line-breakpoint>
  683 + <line-breakpoint type="java-line">
  684 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
  685 + <line>60</line>
  686 + <properties />
  687 + <option name="timeStamp" value="4" />
  688 + </line-breakpoint>
  689 + <line-breakpoint enabled="true" type="java-line">
  690 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
  691 + <line>49</line>
  692 + <properties />
  693 + <option name="timeStamp" value="16" />
  694 + </line-breakpoint>
  695 + <line-breakpoint enabled="true" type="java-line">
  696 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
  697 + <line>92</line>
  698 + <properties />
  699 + <option name="timeStamp" value="24" />
  700 + </line-breakpoint>
  701 + <line-breakpoint enabled="true" type="java-line">
  702 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java</url>
  703 + <line>31</line>
  704 + <properties />
  705 + <option name="timeStamp" value="26" />
  706 + </line-breakpoint>
  707 + <line-breakpoint enabled="true" type="java-line">
  708 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
  709 + <line>48</line>
  710 + <properties />
  711 + <option name="timeStamp" value="37" />
  712 + </line-breakpoint>
  713 + </breakpoints>
  714 + </breakpoint-manager>
  715 + <watches-manager>
  716 + <configuration name="SpringBootApplicationConfigurationType">
  717 + <watch expression="DataUtils.getInteger(map.get(&quot;receiptId&quot;))" language="JAVA" />
  718 + </configuration>
  719 + </watches-manager>
  720 + </component>
  721 + <component name="debuggerHistoryManager">
  722 + <expressions id="watch">
  723 + <expression>
  724 + <expression-string>DataUtils.getInteger(map.get(&quot;receiptId&quot;))</expression-string>
  725 + <language-id>JAVA</language-id>
  726 + <evaluation-mode>EXPRESSION</evaluation-mode>
  727 + </expression>
  728 + </expressions>
  729 + </component>
  730 + <component name="editorHistoryManager">
  731 + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
  732 + <provider selected="true" editor-type-id="text-editor">
  733 + <state relative-caret-position="149">
  734 + <caret line="53" column="12" selection-start-line="53" selection-start-column="12" selection-end-line="53" selection-end-column="12" />
  735 + </state>
  736 + </provider>
  737 + </entry>
  738 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
  739 + <provider selected="true" editor-type-id="text-editor">
  740 + <state relative-caret-position="146">
  741 + <caret line="45" column="31" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="31" />
  742 + </state>
  743 + </provider>
  744 + </entry>
  745 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
  746 + <provider selected="true" editor-type-id="text-editor">
  747 + <state relative-caret-position="1444">
  748 + <caret line="76" column="89" selection-start-line="76" selection-start-column="70" selection-end-line="76" selection-end-column="89" />
  749 + </state>
  750 + </provider>
  751 + </entry>
  752 + <entry file="file://$PROJECT_DIR$/pom.xml">
  753 + <provider selected="true" editor-type-id="text-editor">
  754 + <state relative-caret-position="532">
  755 + <caret line="28" column="8" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="51" />
  756 + </state>
  757 + </provider>
  758 + </entry>
  759 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java">
  760 + <provider selected="true" editor-type-id="text-editor">
  761 + <state relative-caret-position="209">
  762 + <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
  763 + </state>
  764 + </provider>
  765 + </entry>
  766 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
  767 + <provider selected="true" editor-type-id="text-editor">
  768 + <state relative-caret-position="114">
  769 + <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
  770 + </state>
  771 + </provider>
  772 + </entry>
  773 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java">
  774 + <provider selected="true" editor-type-id="text-editor">
  775 + <state relative-caret-position="323">
  776 + <caret line="136" column="42" selection-start-line="136" selection-start-column="42" selection-end-line="136" selection-end-column="42" />
  777 + </state>
  778 + </provider>
  779 + </entry>
  780 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">
  781 + <provider selected="true" editor-type-id="text-editor">
  782 + <state relative-caret-position="490">
  783 + <caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />
  784 + </state>
  785 + </provider>
  786 + </entry>
  787 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">
  788 + <provider selected="true" editor-type-id="text-editor">
  789 + <state relative-caret-position="171">
  790 + <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
  791 + </state>
  792 + </provider>
  793 + </entry>
  794 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">
  795 + <provider selected="true" editor-type-id="text-editor">
  796 + <state relative-caret-position="471">
  797 + <caret line="127" column="47" lean-forward="true" selection-start-line="127" selection-start-column="47" selection-end-line="127" selection-end-column="47" />
  798 + </state>
  799 + </provider>
  800 + </entry>
  801 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
  802 + <provider selected="true" editor-type-id="text-editor">
  803 + <state relative-caret-position="228">
  804 + <caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
  805 + </state>
  806 + </provider>
  807 + </entry>
  808 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java">
  809 + <provider selected="true" editor-type-id="text-editor">
  810 + <state relative-caret-position="226">
  811 + <caret line="65" column="19" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
  812 + </state>
  813 + </provider>
  814 + </entry>
  815 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  816 + <provider selected="true" editor-type-id="text-editor">
  817 + <state relative-caret-position="1710">
  818 + <caret line="117" column="45" selection-start-line="117" selection-start-column="45" selection-end-line="117" selection-end-column="45" />
  819 + </state>
  820 + </provider>
  821 + </entry>
  822 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  823 + <provider selected="true" editor-type-id="text-editor">
  824 + <state relative-caret-position="209">
  825 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  826 + </state>
  827 + </provider>
  828 + </entry>
  829 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
  830 + <provider selected="true" editor-type-id="text-editor">
  831 + <state relative-caret-position="266">
  832 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  833 + </state>
  834 + </provider>
  835 + </entry>
  836 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
  837 + <provider selected="true" editor-type-id="text-editor">
  838 + <state relative-caret-position="1596">
  839 + <caret line="112" column="26" selection-start-line="112" selection-start-column="16" selection-end-line="112" selection-end-column="26" />
  840 + </state>
  841 + </provider>
  842 + </entry>
  843 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
  844 + <provider selected="true" editor-type-id="text-editor">
  845 + <state relative-caret-position="1653">
  846 + <caret line="95" column="19" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="19" />
  847 + </state>
  848 + </provider>
  849 + </entry>
  850 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
  851 + <provider selected="true" editor-type-id="text-editor">
  852 + <state relative-caret-position="4484">
  853 + <caret line="236" column="64" selection-start-line="236" selection-start-column="64" selection-end-line="236" selection-end-column="64" />
  854 + </state>
  855 + </provider>
  856 + </entry>
  857 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java">
  858 + <provider selected="true" editor-type-id="text-editor">
  859 + <state relative-caret-position="226">
  860 + <caret line="347" column="1" selection-start-line="347" selection-start-column="1" selection-end-line="347" selection-end-column="1" />
  861 + </state>
  862 + </provider>
  863 + </entry>
  864 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <state relative-caret-position="226">
  867 + <caret line="92" column="23" selection-start-line="92" selection-start-column="23" selection-end-line="92" selection-end-column="23" />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://G:/网星联创/千金电玩城后台管理/ticketManager/src/com/ticket/server/back/player/entity/PlayerInfo.java">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state relative-caret-position="171">
  874 + <caret line="18" column="34" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="34" />
  875 + </state>
  876 + </provider>
  877 + </entry>
  878 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java">
  879 + <provider selected="true" editor-type-id="text-editor">
  880 + <state relative-caret-position="19">
  881 + <caret line="193" column="37" lean-forward="true" selection-start-line="193" selection-start-column="37" selection-end-line="193" selection-end-column="37" />
  882 + <folding>
  883 + <element signature="e#14321#14322#0" expanded="true" />
  884 + <element signature="e#14357#14358#0" expanded="true" />
  885 + </folding>
  886 + </state>
  887 + </provider>
  888 + </entry>
  889 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
  890 + <provider selected="true" editor-type-id="text-editor">
  891 + <state relative-caret-position="226">
  892 + <caret line="77" column="19" selection-start-line="77" selection-start-column="12" selection-end-line="77" selection-end-column="19" />
  893 + </state>
  894 + </provider>
  895 + </entry>
  896 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java">
  897 + <provider selected="true" editor-type-id="text-editor">
  898 + <state relative-caret-position="-157">
  899 + <caret line="173" column="28" selection-start-line="173" selection-start-column="10" selection-end-line="173" selection-end-column="28" />
  900 + </state>
  901 + </provider>
  902 + </entry>
  903 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  904 + <provider selected="true" editor-type-id="text-editor">
  905 + <state relative-caret-position="140">
  906 + <caret line="500" lean-forward="true" selection-start-line="500" selection-end-line="500" />
  907 + <folding>
  908 + <element signature="imports" expanded="true" />
  909 + </folding>
  910 + </state>
  911 + </provider>
  912 + </entry>
226 913 </component>
227 914 </project>
228 915 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java
  View file @b8cd077
... ... @@ -18,6 +18,7 @@ import com.huaheng.pc.check.checkDetail.domain.CheckDetail;
18 18 import com.huaheng.pc.check.checkDetail.service.CheckDetailService;
19 19 import io.swagger.annotations.ApiOperation;
20 20 import io.swagger.annotations.ApiParam;
  21 +import io.swagger.models.auth.In;
21 22 import org.apache.shiro.authz.annotation.RequiresPermissions;
22 23 import org.springframework.stereotype.Controller;
23 24 import org.springframework.ui.ModelMap;
... ... @@ -40,7 +41,7 @@ public class CheckDetailController extends BaseController {
40 41 private String prefix = "check/checkDetail";
41 42  
42 43 @RequiresPermissions("check:checkDetail:view")
43   - @GetMapping("{id}")
  44 + @GetMapping("/{id}")
44 45 public String checkingRegister(@PathVariable("id")Integer id, ModelMap modelMap) {
45 46 modelMap.put("id",id);
46 47 return prefix + "/checkDetail";
... ... @@ -50,16 +51,16 @@ public class CheckDetailController extends BaseController {
50 51 * 查询质检详情
51 52 */
52 53 @ApiOperation(value="查看质检详情", notes="根据详情表id获取质检详情", httpMethod = "POST")
53   - @RequiresPermissions("che:receiptDetail:list")
  54 + @RequiresPermissions("check:checkDetail:list")
54 55 @Log(title = "质检-质检详情", operating = "查看质检详情", action = BusinessType.GRANT)
55   - @PostMapping("/list/{id}")
  56 + @PostMapping("/list")
56 57 @ResponseBody
57   - public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库详情") @PathVariable("id")Integer checkDetailId) {
  58 + public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库详情")Integer checkHeaderId) {
58 59 LambdaQueryWrapper<CheckDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
59 60 PageDomain pageDomain = TableSupport.buildPageRequest();
60 61 Integer pageNum = pageDomain.getPageNum();
61 62 Integer pageSize = pageDomain.getPageSize();
62   - lambdaQueryWrapper.eq(CheckDetail::getCheckHeaderId, checkDetailId);
  63 + lambdaQueryWrapper.eq(CheckDetail::getCheckHeaderId, checkHeaderId);
63 64  
64 65 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
65 66 /*使用分页查询*/
... ... @@ -127,4 +128,29 @@ public class CheckDetailController extends BaseController {
127 128 List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
128 129 return toAjax(checkDetailService.removeByIds(idList));
129 130 }
  131 +
  132 + /**
  133 + * 完成质检
  134 + */
  135 + @GetMapping("complete/{id}")
  136 + public String complete(@PathVariable("id") Integer id, ModelMap mmap) {
  137 + mmap.put("checkDetailId", id);
  138 + return prefix + "/checkComplete";
  139 + }
  140 +
  141 + /**
  142 + * 保存质检完成
  143 + * @param inventorySts 库存状态
  144 + * @param qty 数量
  145 + * @return AjaxResult
  146 + */
  147 + @ApiOperation(value="完成质检详情", notes="完成质检详情", httpMethod = "POST")
  148 + @RequiresPermissions("check:checkDetail:complete")
  149 + @Log(title = "质检-质检详情 ",operating = "质检详情删除", action = BusinessType.DELETE)
  150 + @PostMapping("/complete")
  151 + public AjaxResult complete(@ApiParam(name="质检明细id",value="id")Integer id,
  152 + @ApiParam(name="库存状态",value="inventorySts",example="good,bad")String inventorySts,
  153 + @ApiParam(name = "数量",value = "qty",example = "10,20") String qty) {
  154 + return checkDetailService.complete(id, inventorySts, qty);
  155 + }
130 156 }
... ...
src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java
  View file @b8cd077
1 1 package com.huaheng.pc.check.checkDetail.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.exception.service.ServiceException;
  6 +import com.huaheng.common.support.Convert;
  7 +import com.huaheng.common.utils.security.ShiroUtils;
  8 +import com.huaheng.framework.web.domain.AjaxResult;
  9 +import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
  10 +import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
  11 +import com.huaheng.pc.check.checkingRegister.domain.CheckingRegister;
  12 +import com.huaheng.pc.check.checkingRegister.service.CheckingRegisterService;
  13 +import org.aspectj.weaver.loadtime.Aj;
3 14 import org.springframework.stereotype.Service;
4 15 import javax.annotation.Resource;
  16 +import java.util.ArrayList;
  17 +import java.util.Arrays;
  18 +import java.util.Date;
5 19 import java.util.List;
6 20 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 21 import com.huaheng.pc.check.checkDetail.mapper.CheckDetailMapper;
8 22 import com.huaheng.pc.check.checkDetail.domain.CheckDetail;
  23 +import org.springframework.transaction.annotation.Transactional;
  24 +
9 25 @Service
10 26 public class CheckDetailService extends ServiceImpl<CheckDetailMapper, CheckDetail> {
11 27  
  28 + @Resource
  29 + private CheckingRegisterService checkingRegisterService;
  30 + @Resource
  31 + private CheckHeaderService checkHeaderService;
  32 +
  33 + /**
  34 + * 质检完成
  35 + * @param id 质检明细id
  36 + * @param inventorySts 库存状态 good,
  37 + * @param qty 数量 10,20
  38 + * @return AjaxResult
  39 + */
  40 + @Transactional
  41 + public AjaxResult complete(Integer id, String inventorySts, String qty){
  42 +
  43 + //将库存状态、数量字符串转为List
  44 + List<String> inventoryStsList = Arrays.asList(Convert.toStrArray(inventorySts));
  45 + List<Integer> qtyList = Arrays.asList(Convert.toIntArray(qty));
  46 + CheckDetail checkDetail = this.getById(id);
  47 +
  48 + //
  49 + int sum = 0;
  50 + for (Integer quantity : qtyList) {
  51 + sum += quantity;
  52 + }
  53 + if (checkDetail.getQty() == sum) {
  54 + AjaxResult.error("质检登记数量和质检明细系统数量核对错误");
  55 + }
  56 + checkDetail.setStatus("20");
  57 + if ( !this.updateById(checkDetail)){
  58 + throw new ServiceException("更新质检明细表错误");
  59 + }
  60 + CheckingRegister checkingRegister = new CheckingRegister();
  61 + checkingRegister.setCheckDetailId(checkDetail.getId());
  62 + checkingRegister.setCheckHeaderId(checkDetail.getCheckHeaderId());
  63 + checkingRegister.setWarehouseCode(ShiroUtils.getWarehouseCode());
  64 + checkingRegister.setCheckCode(checkDetail.getCheckCode());
  65 + checkingRegister.setReceiptDetailId(checkDetail.getReceiptDetailId());
  66 + checkingRegister.setReceiptCode(checkDetail.getReceiptCode());
  67 + checkingRegister.setReferCode(checkDetail.getReferCode());
  68 + checkingRegister.setReferLineId(checkDetail.getReferLineId());
  69 + checkingRegister.setReferPlatform(checkDetail.getReferPlatform());
  70 + checkingRegister.setMaterialCode(checkDetail.getMaterialCode());
  71 + checkingRegister.setMaterialName(checkDetail.getMaterialName());
  72 + checkingRegister.setMaterialSpec(checkDetail.getMaterialSpec());
  73 + checkingRegister.setMaterialUnit(checkDetail.getMaterialUnit());
  74 + checkingRegister.setCompanyCode(checkDetail.getCompanyCode());
  75 + checkingRegister.setCheckBy(ShiroUtils.getLoginName());
  76 + checkingRegister.setCheckAt(new Date());
  77 + checkingRegister.setCreatedBy(ShiroUtils.getLoginName());
  78 + checkingRegister.setLastUpdatedBy(ShiroUtils.getLoginName());
  79 +
  80 + for (int i = 0; i<inventoryStsList.size(); i++){
  81 + checkingRegister.setInventorySts(inventoryStsList.get(i));
  82 + checkingRegister.setQty(qtyList.get(0));
  83 + if ( !checkingRegisterService.save(checkingRegister)){
  84 + throw new ServiceException("生成质检报告失败");
  85 + }
  86 + }
  87 +
  88 + LambdaQueryWrapper<CheckDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  89 + lambdaQueryWrapper.eq(CheckDetail::getCheckHeaderId, checkDetail.getCheckHeaderId())
  90 + .ne(CheckDetail::getStatus, 20);
  91 + List<CheckDetail> checkDetails = this.list(lambdaQueryWrapper);
  92 +
  93 + //如果改质检单的全部明细都完成质检则更新质检头表状态
  94 + if (checkDetails == null){
  95 + CheckHeader checkHeader = new CheckHeader();
  96 + checkHeader.setId(checkDetail.getCheckHeaderId());
  97 + checkHeader.setStatus("20");
  98 + checkHeaderService.updateById(checkHeader);
  99 + }
  100 + return AjaxResult.success("质检完成");
  101 + }
12 102 }
... ...
src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java
  View file @b8cd077
... ... @@ -43,9 +43,9 @@ public class CheckHeaderController extends BaseController {
43 43 private String prefix = "check/checkHeader";
44 44  
45 45 @RequiresPermissions("check:checkHeader:view")
46   - @GetMapping()
47   - public String checkingRegister()
48   - {
  46 + @GetMapping("{type}")
  47 + public String checkingRegister(@PathVariable("type")String type, ModelMap modelMap) {
  48 + modelMap.put("type", type);
49 49 return prefix + "/checkHeader";
50 50 }
51 51  
... ... @@ -70,7 +70,7 @@ public class CheckHeaderController extends BaseController {
70 70 .eq(StringUtils.isNotNull(checkHeader.getCode()), CheckHeader::getCode, checkHeader.getCode())
71 71 .eq(StringUtils.isNotEmpty(checkHeader.getReferCode()), CheckHeader::getReferCode, checkHeader.getReferCode())
72 72 .eq(StringUtils.isNotEmpty(checkHeader.getStatus()), CheckHeader::getStatus, checkHeader.getStatus())
73   - .eq(StringUtils.isNotEmpty(checkHeader.getType()), CheckHeader::getType, checkHeader.getType());
  73 + .in(StringUtils.isNotEmpty(checkHeader.getType()), CheckHeader::getType, checkHeader.getType());
74 74  
75 75 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
76 76 // 使用分页查询
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java
  View file @b8cd077
... ... @@ -269,8 +269,8 @@ public class ReceiptContainerHeader implements Serializable {
269 269 *
270 270 * @return id - ID
271 271 */
272   - public Integer getId() {
273   - return id;
  272 + public Integer getId() {
  273 + return this.id;
274 274 }
275 275  
276 276 /**
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @b8cd077
... ... @@ -29,8 +29,6 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
29 29 @Resource
30 30 private ReceiptTypeService receiptTypeService;
31 31 @Resource
32   - private StatusFlowDetailService statusFlowDetailService;
33   - @Resource
34 32 private ReceiptDetailService receiptDetailService;
35 33  
36 34 public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @b8cd077
... ... @@ -119,5 +119,21 @@ public class TaskHeaderController extends BaseController {
119 119 }
120 120  
121 121  
  122 + /**
  123 + * 删除立库任务
  124 + */
  125 + @RequiresPermissions("task:taskHeader:remove")
  126 + @Log(title = "任务-任务管理", operating = "删除立库任务", action = BusinessType.DELETE)
  127 + @PostMapping( "/remove")
  128 + @ResponseBody
  129 + public AjaxResult remove(String ids)
  130 + {
  131 + if (StringUtils.isEmpty(ids))
  132 + return AjaxResult.error("taskId不能为空");
  133 + AjaxResult ajaxResult = taskHeaderService.cancelTask(Convert.toIntArray(ids));
  134 + return ajaxResult;
  135 + }
  136 +
  137 +
122 138  
123 139 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
  View file @b8cd077
... ... @@ -35,5 +35,7 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
35 35  
36 36 Integer UncompleteCount(String containerCode);
37 37  
  38 + AjaxResult cancelTask(Integer[] taskIds) ;
  39 +
38 40  
39 41 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @b8cd077
... ... @@ -12,6 +12,7 @@ import com.huaheng.pc.config.container.domain.Container;
12 12 import com.huaheng.pc.config.container.service.ContainerService;
13 13 import com.huaheng.pc.config.location.domain.Location;
14 14 import com.huaheng.pc.config.location.service.LocationService;
  15 +import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
15 16 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
16 17 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
17 18 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
... ... @@ -88,7 +89,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
88 89 private ShipmentDetailService shipmentDetailService;
89 90  
90 91  
91   -
92 92 @Resource
93 93 private ReceiptContainerHeaderService receiptContainerHeaderService;
94 94 @Resource
... ... @@ -96,9 +96,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
96 96  
97 97  
98 98  
99   -
100   -
101   -
102 99 /**
103 100 * 查询容器有无任务
104 101 */
... ... @@ -107,6 +104,64 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
107 104 return taskHeaderMapper.UncompleteCount(ContainerCode, ShiroUtils.getWarehouseCode());
108 105 }
109 106  
  107 +
  108 + /**
  109 + * 取消任务
  110 + * */
  111 +
  112 + @Override
  113 + public AjaxResult cancelTask(Integer[] taskIds) {
  114 + for(int taskId : taskIds){
  115 + TaskHeader taskHeader = taskHeaderService.getById(taskId);
  116 + if(taskHeader==null){
  117 + return AjaxResult.error("任务"+taskId+"未找到，操作中止");
  118 + }
  119 + if(taskHeader.getStatus() > 9){
  120 + return AjaxResult.error("存在任务"+taskHeader.getId()+"已下发或执行，操作中止");
  121 + }
  122 + //删除子任务
  123 + LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  124 + lambdaQueryWrapper.eq(TaskDetail::getTaskId,taskHeader.getId());
  125 + taskDetailService.remove(lambdaQueryWrapper);
  126 + //删除主任务
  127 + taskHeaderService.removeById(taskHeader.getId());
  128 + // 更改库位状态（整盘入库任务除外）
  129 + if(taskHeader.getInternalTaskType() == 100 )
  130 + {
  131 + ReceiptContainerHeader record =new ReceiptContainerHeader();
  132 + record.setStatus((short)0);
  133 + record.setId(taskHeader.getAllocationHeadId());
  134 + receiptContainerHeaderService.updateById(record);
  135 + }
  136 + //根据任务类型来更新货箱状态
  137 + //修改关联的货箱状态
  138 + if(taskHeader.getInternalTaskType() == 200) {
  139 + ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
  140 + shipmentContainerHeader.setId(taskHeader.getAllocationHeadId());
  141 + shipmentContainerHeader.setStatus(0);
  142 + shipmentContainerHeaderService.updateById(shipmentContainerHeader);
  143 + }
  144 +// if(taskHeader.getInternalTaskType() == 700) {
  145 +// CycleCountHeader cycleCountHeader = new CycleCountHeader();
  146 +// cycleCountHeader.setId(task.getAllocationHeadId());
  147 +// cycleCountHeader.setLastUpdated(new Date());
  148 +// cycleCountHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  149 +// cyclecountDetailService.updateByModel(cyclecountDetail);
  150 +// }
  151 + if(taskHeader.getInternalTaskType()==100||taskHeader.getInternalTaskType()==200){
  152 + if(taskHeader.getToLocation()!=null){
  153 + //更新托盘、库位状态
  154 + locationService.updateStatus(taskHeader.getToLocation(), "empty");
  155 + }
  156 + }
  157 +// if(task.getType()==900){
  158 +// //出库查看任务没有关联的货箱，不做处理
  159 +// }
  160 + }
  161 +
  162 + return AjaxResult.success("取消任务成功！");
  163 + }
  164 +
110 165 /**
111 166 * 生成出库任务
112 167 *
... ... @@ -215,7 +270,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
215 270 ShipmentContainerHeader record = new ShipmentContainerHeader();
216 271 record.setId(shipmentContainerHeaderId);
217 272 record.setStatus(10);
218   - record.setStatus(task.getTaskType());//实际出库类型
219 273 shipmentContainerHeaderService.saveOrUpdate(record);
220 274 return AjaxResult.success(task.getId());
221 275  
... ... @@ -238,39 +292,64 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
238 292 return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止");
239 293 }
240 294 //修改任务头表
  295 + task.setId(taskId);
241 296 task.setStatus(10);
242 297 task.setStartPickDateTime(new Date()); //生成时间
243 298 task.setLastUpdated(new Date());
244 299 task.setLastUpdatedBy(ShiroUtils.getLoginName());
245   - LambdaUpdateWrapper<TaskHeader> HeaderUpdateWrapper = Wrappers.lambdaUpdate();
246   - HeaderUpdateWrapper.eq(TaskHeader::getId, taskId);
247   - if (!taskHeaderService.update(task, HeaderUpdateWrapper))
248   - throw new ServiceException("更新任务头失败");
  300 + taskHeaderService.saveOrUpdate(task);
249 301 //修改任务明细状态
250 302 TaskDetail record = new TaskDetail();
251 303 record.setStatus(10);
252 304 record.setLastUpdated(new Date());
253 305 record.setLastUpdatedBy(ShiroUtils.getLoginName());
  306 + record.setProcessStamp("100");
  307 + taskDetailService.updateById(record);
254 308 LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
255 309 lambdaUpdateWrapper.eq(TaskDetail::getTaskId, task.getId());
256 310 if (!taskDetailService.update(record, lambdaUpdateWrapper)){
257 311 throw new ServiceException("更新任务明细失败");
258 312 }
259   - //修改入库明细
260   - ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
261   - if (!receiptDetailService.updateById(receiptDetail)){
262   - throw new ServiceException("更新状态失败");
263   - }
264   - receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
265   - //修改组盘表状态为20
266   - ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
267   - receiptContainerDetail.setStatus(20);
268   - receiptContainerDetail.setLastUpdated(new Date());
269   - receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
270   - LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
271   - receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,receiptDetail.getReceiptId());
272   - if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
273   - throw new ServiceException("更新组盘状态失败");
  313 +// //修改入库明细
  314 +// if (task.getInternalTaskType()==100){
  315 +// ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(record.getId()));
  316 +// if (!receiptDetailService.updateById(receiptDetail)){
  317 +// throw new ServiceException("更新状态失败");
  318 +// }
  319 +// receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
  320 +//
  321 +// //修改组盘表状态为20
  322 +// ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail();
  323 +// receiptContainerDetail.setStatus(20);
  324 +// receiptContainerDetail.setLastUpdated(new Date());
  325 +// receiptContainerDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  326 +// LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate();
  327 +// receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,receiptDetail.getReceiptId());
  328 +// if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
  329 +// throw new ServiceException("更新组盘状态失败");
  330 +// }
  331 +//
  332 +// //修改出库单状态
  333 +// if (task.getInternalTaskType()==200){
  334 +// LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  335 +// taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  336 +// List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  337 +//
  338 +// for (TaskDetail taskDeatails: taskDetailList) {
  339 +// LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  340 +// shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
  341 +//
  342 +// ShipmentHeader shipmentHeader =new ShipmentHeader();
  343 +// shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
  344 +// shipmentHeader.setFirstStatus(100);
  345 +// shipmentHeader.setLastStatus(100);
  346 +// shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  347 +// shipmentHeader.setLastUpdated(new Date());
  348 +// shipmentHeaderService.updateById(shipmentHeader);
  349 +// }
  350 +// }
  351 +
  352 +
274 353 }
275 354 return AjaxResult.success("下发任务成功", task);
276 355 }
... ... @@ -491,12 +570,37 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
491 570 receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId, DataUtils.getInteger(map.get("receiptId")));
492 571 if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
493 572 throw new ServiceException("更新组盘状态失败");
494   - //修改入库明细
495   - ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
496   - if (!receiptDetailService.updateById(receiptDetail)){
497   - throw new ServiceException("更新状态失败");
  573 +
  574 + if (task.getInternalTaskType()==100){
  575 + //修改入库明细
  576 + ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
  577 + if (!receiptDetailService.updateById(receiptDetail)){
  578 + throw new ServiceException("更新状态失败");
  579 + }
  580 + receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
  581 + }
  582 +
  583 + //修改出库单明细
  584 + if (task.getInternalTaskType()==200){
  585 + LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  586 + taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  587 + List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  588 +
  589 + for (TaskDetail taskDeatails: taskDetailList) {
  590 + LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  591 + shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
  592 +
  593 + ShipmentHeader shipmentHeader =new ShipmentHeader();
  594 + shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
  595 + shipmentHeader.setFirstStatus(100);
  596 + shipmentHeader.setLastStatus(100);
  597 + shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  598 + shipmentHeader.setLastUpdated(new Date());
  599 + shipmentHeaderService.updateById(shipmentHeader);
  600 + }
498 601 }
499   - receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
  602 +
  603 +
500 604 }
501 605  
502 606 }
... ...
src/main/resources/templates/check/checkDetail/checkComplete.html
  View file @b8cd077
... ... @@ -4,47 +4,50 @@
4 4 <head th:include="include :: header"></head>
5 5 <body class="white-bg">
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7   - <form class="form-horizontal m" id="form-receiptContainerDetail-add">
  7 + <form class="form-horizontal m" id="form-checkComplete-add">
8 8 <div class="form-group">
9   - <label class="col-sm-3 control-label">组盘头id号：</label>
  9 + <label class="col-sm-3 control-label">库存状态：</label>
10 10 <div class="col-sm-8">
11   - <input id="headerId" name="headerId" class="form-control" type="text">
  11 + <select class="form-control" id="inventorySts0" name="inventorySts0" th:with="statusList=${@dict.getType('inventoryStatus')}">
  12 + <option value="">请选择</option>
  13 + <option th:each="status : ${statusList}" th:text="${status['dictLabel']}" th:value="${status['dictValue']}"></option>
  14 + </select>
12 15 </div>
13 16 </div>
14 17 <div class="form-group">
15   - <label class="col-sm-3 control-label">入库单明细id号：</label>
  18 + <label class="col-sm-3 control-label">数量：</label>
16 19 <div class="col-sm-8">
17   - <input id="receiptDetailId" name="receiptDetailId" class="form-control" type="text">
  20 + <input name="qty0" class="form-control" type="text">
18 21 </div>
19 22 </div>
20 23 <div class="form-group">
21   - <label class="col-sm-3 control-label">：</label>
  24 + <label class="col-sm-3 control-label">库存状态：</label>
22 25 <div class="col-sm-8">
23   - <input id="materialCode" name="materialCode" class="form-control" type="text">
  26 + <select class="form-control" id="inventorySts1" name="inventorySts1" th:with="statusList=${@dict.getType('inventoryStatus')}">
  27 + <option value="">请选择</option>
  28 + <option th:each="status : ${statusList}" th:text="${status['dictLabel']}" th:value="${status['dictValue']}"></option>
  29 + </select>
24 30 </div>
25 31 </div>
26 32 <div class="form-group">
27   - <label class="col-sm-3 control-label">：</label>
  33 + <label class="col-sm-3 control-label">数量：</label>
28 34 <div class="col-sm-8">
29   - <input id="materialName" name="materialName" class="form-control" type="text">
  35 + <input name="qty1" class="form-control" type="text">
30 36 </div>
31 37 </div>
32 38 <div class="form-group">
33   - <label class="col-sm-3 control-label">组盘数量：</label>
  39 + <label class="col-sm-3 control-label">库存状态：</label>
34 40 <div class="col-sm-8">
35   - <input id="qty" name="qty" class="form-control" type="text">
  41 + <select class="form-control" id="inventorySts2" name="inventorySts2" th:with="statusList=${@dict.getType('inventoryStatus')}">
  42 + <option value="">请选择</option>
  43 + <option th:each="status : ${statusList}" th:text="${status['dictLabel']}" th:value="${status['dictValue']}"></option>
  44 + </select>
36 45 </div>
37 46 </div>
38 47 <div class="form-group">
39   - <label class="col-sm-3 control-label">创建时间：</label>
  48 + <label class="col-sm-3 control-label">数量：</label>
40 49 <div class="col-sm-8">
41   - <input id="created" name="created" 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   - <input id="createdBy" name="createdBy" class="form-control" type="text">
  50 + <input name="qty2" class="form-control" type="text">
48 51 </div>
49 52 </div>
50 53 <div class="form-group">
... ... @@ -57,15 +60,29 @@
57 60 </div>
58 61 <div th:include="include::footer"></div>
59 62 <script type="text/javascript">
60   - var prefix = ctx + "receipt/receiptContainerDetail"
61   - $("#form-receiptContainerDetail-add").validate({
62   - rules:{
63   - xxxx:{
64   - required:true,
65   - },
66   - },
67   - submitHandler: function(form) {
68   - $.operate.save(prefix + "/add", $('#form-receiptContainerDetail-add').serialize());
  63 + var prefix = ctx + "check/checkDetail";
  64 + $("#form-checkComplete-add").validate({
  65 + submitHandler: function() {
  66 + var tableValue;
  67 + var inventorySts;
  68 + var qty;
  69 + if ( $("#inventorySts0 option:selected").val() == ""){
  70 + inventorySts = $("#inventorySts0 option:selected").val()
  71 + }
  72 + if ( $("#inventorySts1 option:selected").val() == ""){
  73 + inventorySts = ","+$("#inventorySts1 option:selected").val()
  74 + }
  75 + if ( $("#inventorySts2 option:selected").val() == ""){
  76 + inventorySts = ","+$("#inventorySts2 option:selected").val()
  77 + }
  78 + if ( $("input[name='qty"+i+"']").val() == ""){
  79 + qty = $("input[name='qty"+i+"']").val()+","
  80 + }
  81 +
  82 + tableValue = formValueReplace(tableValue, "id", [[${checkDetailId}]]);
  83 + tableValue = formValueReplace(tableValue, "inventorySts", inventorySts);
  84 + tableValue = formValueReplace(tableValue, "qty", qty);
  85 + $.operate.save(prefix + "/complete", $('#form-checkComplete-add').serialize());
69 86 }
70 87 });
71 88 </script>
... ...
src/main/resources/templates/check/checkDetail/checkDetail.html
  View file @b8cd077
... ... @@ -6,7 +6,6 @@
6 6 <div class="container-div">
7 7 <div class="row">
8 8 <div class="btn-group hidden-xs" id="toolbar" role="group">
9   - <input type="hidden" id="headerId" name="receiptId" th:value="${headerId}"/>
10 9 <!--<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="receipt:receiptContainer:add">-->
11 10 <!--<i class="fa fa-plus"></i> 新增-->
12 11 <!--</a>-->
... ... @@ -22,9 +21,11 @@
22 21 </div>
23 22 <div th:include="include :: footer"></div>
24 23 <script th:inline="javascript">
25   - // var editFlag = [[${@permission.hasPermi('receipt:receiptContainer:edit')}]];
  24 + var editFlag = [[${@permission.hasPermi('check:checkDetail:edit')}]];
26 25 var removeFlag = [[${@permission.hasPermi('check:checkDetail:remove')}]];
  26 + var checkDetailStatus = [[${@dict.getType('checkDetailStatus')}]];
27 27 var prefix = ctx + "check/checkDetail";
  28 + var inventorySts = [[${@dict.getType('inventoryStatus')}]];
28 29  
29 30 $(function() {
30 31 var options = {
... ... @@ -79,7 +80,7 @@
79 80 },
80 81 {
81 82 field : 'referCode',
82   - title : '关联单号"'
  83 + title : '关联单号'
83 84 },
84 85 {
85 86 field : 'referLineId',
... ... @@ -111,11 +112,19 @@
111 112 },
112 113 {
113 114 field : 'inventorySts',
114   - title : '库存状态'
  115 + title : '库存状态',
  116 + align: 'center',
  117 + formatter: function (value, row, index) {
  118 + return $.table.selectDictLabel(inventorySts, value);
  119 + }
115 120 },
116 121 {
117 122 field : 'status',
118   - title : '状态'
  123 + title : '状态',
  124 + align: 'center',
  125 + formatter: function (value, row, index) {
  126 + return $.table.selectDictLabel(checkDetailStatus, value);
  127 + }
119 128 },
120 129 {
121 130 field : 'qty',
... ... @@ -143,10 +152,8 @@
143 152 formatter: function(value, row, index) {
144 153 var actions = [];
145 154 actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
146   - if (row.status == 0){
147   - actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>开始质检</a> ');
148   - } else if (row.status == 10) {
149   - actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> ');
  155 + if (row.status == 10) {
  156 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-edit"></i>质检完成</a> ');
150 157 }
151 158 actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
152 159 return actions.join('');
... ... @@ -156,9 +163,15 @@
156 163 $.table.init(options);
157 164 });
158 165  
  166 +
  167 + function complete(id) {
  168 + var url = prefix+"/complete/"+id;
  169 + $.modal.open("完成质检", url);
  170 + }
  171 +
159 172 function queryParams(params) {
160 173 return {
161   - headerId:$("#receiptContainerId").val()
  174 + checkHeaderId : [[${id}]]
162 175 };
163 176 }
164 177 </script>
... ...
src/main/resources/templates/check/checkHeader/checkHeader.html
  View file @b8cd077
... ... @@ -70,10 +70,11 @@
70 70 var editFlag = [[${@permission.hasPermi('check:checkHeader:edit')}]];
71 71 var removeFlag = [[${@permission.hasPermi('check:checkHeader:remove')}]];
72 72 var receiptTypes = [[${@receiptTypeService.getType()}]];
73   - var receiptHeaderStatus = [[${@dict.getType('receiptHeaderStatus')}]];
  73 + var checkHeaderStatus = [[${@dict.getType('checkHeaderStatus')}]];
74 74 var printFlag = [[${@permission.hasPermi('check:checkHeader:report')}]];
75 75 var addFlag= [[${@permission.hasPermi('check:checkHeader:add')}]];
76 76 var datas = [[${@dict.getType('sys_normal_disable')}]];
  77 + var type = [[${@dict.getType('checkType')}]];
77 78  
78 79 $(function() {
79 80 var options = {
... ... @@ -85,6 +86,7 @@
85 86 search: false,
86 87 sortName: "id",
87 88 sortOrder: "desc",
  89 + queryParams: queryParams,
88 90 columns: [{
89 91 checkbox: true
90 92 },
... ... @@ -97,6 +99,14 @@
97 99 title : '编码'
98 100 },
99 101 {
  102 + field : 'type',
  103 + title : '质检类型',
  104 + align: 'center',
  105 + formatter: function(value, row, index) {
  106 + return $.table.selectDictLabel(type, value);
  107 + }
  108 + },
  109 + {
100 110 field : 'referCode',
101 111 title : '关联单号'
102 112 },
... ... @@ -115,7 +125,10 @@
115 125 {
116 126 field : 'status',
117 127 title : '状态',
118   - visible:false
  128 + align: 'center',
  129 + formatter: function (value, row, index) {
  130 + return $.table.selectDictLabel(checkHeaderStatus, value);
  131 + }
119 132 },
120 133 {
121 134 field : 'closedBy',
... ... @@ -167,6 +180,9 @@
167 180 align: 'center',
168 181 formatter: function(value, row, index) {
169 182 var actions = [];
  183 + if (row.status == 0){
  184 + actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="verify(\'' + row.id + '\')"><i class="fa fa-print"></i>审核</a> ');
  185 + }
170 186 actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-print"></i>完成</a> ');
171 187 actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
172 188 // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
... ... @@ -178,7 +194,7 @@
178 194 });
179 195  
180 196 function detail(id, code) {
181   - var url = prefix1+"/list/" + id;
  197 + var url = prefix1+"/" + id;
182 198 createtable(url);
183 199 }
184 200  
... ... @@ -193,9 +209,15 @@
193 209 $("#tabDetail").addClass("in active");
194 210 }
195 211  
196   - function complete(id) {
  212 + function verify(id) {
197 213  
198 214 }
  215 +
  216 + function queryParams(params) {
  217 + return {
  218 + type:[[${type}]]
  219 + };
  220 + }
199 221 </script>
200 222 </body>
201 223 </html>
202 224 \ No newline at end of file
... ...