wms / wms_xianyangming · Commits

Commit b1f8ccd55f55160d013eb89ad6f297cb1f982b5b

Authored by pengcheng
2 parents cad4b16b fe0eed91

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

Inline Side-by-side
Showing 10 changed files with 266 additions and 63 deletions
.idea/workspace.xml
  View file @b1f8ccd
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="pull">
  4 + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6   - <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" />
  6 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" afterDir="false" />
  9 + <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" />
  10 + <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" />
  11 + <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" />
7 12 <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" />
  13 + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" afterDir="false" />
  14 + <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" />
8 15 </list>
9 16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 17 <option name="SHOW_DIALOG" value="false" />
... ... @@ -45,19 +52,19 @@
45 52 <component name="FileEditorManager">
46 53 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
47 54 <file pinned="false" current-in-tab="false">
48   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  55 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
49 56 <provider selected="true" editor-type-id="text-editor">
50   - <state relative-caret-position="-18">
51   - <caret line="220" column="35" selection-start-line="220" selection-start-column="35" selection-end-line="220" selection-end-column="35" />
  57 + <state relative-caret-position="448">
  58 + <caret line="117" column="42" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
52 59 </state>
53 60 </provider>
54 61 </entry>
55 62 </file>
56 63 <file pinned="false" current-in-tab="false">
57   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  64 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
58 65 <provider selected="true" editor-type-id="text-editor">
59   - <state relative-caret-position="1994">
60   - <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
  66 + <state relative-caret-position="216">
  67 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
61 68 </state>
62 69 </provider>
63 70 </entry>
... ... @@ -65,8 +72,8 @@
65 72 <file pinned="false" current-in-tab="true">
66 73 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
67 74 <provider selected="true" editor-type-id="text-editor">
68   - <state relative-caret-position="-14488">
69   - <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
  75 + <state relative-caret-position="230">
  76 + <caret line="666" lean-forward="true" selection-start-line="666" selection-end-line="666" />
70 77 <folding>
71 78 <element signature="imports" expanded="true" />
72 79 </folding>
... ... @@ -98,7 +105,6 @@
98 105 <list>
99 106 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html" />
100 107 <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
101   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" />
102 108 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" />
103 109 <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
104 110 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" />
... ... @@ -117,6 +123,14 @@
117 123 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
118 124 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
119 125 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
  126 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" />
  127 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" />
  128 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" />
  129 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" />
  130 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" />
  131 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" />
  132 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" />
  133 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" />
120 134 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
121 135 </list>
122 136 </option>
... ... @@ -227,7 +241,33 @@
227 241 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
228 242 <item name="pc" type="462c0819:PsiDirectoryNode" />
229 243 <item name="config" type="462c0819:PsiDirectoryNode" />
230   - <item name="containerType" type="462c0819:PsiDirectoryNode" />
  244 + <item name="container" type="462c0819:PsiDirectoryNode" />
  245 + </path>
  246 + <path>
  247 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  248 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  249 + <item name="src" type="462c0819:PsiDirectoryNode" />
  250 + <item name="main" type="462c0819:PsiDirectoryNode" />
  251 + <item name="java" type="462c0819:PsiDirectoryNode" />
  252 + <item name="com" type="462c0819:PsiDirectoryNode" />
  253 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  254 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  255 + <item name="config" type="462c0819:PsiDirectoryNode" />
  256 + <item name="container" type="462c0819:PsiDirectoryNode" />
  257 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
  258 + </path>
  259 + <path>
  260 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  261 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  262 + <item name="src" type="462c0819:PsiDirectoryNode" />
  263 + <item name="main" type="462c0819:PsiDirectoryNode" />
  264 + <item name="java" type="462c0819:PsiDirectoryNode" />
  265 + <item name="com" type="462c0819:PsiDirectoryNode" />
  266 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  267 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  268 + <item name="config" type="462c0819:PsiDirectoryNode" />
  269 + <item name="container" type="462c0819:PsiDirectoryNode" />
  270 + <item name="service" type="462c0819:PsiDirectoryNode" />
231 271 </path>
232 272 <path>
233 273 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -714,7 +754,7 @@
714 754 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
715 755 <editor active="true" />
716 756 <layout>
717   - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19504021" />
  757 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27479893" />
718 758 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
719 759 <window_info id="Web" order="2" side_tool="true" />
720 760 <window_info id="Designer" order="3" />
... ... @@ -728,14 +768,14 @@
728 768 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
729 769 <window_info anchor="bottom" id="TODO" order="6" />
730 770 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
731   - <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.04249292" />
  771 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.09773371" />
732 772 <window_info anchor="bottom" id="Database Changes" order="9" weight="0.3286119" />
733 773 <window_info anchor="bottom" id="Spring" order="10" />
734 774 <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
735 775 <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
736   - <window_info anchor="bottom" id="Messages" order="13" weight="0.4362606" />
  776 + <window_info anchor="bottom" id="Messages" order="13" weight="0.04249292" />
737 777 <window_info anchor="bottom" id="Java Enterprise" order="14" />
738   - <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" weight="0.4348442" />
  778 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.04957507" />
739 779 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
740 780 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
741 781 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -835,7 +875,8 @@
835 875 <MESSAGE value="库存和任务移库相关" />
836 876 <MESSAGE value="库存移库生成和完成逻辑" />
837 877 <MESSAGE value="xml" />
838   - <option name="LAST_COMMIT_MESSAGE" value="xml" />
  878 + <MESSAGE value="pull" />
  879 + <option name="LAST_COMMIT_MESSAGE" value="pull" />
839 880 </component>
840 881 <component name="XDebuggerManager">
841 882 <breakpoint-manager>
... ... @@ -937,13 +978,6 @@
937 978 </state>
938 979 </provider>
939 980 </entry>
940   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java">
941   - <provider selected="true" editor-type-id="text-editor">
942   - <state relative-caret-position="160">
943   - <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
944   - </state>
945   - </provider>
946   - </entry>
947 981 <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
948 982 <provider selected="true" editor-type-id="text-editor">
949 983 <state relative-caret-position="472">
... ... @@ -1021,13 +1055,6 @@
1021 1055 </state>
1022 1056 </provider>
1023 1057 </entry>
1024   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java">
1025   - <provider selected="true" editor-type-id="text-editor">
1026   - <state relative-caret-position="416">
1027   - <caret line="101" column="16" selection-start-line="101" selection-start-column="16" selection-end-line="101" selection-end-column="16" />
1028   - </state>
1029   - </provider>
1030   - </entry>
1031 1058 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/ShipmentTaskCreateModel.java">
1032 1059 <provider selected="true" editor-type-id="text-editor">
1033 1060 <state relative-caret-position="-12">
... ... @@ -1130,69 +1157,129 @@
1130 1157 </state>
1131 1158 </provider>
1132 1159 </entry>
  1160 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  1161 + <provider selected="true" editor-type-id="text-editor">
  1162 + <state relative-caret-position="185">
  1163 + <caret line="335" column="16" lean-forward="true" selection-start-line="335" selection-start-column="16" selection-end-line="335" selection-end-column="16" />
  1164 + <folding>
  1165 + <element signature="e#4822#10729#0" />
  1166 + </folding>
  1167 + </state>
  1168 + </provider>
  1169 + </entry>
  1170 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
  1171 + <provider selected="true" editor-type-id="text-editor">
  1172 + <state relative-caret-position="140">
  1173 + <caret line="9" selection-start-line="9" selection-end-line="9" />
  1174 + </state>
  1175 + </provider>
  1176 + </entry>
  1177 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  1178 + <provider selected="true" editor-type-id="text-editor">
  1179 + <state relative-caret-position="173">
  1180 + <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
  1181 + </state>
  1182 + </provider>
  1183 + </entry>
  1184 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
  1185 + <provider selected="true" editor-type-id="text-editor">
  1186 + <state relative-caret-position="80">
  1187 + <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
  1188 + </state>
  1189 + </provider>
  1190 + </entry>
  1191 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  1192 + <provider selected="true" editor-type-id="text-editor">
  1193 + <state relative-caret-position="1994">
  1194 + <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
  1195 + </state>
  1196 + </provider>
  1197 + </entry>
  1198 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  1199 + <provider selected="true" editor-type-id="text-editor">
  1200 + <state relative-caret-position="1350">
  1201 + <caret line="220" column="35" selection-start-line="220" selection-start-column="35" selection-end-line="220" selection-end-column="35" />
  1202 + </state>
  1203 + </provider>
  1204 + </entry>
1133 1205 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
1134 1206 <provider selected="true" editor-type-id="text-editor">
1135 1207 <state relative-caret-position="448">
1136   - <caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
  1208 + <caret line="117" column="42" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
1137 1209 </state>
1138 1210 </provider>
1139 1211 </entry>
1140 1212 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
1141 1213 <provider selected="true" editor-type-id="text-editor">
1142   - <state relative-caret-position="220">
  1214 + <state relative-caret-position="216">
1143 1215 <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
1144 1216 </state>
1145 1217 </provider>
1146 1218 </entry>
1147   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  1219 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
1148 1220 <provider selected="true" editor-type-id="text-editor">
1149   - <state relative-caret-position="-18">
1150   - <caret line="220" column="35" selection-start-line="220" selection-start-column="35" selection-end-line="220" selection-end-column="35" />
  1221 + <state relative-caret-position="200">
  1222 + <caret line="15" selection-start-line="15" selection-end-line="15" />
1151 1223 </state>
1152 1224 </provider>
1153 1225 </entry>
1154   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  1226 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">
1155 1227 <provider selected="true" editor-type-id="text-editor">
1156   - <state relative-caret-position="1994">
1157   - <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
  1228 + <state relative-caret-position="436">
  1229 + <caret line="50" column="23" selection-start-line="50" selection-start-column="23" selection-end-line="50" selection-end-column="23" />
1158 1230 </state>
1159 1231 </provider>
1160 1232 </entry>
1161   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
  1233 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">
1162 1234 <provider selected="true" editor-type-id="text-editor">
1163   - <state relative-caret-position="185">
1164   - <caret line="335" column="16" lean-forward="true" selection-start-line="335" selection-start-column="16" selection-end-line="335" selection-end-column="16" />
1165   - <folding>
1166   - <element signature="e#4822#10729#0" />
1167   - </folding>
  1235 + <state relative-caret-position="180">
  1236 + <caret line="14" selection-start-line="14" selection-end-line="14" />
1168 1237 </state>
1169 1238 </provider>
1170 1239 </entry>
1171   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
  1240 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java">
1172 1241 <provider selected="true" editor-type-id="text-editor">
1173   - <state relative-caret-position="140">
1174   - <caret line="9" selection-start-line="9" selection-end-line="9" />
  1242 + <state relative-caret-position="280">
  1243 + <caret line="16" column="1" lean-forward="true" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
1175 1244 </state>
1176 1245 </provider>
1177 1246 </entry>
1178   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  1247 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml">
1179 1248 <provider selected="true" editor-type-id="text-editor">
1180   - <state relative-caret-position="173">
1181   - <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" />
  1249 + <state relative-caret-position="446">
  1250 + <caret line="49" column="132" lean-forward="true" selection-start-line="49" selection-start-column="132" selection-end-line="49" selection-end-column="132" />
1182 1251 </state>
1183 1252 </provider>
1184 1253 </entry>
1185   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
  1254 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java">
1186 1255 <provider selected="true" editor-type-id="text-editor">
1187   - <state relative-caret-position="80">
1188   - <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
  1256 + <state relative-caret-position="326">
  1257 + <caret line="116" column="7" lean-forward="true" selection-start-line="116" selection-start-column="7" selection-end-line="116" selection-end-column="7" />
  1258 + <folding>
  1259 + <element signature="e#4932#4933#0" expanded="true" />
  1260 + <element signature="e#4992#4993#0" expanded="true" />
  1261 + </folding>
  1262 + </state>
  1263 + </provider>
  1264 + </entry>
  1265 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">
  1266 + <provider selected="true" editor-type-id="text-editor">
  1267 + <state relative-caret-position="392">
  1268 + <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
  1269 + </state>
  1270 + </provider>
  1271 + </entry>
  1272 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java">
  1273 + <provider selected="true" editor-type-id="text-editor">
  1274 + <state relative-caret-position="220">
  1275 + <caret line="12" column="96" selection-start-line="12" selection-start-column="96" selection-end-line="12" selection-end-column="96" />
1189 1276 </state>
1190 1277 </provider>
1191 1278 </entry>
1192 1279 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
1193 1280 <provider selected="true" editor-type-id="text-editor">
1194   - <state relative-caret-position="-14488">
1195   - <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
  1281 + <state relative-caret-position="230">
  1282 + <caret line="666" lean-forward="true" selection-start-line="666" selection-end-line="666" />
1196 1283 <folding>
1197 1284 <element signature="imports" expanded="true" />
1198 1285 </folding>
... ...
src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java
  View file @b1f8ccd
... ... @@ -12,5 +12,8 @@ public interface ContainerMapper extends BaseMapper&lt;Container&gt; {
12 12  
13 13 List<Location> getEmptyContainerInLocation(@Param("containerCode") String containerCode, @Param("locationCode") String locationCode, @Param("warehouseCode") String warehouseCode);
14 14  
  15 + void updateLocationCodeAndStatus(@Param("warehouseCode") String warehouseCode, @Param("containerCode") String containerCode, @Param("locationCode") String locationCode, @Param("status") String status);
  16 +
  17 +
15 18  
16 19 }
17 20 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
  View file @b1f8ccd
... ... @@ -15,4 +15,6 @@ public interface ContainerService extends IService&lt;Container&gt;{
15 15  
16 16 List<Location> getEmptyContainerInLocation(String containerCode, String locationCode, String warehouseCode);
17 17  
  18 + void updateLocationCodeAndStatus(String containerCode, String locationCode, String status);
  19 +
18 20 }
... ...
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
  View file @b1f8ccd
... ... @@ -119,4 +119,14 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
119 119 return containerMapper.getEmptyContainerInLocation(containerCode,locationCode,warehouseCode);
120 120 }
121 121  
  122 + /**
  123 + * 修改容器库位和状态
  124 + * */
  125 + @Override
  126 + public void updateLocationCodeAndStatus(String containerCode, String locationCode, String status) {
  127 + if (StringUtils.isNotEmpty(containerCode) || StringUtils.isNotEmpty(locationCode))
  128 + containerMapper.updateLocationCodeAndStatus(ShiroUtils.getWarehouseCode(), containerCode, locationCode, status);
  129 + }
  130 +
  131 +
122 132 }
... ...
src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
  View file @b1f8ccd
... ... @@ -8,5 +8,7 @@ public interface LocationMapper extends BaseMapper&lt;Location&gt; {
8 8  
9 9 void updateStatus(@Param("warehouseCode") String warehouseCode, @Param("code") String code, @Param("status") String status);
10 10  
  11 + void updateContainerCodeAndStatus(@Param("warehouseCode") String warehouseCode, @Param("locationCode") String locationCode, @Param("containerCode") String containerCode, @Param("status") String status);
  12 +
11 13 Location position(String locatingRule);
12 14 }
13 15 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/location/service/LocationService.java
  View file @b1f8ccd
... ... @@ -9,4 +9,7 @@ public interface LocationService extends IService&lt;Location&gt;{
9 9 void updateStatus(String locationCode, String status);
10 10  
11 11 String position(String locatingRule);
  12 +
  13 + void updateContainerCodeAndStatus(String locationCode, String containerCode, String status);
  14 +
12 15 }
... ...
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
  View file @b1f8ccd
... ... @@ -113,4 +113,15 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
113 113 public String position(String locatingRule){
114 114 return locationMapper.position(locatingRule).getCode();
115 115 }
  116 +
  117 + /**
  118 + * 修改容器和库位状态
  119 + * */
  120 + @Override
  121 + public void updateContainerCodeAndStatus(String locationCode, String containerCode, String status) {
  122 + if (StringUtils.isNotEmpty(locationCode) || StringUtils.isNotEmpty(containerCode))
  123 + locationMapper.updateContainerCodeAndStatus(ShiroUtils.getWarehouseCode(), locationCode, containerCode, status);
  124 + }
  125 +
  126 +
116 127 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @b1f8ccd
... ... @@ -9,6 +9,7 @@ import com.huaheng.common.utils.StringUtils;
9 9 import com.huaheng.common.utils.security.ShiroUtils;
10 10 import com.huaheng.framework.web.domain.AjaxResult;
11 11 import com.huaheng.pc.config.container.domain.Container;
  12 +import com.huaheng.pc.config.container.service.ContainerService;
12 13 import com.huaheng.pc.config.location.domain.Location;
13 14 import com.huaheng.pc.config.location.service.LocationService;
14 15 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
... ... @@ -46,6 +47,8 @@ import javax.annotation.Resource;
46 47 @Service
47 48 public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHeader> implements TaskHeaderService {
48 49  
  50 +
  51 +
49 52 @Resource
50 53 private ShipmentContainerHeaderService shipmentContainerHeaderService;
51 54 @Resource
... ... @@ -53,6 +56,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
53 56 @Resource
54 57 private LocationService locationService;
55 58 @Resource
  59 + private ContainerService containerService;
  60 + @Resource
56 61 private TaskDetailService taskDetailService;
57 62 @Resource
58 63 private TaskHeaderService taskHeaderService;
... ... @@ -74,6 +79,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
74 79 private TaskHeaderMapper taskHeaderMapper;
75 80  
76 81  
  82 +
  83 +
  84 +
  85 +
77 86 /**
78 87 * 查询容器有无任务
79 88 */
... ... @@ -292,21 +301,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
292 301 // //出库任务
293 302 // completeShipmentTask(task);
294 303 }
295   - //...其他任务类型暂时不处理 // 700 盘点 800 移库 900 出库查看
  304 + // 700 盘点 900 出库查看,包过空托出库查看
296 305 if (task.getInternalTaskType() == 700 || task.getInternalTaskType() == 900) {
297 306 completeCycleCountOrSeeOutTask(task);
298 307 }
299 308 if (task.getInternalTaskType() == 800) {
300   -// //移库
  309 +// //移库
301 310 completeTransferTask(task);
302 311 }
303 312 if (task.getInternalTaskType() == 500) {
304   -// //空托盘入库
305   -// completeEmptyIn(task);
  313 + //空托盘入库
  314 + completeEmptyIn(task);
306 315 }
307 316 if (task.getInternalTaskType() == 600) {
308   -// //空托盘出库
309   -// completeEmptyOut(task);
  317 + //空托盘出库
  318 + completeEmptyOut(task);
310 319 }
311 320 }
312 321  
... ... @@ -769,6 +778,75 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
769 778 }
770 779  
771 780 /**
  781 + * 完成空托盘入库任务
  782 + * @param taskHeader
  783 + */
  784 + @Transactional
  785 + public void completeEmptyIn(TaskHeader taskHeader) {
  786 +
  787 + //解锁容器，更新库位
  788 + containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(),taskHeader.getToLocation(),"empty");
  789 + //解锁库位，更新容器
  790 + locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(),taskHeader.getContainerCode(),"empty");
  791 + //完成任务,修改主单和明细状态
  792 + taskHeader.setStatus(100);
  793 + taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  794 + taskHeader.setLastUpdated(new Date());
  795 + //taskHeaderService.saveOrUpdate(taskHeader);
  796 + //taskDetail更新明细单总的状态
  797 + TaskDetail taskDetail = new TaskDetail();
  798 + taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
  799 + taskDetail.setTaskType(taskHeader.getTaskType());
  800 + taskDetail.setTaskId(taskHeader.getId());
  801 + LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
  802 + List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
  803 + for (TaskDetail item : taskDetailList) {
  804 + item.setStatus(100);
  805 + item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
  806 + item.setLastUpdated(new Date()); //更新时间
  807 + taskDetailList.add(item);
  808 + }
  809 + if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
  810 + throw new ServiceException("任务单据状态更新失败！");
  811 + }
  812 +
  813 + }
  814 +
  815 + /**
  816 + * 完成空托盘出库任务
  817 + * @param taskHeader
  818 + */
  819 + @Transactional
  820 + public void completeEmptyOut(TaskHeader taskHeader) {
  821 + //更新货位
  822 + locationService.updateContainerCodeAndStatus(taskHeader.getFromLocation(), "", "empty");
  823 + //更新容器信息
  824 + containerService.updateLocationCodeAndStatus(taskHeader.getContainerCode(), "", "empty");
  825 +
  826 + taskHeader.setStatus(100);
  827 + taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  828 + taskHeader.setLastUpdated(new Date());
  829 + //taskHeaderService.saveOrUpdate(taskHeader);
  830 + //taskDetail更新明细单总的状态
  831 + TaskDetail taskDetail = new TaskDetail();
  832 + taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
  833 + taskDetail.setTaskType(taskHeader.getTaskType());
  834 + taskDetail.setTaskId(taskHeader.getId());
  835 + LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
  836 + List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
  837 + for (TaskDetail item : taskDetailList) {
  838 + item.setStatus(100);
  839 + item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
  840 + item.setLastUpdated(new Date()); //更新时间
  841 + taskDetailList.add(item);
  842 + }
  843 + if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) {
  844 + throw new ServiceException("任务单据状态更新失败！");
  845 + }
  846 + }
  847 +
  848 +
  849 + /**
772 850 * 创建上架任务
773 851 *
774 852 * @param ids
... ...
src/main/resources/mybatis/config/ContainerMapper.xml
  View file @b1f8ccd
... ... @@ -48,6 +48,8 @@
48 48 </where>
49 49 </select>
50 50  
51   -
  51 + <update id="updateLocationCodeAndStatus">
  52 + UPDATE container set `status`=#{status}, locationCode=#{locationCode} WHERE warehouseCode=#{warehouseCode} AND `code`=#{containerCode}
  53 + </update>
52 54  
53 55 </mapper>
54 56 \ No newline at end of file
... ...
src/main/resources/mybatis/config/LocationMapper.xml
  View file @b1f8ccd
... ... @@ -44,4 +44,9 @@
44 44 <select id="position" resultMap="BaseResultMap">
45 45 select code from location where #{locatingRule}
46 46 </select>
  47 +
  48 + <update id="updateContainerCodeAndStatus">
  49 + UPDATE location set `status`=#{status},containerCode=#{containerCode} WHERE warehouseCode=#{warehouseCode} AND `code`=#{locationCode}
  50 + </update>
  51 +
47 52 </mapper>
48 53 \ No newline at end of file
... ...