Commit dcc93a365b5539dd5af9c951a624237dddfecc39
1 parent
1e4dd812
pull
Showing
3 changed files
with
259 additions
and
263 deletions
.idea/workspace.xml
| 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=""> | |
| 5 | - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html" afterDir="false" /> | |
| 6 | - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyContainer.html" afterDir="false" /> | |
| 7 | - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html" afterDir="false" /> | |
| 8 | - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html" afterDir="false" /> | |
| 9 | - <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" /> | |
| 4 | + <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="pull"> | |
| 10 | 5 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 11 | - <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" /> | |
| 12 | - <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" /> | |
| 13 | - <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" /> | |
| 14 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" /> | |
| 15 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" /> | |
| 16 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" /> | |
| 17 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java" afterDir="false" /> | |
| 18 | 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" /> |
| 19 | 7 | <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" /> |
| 20 | - <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" /> | |
| 21 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" /> | |
| 22 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" /> | |
| 23 | 8 | </list> |
| 24 | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 25 | 10 | <option name="SHOW_DIALOG" value="false" /> |
| ... | ... | @@ -68,11 +53,23 @@ |
| 68 | 53 | </provider> |
| 69 | 54 | </entry> |
| 70 | 55 | </file> |
| 71 | - <file pinned="false" current-in-tab="true"> | |
| 56 | + <file pinned="false" current-in-tab="false"> | |
| 72 | 57 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> |
| 73 | 58 | <provider selected="true" editor-type-id="text-editor"> |
| 74 | - <state relative-caret-position="291"> | |
| 75 | - <caret line="189" column="11" lean-forward="true" selection-start-line="189" selection-start-column="11" selection-end-line="189" selection-end-column="11" /> | |
| 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" /> | |
| 61 | + </state> | |
| 62 | + </provider> | |
| 63 | + </entry> | |
| 64 | + </file> | |
| 65 | + <file pinned="false" current-in-tab="true"> | |
| 66 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> | |
| 67 | + <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" /> | |
| 70 | + <folding> | |
| 71 | + <element signature="imports" expanded="true" /> | |
| 72 | + </folding> | |
| 76 | 73 | </state> |
| 77 | 74 | </provider> |
| 78 | 75 | </entry> |
| ... | ... | @@ -107,31 +104,20 @@ |
| 107 | 104 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java" /> |
| 108 | 105 | <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskDetailMapper.xml" /> |
| 109 | 106 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java" /> |
| 107 | + <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" /> | |
| 110 | 108 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java" /> |
| 111 | 109 | <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml" /> |
| 112 | 110 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" /> |
| 113 | 111 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/containerType/service/ContainerTypeServiceImpl.java" /> |
| 112 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" /> | |
| 114 | 113 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" /> |
| 114 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" /> | |
| 115 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" /> | |
| 116 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" /> | |
| 115 | 117 | <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" /> |
| 116 | 118 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" /> |
| 117 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" /> | |
| 118 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" /> | |
| 119 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyInOut.html" /> | |
| 120 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html" /> | |
| 121 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html" /> | |
| 122 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" /> | |
| 123 | - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyContainer.html" /> | |
| 124 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" /> | |
| 125 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" /> | |
| 126 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" /> | |
| 127 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java" /> | |
| 128 | 119 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" /> |
| 129 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" /> | |
| 130 | 120 | <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" /> |
| 131 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" /> | |
| 132 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" /> | |
| 133 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" /> | |
| 134 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" /> | |
| 135 | 121 | </list> |
| 136 | 122 | </option> |
| 137 | 123 | </component> |
| ... | ... | @@ -589,7 +575,6 @@ |
| 589 | 575 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| 590 | 576 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 591 | 577 | <property name="aspect.path.notification.shown" value="true" /> |
| 592 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader" /> | |
| 593 | 578 | <property name="list.type.of.created.stylesheet" value="CSS" /> |
| 594 | 579 | <property name="node.js.detected.package.eslint" value="true" /> |
| 595 | 580 | <property name="node.js.path.for.package.eslint" value="project" /> |
| ... | ... | @@ -599,11 +584,6 @@ |
| 599 | 584 | <property name="nodejs_package_manager_path" value="npm" /> |
| 600 | 585 | <property name="settings.editor.selected.configurable" value="Settings.JavaScript" /> |
| 601 | 586 | </component> |
| 602 | - <component name="RecentsManager"> | |
| 603 | - <key name="CopyFile.RECENT_KEYS"> | |
| 604 | - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\inventoryHeader" /> | |
| 605 | - </key> | |
| 606 | - </component> | |
| 607 | 587 | <component name="RunDashboard"> |
| 608 | 588 | <option name="configurationTypes"> |
| 609 | 589 | <set> |
| ... | ... | @@ -734,7 +714,7 @@ |
| 734 | 714 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
| 735 | 715 | <editor active="true" /> |
| 736 | 716 | <layout> |
| 737 | - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22050938" /> | |
| 717 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19504021" /> | |
| 738 | 718 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 739 | 719 | <window_info id="Web" order="2" side_tool="true" /> |
| 740 | 720 | <window_info id="Designer" order="3" /> |
| ... | ... | @@ -748,14 +728,14 @@ |
| 748 | 728 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| 749 | 729 | <window_info anchor="bottom" id="TODO" order="6" /> |
| 750 | 730 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
| 751 | - <window_info anchor="bottom" id="Version Control" order="8" weight="0.39660057" /> | |
| 731 | + <window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.04249292" /> | |
| 752 | 732 | <window_info anchor="bottom" id="Database Changes" order="9" weight="0.3286119" /> |
| 753 | 733 | <window_info anchor="bottom" id="Spring" order="10" /> |
| 754 | 734 | <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" /> |
| 755 | 735 | <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" /> |
| 756 | - <window_info anchor="bottom" id="Messages" order="13" weight="0.04249292" /> | |
| 736 | + <window_info anchor="bottom" id="Messages" order="13" weight="0.4362606" /> | |
| 757 | 737 | <window_info anchor="bottom" id="Java Enterprise" order="14" /> |
| 758 | - <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.09348442" /> | |
| 738 | + <window_info anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" weight="0.4348442" /> | |
| 759 | 739 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 760 | 740 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| 761 | 741 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| ... | ... | @@ -855,8 +835,7 @@ |
| 855 | 835 | <MESSAGE value="库存和任务移库相关" /> |
| 856 | 836 | <MESSAGE value="库存移库生成和完成逻辑" /> |
| 857 | 837 | <MESSAGE value="xml" /> |
| 858 | - <MESSAGE value="立库主单出库查看及明细库存出库查看" /> | |
| 859 | - <option name="LAST_COMMIT_MESSAGE" value="立库主单出库查看及明细库存出库查看" /> | |
| 838 | + <option name="LAST_COMMIT_MESSAGE" value="xml" /> | |
| 860 | 839 | </component> |
| 861 | 840 | <component name="XDebuggerManager"> |
| 862 | 841 | <breakpoint-manager> |
| ... | ... | @@ -915,10 +894,24 @@ |
| 915 | 894 | <properties /> |
| 916 | 895 | <option name="timeStamp" value="26" /> |
| 917 | 896 | </line-breakpoint> |
| 897 | + <line-breakpoint enabled="true" type="java-line"> | |
| 898 | + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url> | |
| 899 | + <line>47</line> | |
| 900 | + <properties /> | |
| 901 | + <option name="timeStamp" value="37" /> | |
| 902 | + </line-breakpoint> | |
| 918 | 903 | </breakpoints> |
| 919 | 904 | </breakpoint-manager> |
| 920 | 905 | </component> |
| 921 | 906 | <component name="editorHistoryManager"> |
| 907 | + <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml"> | |
| 908 | + <provider selected="true" editor-type-id="text-editor" /> | |
| 909 | + </entry> | |
| 910 | + <entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml"> | |
| 911 | + <provider selected="true" editor-type-id="text-editor"> | |
| 912 | + <state relative-caret-position="-828" /> | |
| 913 | + </provider> | |
| 914 | + </entry> | |
| 922 | 915 | <entry file="file://$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" /> |
| 923 | 916 | <entry file="file://$PROJECT_DIR$/.idea/misc.xml"> |
| 924 | 917 | <provider selected="true" editor-type-id="text-editor" /> |
| ... | ... | @@ -930,6 +923,13 @@ |
| 930 | 923 | </state> |
| 931 | 924 | </provider> |
| 932 | 925 | </entry> |
| 926 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
| 927 | + <provider selected="true" editor-type-id="text-editor"> | |
| 928 | + <state relative-caret-position="332"> | |
| 929 | + <caret line="283" column="13" selection-start-line="283" selection-start-column="13" selection-end-line="283" selection-end-column="13" /> | |
| 930 | + </state> | |
| 931 | + </provider> | |
| 932 | + </entry> | |
| 933 | 933 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java"> |
| 934 | 934 | <provider selected="true" editor-type-id="text-editor"> |
| 935 | 935 | <state relative-caret-position="-456"> |
| ... | ... | @@ -1035,6 +1035,13 @@ |
| 1035 | 1035 | </state> |
| 1036 | 1036 | </provider> |
| 1037 | 1037 | </entry> |
| 1038 | + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml"> | |
| 1039 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1040 | + <state relative-caret-position="322"> | |
| 1041 | + <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" /> | |
| 1042 | + </state> | |
| 1043 | + </provider> | |
| 1044 | + </entry> | |
| 1038 | 1045 | <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryTransactionMapper.xml"> |
| 1039 | 1046 | <provider selected="true" editor-type-id="text-editor"> |
| 1040 | 1047 | <state relative-caret-position="308"> |
| ... | ... | @@ -1077,6 +1084,13 @@ |
| 1077 | 1084 | </state> |
| 1078 | 1085 | </provider> |
| 1079 | 1086 | </entry> |
| 1087 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java"> | |
| 1088 | + <provider selected="true" editor-type-id="text-editor"> | |
| 1089 | + <state relative-caret-position="120"> | |
| 1090 | + <caret line="11" column="78" selection-start-line="11" selection-start-column="78" selection-end-line="11" selection-end-column="78" /> | |
| 1091 | + </state> | |
| 1092 | + </provider> | |
| 1093 | + </entry> | |
| 1080 | 1094 | <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/transfer.html"> |
| 1081 | 1095 | <provider selected="true" editor-type-id="text-editor"> |
| 1082 | 1096 | <state relative-caret-position="-264"> |
| ... | ... | @@ -1109,166 +1123,79 @@ |
| 1109 | 1123 | </state> |
| 1110 | 1124 | </provider> |
| 1111 | 1125 | </entry> |
| 1112 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 1113 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1114 | - <state relative-caret-position="448"> | |
| 1115 | - <caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" /> | |
| 1116 | - </state> | |
| 1117 | - </provider> | |
| 1118 | - </entry> | |
| 1119 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html"> | |
| 1120 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1121 | - <state relative-caret-position="185"> | |
| 1122 | - <caret line="335" column="16" lean-forward="true" selection-start-line="335" selection-start-column="16" selection-end-line="335" selection-end-column="16" /> | |
| 1123 | - <folding> | |
| 1124 | - <element signature="e#4822#10729#0" /> | |
| 1125 | - </folding> | |
| 1126 | - </state> | |
| 1127 | - </provider> | |
| 1128 | - </entry> | |
| 1129 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java"> | |
| 1130 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1131 | - <state relative-caret-position="140"> | |
| 1132 | - <caret line="9" selection-start-line="9" selection-end-line="9" /> | |
| 1133 | - </state> | |
| 1134 | - </provider> | |
| 1135 | - </entry> | |
| 1136 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
| 1137 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1138 | - <state relative-caret-position="304"> | |
| 1139 | - <caret line="104" column="25" selection-start-line="104" selection-start-column="25" selection-end-line="104" selection-end-column="25" /> | |
| 1140 | - </state> | |
| 1141 | - </provider> | |
| 1142 | - </entry> | |
| 1143 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java"> | |
| 1144 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1145 | - <state relative-caret-position="236"> | |
| 1146 | - <caret line="96" lean-forward="true" selection-start-line="96" selection-end-line="96" /> | |
| 1147 | - </state> | |
| 1148 | - </provider> | |
| 1149 | - </entry> | |
| 1150 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html"> | |
| 1126 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java"> | |
| 1151 | 1127 | <provider selected="true" editor-type-id="text-editor"> |
| 1152 | - <state relative-caret-position="256"> | |
| 1153 | - <caret line="29" column="49" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="49" /> | |
| 1128 | + <state relative-caret-position="100"> | |
| 1129 | + <caret line="8" column="61" selection-start-line="8" selection-start-column="61" selection-end-line="8" selection-end-column="61" /> | |
| 1154 | 1130 | </state> |
| 1155 | 1131 | </provider> |
| 1156 | 1132 | </entry> |
| 1157 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html"> | |
| 1133 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java"> | |
| 1158 | 1134 | <provider selected="true" editor-type-id="text-editor"> |
| 1159 | - <state relative-caret-position="424"> | |
| 1160 | - <caret line="41" column="51" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="51" /> | |
| 1135 | + <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" /> | |
| 1161 | 1137 | </state> |
| 1162 | 1138 | </provider> |
| 1163 | 1139 | </entry> |
| 1164 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html"> | |
| 1140 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
| 1165 | 1141 | <provider selected="true" editor-type-id="text-editor"> |
| 1166 | - <state relative-caret-position="60"> | |
| 1167 | - <caret line="30" column="49" selection-start-line="30" selection-start-column="49" selection-end-line="30" selection-end-column="49" /> | |
| 1142 | + <state relative-caret-position="220"> | |
| 1143 | + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" /> | |
| 1168 | 1144 | </state> |
| 1169 | 1145 | </provider> |
| 1170 | 1146 | </entry> |
| 1171 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyContainer.html"> | |
| 1147 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java"> | |
| 1172 | 1148 | <provider selected="true" editor-type-id="text-editor"> |
| 1173 | - <state relative-caret-position="-219"> | |
| 1174 | - <caret line="167" column="18" lean-forward="true" selection-start-line="167" selection-start-column="18" selection-end-line="167" selection-end-column="18" /> | |
| 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" /> | |
| 1175 | 1151 | </state> |
| 1176 | 1152 | </provider> |
| 1177 | 1153 | </entry> |
| 1178 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java"> | |
| 1154 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> | |
| 1179 | 1155 | <provider selected="true" editor-type-id="text-editor"> |
| 1180 | - <state relative-caret-position="200"> | |
| 1181 | - <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" /> | |
| 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" /> | |
| 1182 | 1158 | </state> |
| 1183 | 1159 | </provider> |
| 1184 | 1160 | </entry> |
| 1185 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java"> | |
| 1161 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html"> | |
| 1186 | 1162 | <provider selected="true" editor-type-id="text-editor"> |
| 1187 | - <state relative-caret-position="240"> | |
| 1188 | - <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> | |
| 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" /> | |
| 1189 | 1165 | <folding> |
| 1190 | - <element signature="imports" expanded="true" /> | |
| 1166 | + <element signature="e#4822#10729#0" /> | |
| 1191 | 1167 | </folding> |
| 1192 | 1168 | </state> |
| 1193 | 1169 | </provider> |
| 1194 | 1170 | </entry> |
| 1195 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java"> | |
| 1196 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1197 | - <state relative-caret-position="338"> | |
| 1198 | - <caret line="113" column="14" lean-forward="true" selection-start-line="113" selection-start-column="14" selection-end-line="113" selection-end-column="14" /> | |
| 1199 | - </state> | |
| 1200 | - </provider> | |
| 1201 | - </entry> | |
| 1202 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java"> | |
| 1203 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1204 | - <state relative-caret-position="118"> | |
| 1205 | - <caret line="76" column="46" lean-forward="true" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" /> | |
| 1206 | - </state> | |
| 1207 | - </provider> | |
| 1208 | - </entry> | |
| 1209 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml"> | |
| 1171 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java"> | |
| 1210 | 1172 | <provider selected="true" editor-type-id="text-editor"> |
| 1211 | - <state relative-caret-position="236"> | |
| 1212 | - <caret line="55" column="70" selection-start-line="55" selection-start-column="70" selection-end-line="55" selection-end-column="70" /> | |
| 1173 | + <state relative-caret-position="140"> | |
| 1174 | + <caret line="9" selection-start-line="9" selection-end-line="9" /> | |
| 1213 | 1175 | </state> |
| 1214 | 1176 | </provider> |
| 1215 | 1177 | </entry> |
| 1216 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java"> | |
| 1178 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java"> | |
| 1217 | 1179 | <provider selected="true" editor-type-id="text-editor"> |
| 1218 | - <state relative-caret-position="160"> | |
| 1219 | - <caret line="13" selection-start-line="13" selection-end-line="13" /> | |
| 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" /> | |
| 1220 | 1182 | </state> |
| 1221 | 1183 | </provider> |
| 1222 | 1184 | </entry> |
| 1223 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java"> | |
| 1185 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java"> | |
| 1224 | 1186 | <provider selected="true" editor-type-id="text-editor"> |
| 1225 | - <state relative-caret-position="450"> | |
| 1226 | - <caret line="31" column="12" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="12" /> | |
| 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" /> | |
| 1227 | 1189 | </state> |
| 1228 | 1190 | </provider> |
| 1229 | 1191 | </entry> |
| 1230 | 1192 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java"> |
| 1231 | 1193 | <provider selected="true" editor-type-id="text-editor"> |
| 1232 | - <state relative-caret-position="748"> | |
| 1233 | - <caret line="693" column="48" lean-forward="true" selection-start-line="693" selection-start-column="48" selection-end-line="693" selection-end-column="48" /> | |
| 1234 | - </state> | |
| 1235 | - </provider> | |
| 1236 | - </entry> | |
| 1237 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml"> | |
| 1238 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1239 | - <state relative-caret-position="708"> | |
| 1240 | - <caret line="48" column="13" lean-forward="true" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" /> | |
| 1241 | - </state> | |
| 1242 | - </provider> | |
| 1243 | - </entry> | |
| 1244 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java"> | |
| 1245 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1246 | - <state relative-caret-position="366"> | |
| 1247 | - <caret line="28" column="15" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" /> | |
| 1248 | - </state> | |
| 1249 | - </provider> | |
| 1250 | - </entry> | |
| 1251 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html"> | |
| 1252 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1253 | - <state relative-caret-position="56"> | |
| 1254 | - <caret line="80" column="6" selection-start-line="80" selection-start-column="6" selection-end-line="80" selection-end-column="6" /> | |
| 1255 | - </state> | |
| 1256 | - </provider> | |
| 1257 | - </entry> | |
| 1258 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java"> | |
| 1259 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1260 | - <state relative-caret-position="-18"> | |
| 1261 | - <caret line="220" column="35" selection-start-line="220" selection-start-column="35" selection-end-line="220" selection-end-column="35" /> | |
| 1262 | - </state> | |
| 1263 | - </provider> | |
| 1264 | - </entry> | |
| 1265 | - <entry file="file://$PROJECT_DIR$/src/main/resources/i18n/messages.properties"> | |
| 1266 | - <provider selected="true" editor-type-id="text-editor" /> | |
| 1267 | - </entry> | |
| 1268 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java"> | |
| 1269 | - <provider selected="true" editor-type-id="text-editor"> | |
| 1270 | - <state relative-caret-position="291"> | |
| 1271 | - <caret line="189" column="11" lean-forward="true" selection-start-line="189" selection-start-column="11" selection-end-line="189" selection-end-column="11" /> | |
| 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" /> | |
| 1196 | + <folding> | |
| 1197 | + <element signature="imports" expanded="true" /> | |
| 1198 | + </folding> | |
| 1272 | 1199 | </state> |
| 1273 | 1200 | </provider> |
| 1274 | 1201 | </entry> |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
| ... | ... | @@ -29,6 +29,8 @@ public interface TaskHeaderService extends IService<TaskHeader>{ |
| 29 | 29 | |
| 30 | 30 | AjaxResult completeCycleCountOrSeeOutTask(TaskHeader taskHeader); |
| 31 | 31 | |
| 32 | + AjaxResult createReceiptTask(List<Integer> ids); | |
| 33 | + | |
| 32 | 34 | Integer UncompleteCount(String containerCode); |
| 33 | 35 | |
| 34 | 36 | |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
| ... | ... | @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
| 4 | 4 | import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; |
| 5 | 5 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
| 6 | 6 | import com.huaheng.common.exception.service.ServiceException; |
| 7 | -import com.huaheng.common.support.Convert; | |
| 8 | 7 | import com.huaheng.common.utils.DataUtils; |
| 9 | 8 | import com.huaheng.common.utils.StringUtils; |
| 10 | 9 | import com.huaheng.common.utils.security.ShiroUtils; |
| ... | ... | @@ -20,6 +19,10 @@ import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction |
| 20 | 19 | import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService; |
| 21 | 20 | import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail; |
| 22 | 21 | import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService; |
| 22 | +import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader; | |
| 23 | +import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService; | |
| 24 | +import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail; | |
| 25 | +import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService; | |
| 23 | 26 | import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader; |
| 24 | 27 | import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService; |
| 25 | 28 | import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail; |
| ... | ... | @@ -30,15 +33,9 @@ import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader; |
| 30 | 33 | import com.huaheng.pc.task.taskDetail.domain.TaskDetail; |
| 31 | 34 | import com.huaheng.pc.task.taskDetail.service.TaskDetailService; |
| 32 | 35 | import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel; |
| 33 | -import com.sun.jmx.snmp.tasks.Task; | |
| 34 | -import org.apache.poi.ss.formula.functions.T; | |
| 35 | - | |
| 36 | -import org.springframework.beans.factory.annotation.Autowired; | |
| 37 | 36 | import org.springframework.stereotype.Service; |
| 38 | 37 | import java.math.BigDecimal; |
| 39 | 38 | import java.util.*; |
| 40 | -import java.util.stream.Collectors; | |
| 41 | - | |
| 42 | 39 | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
| 43 | 40 | import com.huaheng.pc.task.taskHeader.domain.TaskHeader; |
| 44 | 41 | import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper; |
| ... | ... | @@ -64,21 +61,22 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 64 | 61 | @Resource |
| 65 | 62 | private InventoryDetailService inventoryDetailService; |
| 66 | 63 | @Resource |
| 67 | - private InventoryTransactionService inventoryTransactionService; | |
| 64 | + private InventoryTransactionService inventoryTransactionService; | |
| 68 | 65 | @Resource |
| 69 | 66 | private ReceiptHeaderService receiptHeaderService; |
| 70 | 67 | @Resource |
| 68 | + private ReceiptDetailService receiptDetailService; | |
| 69 | + @Resource | |
| 71 | 70 | private ReceiptContainerDetailService receiptContainerDetailService; |
| 72 | 71 | @Resource |
| 72 | + private ReceiptContainerHeaderService receiptContainerHeaderService; | |
| 73 | + @Resource | |
| 73 | 74 | private TaskHeaderMapper taskHeaderMapper; |
| 74 | 75 | |
| 75 | 76 | |
| 76 | - | |
| 77 | - | |
| 78 | - | |
| 79 | 77 | /** |
| 80 | 78 | * 查询容器有无任务 |
| 81 | - * */ | |
| 79 | + */ | |
| 82 | 80 | @Override |
| 83 | 81 | public Integer UncompleteCount(String ContainerCode) { |
| 84 | 82 | return taskHeaderMapper.UncompleteCount(ContainerCode, ShiroUtils.getWarehouseCode()); |
| ... | ... | @@ -86,6 +84,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 86 | 84 | |
| 87 | 85 | /** |
| 88 | 86 | * 生成出库任务 |
| 87 | + * | |
| 89 | 88 | * @param shipmentTaskCreateModel |
| 90 | 89 | * @return |
| 91 | 90 | */ |
| ... | ... | @@ -195,8 +194,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 195 | 194 | } |
| 196 | 195 | |
| 197 | 196 | /** |
| 198 | - *下发WCS执行任务 | |
| 199 | - * */ | |
| 197 | + * 下发WCS执行任务 | |
| 198 | + */ | |
| 200 | 199 | @Override |
| 201 | 200 | public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) { |
| 202 | 201 | TaskHeader task = null; |
| ... | ... | @@ -314,25 +313,23 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 314 | 313 | |
| 315 | 314 | /** |
| 316 | 315 | * |
| 317 | - * | |
| 318 | - * */ | |
| 316 | + */ | |
| 319 | 317 | @Override |
| 320 | 318 | public AjaxResult completeReceiptTask(TaskHeader task) throws Exception { |
| 321 | - List<Map<String, Object>> taskReceiptContainerDetail =taskHeaderMapper.getReceiptTask(task.getId()); | |
| 322 | - if (taskReceiptContainerDetail.size()<1){ | |
| 319 | + List<Map<String, Object>> taskReceiptContainerDetail = taskHeaderMapper.getReceiptTask(task.getId()); | |
| 320 | + if (taskReceiptContainerDetail.size() < 1) { | |
| 323 | 321 | return AjaxResult.success("未找到对应任务的入库单号!!!"); |
| 324 | 322 | } |
| 325 | 323 | for (Map<String, Object> map : taskReceiptContainerDetail) { |
| 326 | 324 | //将未完成的任务数量更新到库存表 |
| 327 | 325 | if (DataUtils.getInteger(map.get("status")) < 100) { |
| 328 | - LambdaQueryWrapper<InventoryDetail> inventory =Wrappers.lambdaQuery(); | |
| 329 | - inventory.eq(InventoryDetail::getWarehouseCode,ShiroUtils.getWarehouseCode()) | |
| 330 | - .eq(InventoryDetail::getLocationCode,task.getFromLocation()) | |
| 331 | - .eq(InventoryDetail::getReceiptDetailId,DataUtils.getString(map.get("receiptDetailId"))) | |
| 332 | - .eq(InventoryDetail::getContainerCode,DataUtils.getString(map.get("containerCode"))); | |
| 333 | - InventoryDetail detail=inventoryDetailService.getOne(inventory); | |
| 334 | - if (detail == null) | |
| 335 | - { | |
| 326 | + LambdaQueryWrapper<InventoryDetail> inventory = Wrappers.lambdaQuery(); | |
| 327 | + inventory.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) | |
| 328 | + .eq(InventoryDetail::getLocationCode, task.getFromLocation()) | |
| 329 | + .eq(InventoryDetail::getReceiptDetailId, DataUtils.getString(map.get("receiptDetailId"))) | |
| 330 | + .eq(InventoryDetail::getContainerCode, DataUtils.getString(map.get("containerCode"))); | |
| 331 | + InventoryDetail detail = inventoryDetailService.getOne(inventory); | |
| 332 | + if (detail == null) { | |
| 336 | 333 | //添加库存单 |
| 337 | 334 | InventoryHeader header = new InventoryHeader(); |
| 338 | 335 | header.setWarehouseCode(DataUtils.getString(map.get("warehouseCode")));//仓库 |
| ... | ... | @@ -367,13 +364,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 367 | 364 | detail.setCreatedBy(ShiroUtils.getLoginName());//创建人 |
| 368 | 365 | detail.setLastUpdatedBy(ShiroUtils.getLoginName());//创建时间 |
| 369 | 366 | inventoryDetailService.save(detail); |
| 370 | - } | |
| 371 | - else | |
| 372 | - { | |
| 367 | + } else { | |
| 373 | 368 | detail.setQty(detail.getQty().add(DataUtils.getBigDecimal(map.get("qty")))); |
| 374 | 369 | detail.setLastUpdatedBy(ShiroUtils.getLoginName()); |
| 375 | 370 | LambdaUpdateWrapper<InventoryDetail> lambdaUpdateWrapper = Wrappers.lambdaUpdate(); |
| 376 | - lambdaUpdateWrapper.eq(InventoryDetail::getId,DataUtils.getInteger(map.get("receiptDetailId"))); | |
| 371 | + lambdaUpdateWrapper.eq(InventoryDetail::getId, DataUtils.getInteger(map.get("receiptDetailId"))); | |
| 377 | 372 | inventoryDetailService.update(detail, lambdaUpdateWrapper); |
| 378 | 373 | } |
| 379 | 374 | //记录库存交易记录 |
| ... | ... | @@ -405,40 +400,40 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 405 | 400 | lambdaUpdateWrapper.eq(TaskDetail::getTaskId, DataUtils.getInteger(map.get("taskDetailId"))); |
| 406 | 401 | taskDetailService.update(taskDetail, lambdaUpdateWrapper); |
| 407 | 402 | //修改入库单的状态 |
| 408 | - ReceiptHeader receiptHeader =new ReceiptHeader(); | |
| 403 | + ReceiptHeader receiptHeader = new ReceiptHeader(); | |
| 409 | 404 | receiptHeader.setFirstStatus(100); |
| 410 | 405 | receiptHeader.setLastStatus(100); |
| 411 | 406 | LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate(); |
| 412 | 407 | receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId, DataUtils.getInteger(map.get("receiptId"))); |
| 413 | 408 | receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper); |
| 414 | 409 | |
| 415 | - //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成 | |
| 410 | + //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成 | |
| 416 | 411 | task.setStatus(100); |
| 417 | 412 | task.setLastUpdatedBy(ShiroUtils.getLoginName()); |
| 418 | 413 | task.setLastUpdated(new Date()); |
| 419 | 414 | LambdaUpdateWrapper<TaskHeader> taskHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate(); |
| 420 | 415 | taskHeaderLambdaUpdateWrapper.eq(TaskHeader::getId, task.getId()); |
| 421 | 416 | taskHeaderService.update(task, taskHeaderLambdaUpdateWrapper); |
| 422 | - //修改库位状态和对应的容器 | |
| 423 | - Location location =new Location(); | |
| 417 | + //修改库位状态和对应的容器 | |
| 418 | + Location location = new Location(); | |
| 424 | 419 | location.setContainerCode(task.getContainerCode()); |
| 425 | 420 | location.setStatus("empty"); |
| 426 | 421 | LambdaUpdateWrapper<Location> locationLambdaUpdateWrapper = Wrappers.lambdaUpdate(); |
| 427 | 422 | locationLambdaUpdateWrapper.eq(Location::getCode, task.getToLocation()); |
| 428 | 423 | locationService.update(location, locationLambdaUpdateWrapper); |
| 429 | - //修改容器状态和对应的库位 | |
| 430 | - Container container =new Container(); | |
| 424 | + //修改容器状态和对应的库位 | |
| 425 | + Container container = new Container(); | |
| 431 | 426 | container.setLocationCode(task.getToLocation()); |
| 432 | 427 | container.setStatus("some"); |
| 433 | - //修改组盘表状态为20 | |
| 434 | - ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail(); | |
| 435 | - receiptContainerDetail.setStatus(20); | |
| 436 | - LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate(); | |
| 437 | - receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId,DataUtils.getInteger(map.get("receiptId"))); | |
| 438 | - receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper); | |
| 439 | - } | |
| 440 | - } | |
| 441 | - return AjaxResult.success("完成入库任务"); | |
| 428 | + //修改组盘表状态为20 | |
| 429 | + ReceiptContainerDetail receiptContainerDetail = new ReceiptContainerDetail(); | |
| 430 | + receiptContainerDetail.setStatus(20); | |
| 431 | + LambdaUpdateWrapper<ReceiptContainerDetail> receiptContainerDetailLambdaUpdateWrapper = Wrappers.lambdaUpdate(); | |
| 432 | + receiptContainerDetailLambdaUpdateWrapper.eq(ReceiptContainerDetail::getReceiptId, DataUtils.getInteger(map.get("receiptId"))); | |
| 433 | + receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper); | |
| 434 | + } | |
| 435 | + } | |
| 436 | + return AjaxResult.success("完成入库任务"); | |
| 442 | 437 | } |
| 443 | 438 | |
| 444 | 439 | // @Override |
| ... | ... | @@ -449,7 +444,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 449 | 444 | /** |
| 450 | 445 | * 生成 |
| 451 | 446 | * 立库移库 |
| 452 | - * */ | |
| 447 | + */ | |
| 453 | 448 | @Transactional |
| 454 | 449 | public AjaxResult createTransferTask(String sourceLocation, String destinationLocation) { |
| 455 | 450 | |
| ... | ... | @@ -459,24 +454,24 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 459 | 454 | temp1.setWarehouseCode(ShiroUtils.getWarehouseCode()); |
| 460 | 455 | LambdaQueryWrapper<Location> lambda1 = Wrappers.lambdaQuery(); |
| 461 | 456 | Location loc1 = locationService.getOne(lambda1); |
| 462 | - if(loc1==null){ | |
| 463 | - return AjaxResult.error("源库位："+sourceLocation+"未找到"); | |
| 457 | + if (loc1 == null) { | |
| 458 | + return AjaxResult.error("源库位：" + sourceLocation + "未找到"); | |
| 464 | 459 | } |
| 465 | - if(!loc1.getStatus().equals("empty")){ | |
| 466 | - return AjaxResult.error("源库位："+sourceLocation+"状态非空闲"); | |
| 460 | + if (!loc1.getStatus().equals("empty")) { | |
| 461 | + return AjaxResult.error("源库位：" + sourceLocation + "状态非空闲"); | |
| 467 | 462 | } |
| 468 | - if(StringUtils.isEmpty(loc1.getContainerCode())){ | |
| 469 | - return AjaxResult.error("源库位："+sourceLocation+"不存在托盘"); | |
| 463 | + if (StringUtils.isEmpty(loc1.getContainerCode())) { | |
| 464 | + return AjaxResult.error("源库位：" + sourceLocation + "不存在托盘"); | |
| 470 | 465 | } |
| 471 | 466 | //这里增加组盘校验，如果此托盘存在未完成的组盘数据，则不能移库 |
| 472 | 467 | //校验入库组盘 |
| 473 | - int count1 = inventoryHeaderService.getUncompleteReceiptContainer(sourceLocation,ShiroUtils.getWarehouseCode()); | |
| 474 | - if(count1>0){ | |
| 475 | - return AjaxResult.error("源库位："+sourceLocation+"存在入库组盘，不能移库"); | |
| 468 | + int count1 = inventoryHeaderService.getUncompleteReceiptContainer(sourceLocation, ShiroUtils.getWarehouseCode()); | |
| 469 | + if (count1 > 0) { | |
| 470 | + return AjaxResult.error("源库位：" + sourceLocation + "存在入库组盘，不能移库"); | |
| 476 | 471 | } |
| 477 | - int count2 = inventoryHeaderService.getUncompleteShipmentContainer(sourceLocation,ShiroUtils.getWarehouseCode()); | |
| 478 | - if(count2>0){ | |
| 479 | - return AjaxResult.error("源库位："+sourceLocation+"存在出库组盘，不能移库"); | |
| 472 | + int count2 = inventoryHeaderService.getUncompleteShipmentContainer(sourceLocation, ShiroUtils.getWarehouseCode()); | |
| 473 | + if (count2 > 0) { | |
| 474 | + return AjaxResult.error("源库位：" + sourceLocation + "存在出库组盘，不能移库"); | |
| 480 | 475 | } |
| 481 | 476 | //目的库位校验 |
| 482 | 477 | Location temp2 = new Location(); |
| ... | ... | @@ -484,18 +479,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 484 | 479 | temp2.setCode(destinationLocation); |
| 485 | 480 | LambdaQueryWrapper<Location> lambdaQueryWrapper2 = Wrappers.lambdaQuery(temp2); |
| 486 | 481 | Location loc2 = locationService.getOne(lambdaQueryWrapper2); |
| 487 | - if(loc2 == null){ | |
| 488 | - return AjaxResult.error("目标库位："+destinationLocation+"未找到"); | |
| 482 | + if (loc2 == null) { | |
| 483 | + return AjaxResult.error("目标库位：" + destinationLocation + "未找到"); | |
| 489 | 484 | } |
| 490 | - if(!loc2.getStatus().equals("empty")){ | |
| 491 | - return AjaxResult.error("目标库位："+destinationLocation+"状态非空闲"); | |
| 485 | + if (!loc2.getStatus().equals("empty")) { | |
| 486 | + return AjaxResult.error("目标库位：" + destinationLocation + "状态非空闲"); | |
| 492 | 487 | } |
| 493 | - if(StringUtils.isNotEmpty(loc2.getContainerCode())){ | |
| 494 | - return AjaxResult.error("目标库位："+destinationLocation+"已存在托盘"); | |
| 488 | + if (StringUtils.isNotEmpty(loc2.getContainerCode())) { | |
| 489 | + return AjaxResult.error("目标库位：" + destinationLocation + "已存在托盘"); | |
| 495 | 490 | } |
| 496 | - int count3 = inventoryHeaderService.getUncompleteReceiptContainer(destinationLocation,ShiroUtils.getWarehouseCode()); | |
| 497 | - if(count3>0){ | |
| 498 | - return AjaxResult.error("目标库位："+sourceLocation+"存在入库组盘，不能移库"); | |
| 491 | + int count3 = inventoryHeaderService.getUncompleteReceiptContainer(destinationLocation, ShiroUtils.getWarehouseCode()); | |
| 492 | + if (count3 > 0) { | |
| 493 | + return AjaxResult.error("目标库位：" + sourceLocation + "存在入库组盘，不能移库"); | |
| 499 | 494 | } |
| 500 | 495 | //写入任务主表和明细表 |
| 501 | 496 | TaskHeader taskHeader = new TaskHeader(); |
| ... | ... | @@ -540,6 +535,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 540 | 535 | |
| 541 | 536 | /** |
| 542 | 537 | * 完成移库任务 |
| 538 | + * | |
| 543 | 539 | * @param task |
| 544 | 540 | */ |
| 545 | 541 | private void completeTransferTask(TaskHeader task) { |
| ... | ... | @@ -572,15 +568,15 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 572 | 568 | inventoryDetail.setCompanyCode(inventoryHeader.getCompanyCode()); |
| 573 | 569 | inventoryDetail.setInventoryHeaderId(inventoryHeader.getId()); |
| 574 | 570 | LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery(inventoryDetail); |
| 575 | - List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); | |
| 571 | + List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); | |
| 576 | 572 | /*同时写入库存交易表*/ |
| 577 | 573 | List<InventoryTransaction> inventoryTransactionList = new ArrayList<>(); |
| 578 | - for(InventoryDetail item:inventoryDetailList){ | |
| 574 | + for (InventoryDetail item : inventoryDetailList) { | |
| 579 | 575 | item.setLocationCode(inventoryHeader.getLocationCode());//修改明细表库位 |
| 580 | 576 | item.setLastUpdated(new Date()); |
| 581 | 577 | item.setLastUpdatedBy(ShiroUtils.getLoginName()); |
| 582 | 578 | inventoryDetails.add(item); |
| 583 | - /*----------*/ | |
| 579 | + /*----------*/ | |
| 584 | 580 | InventoryTransaction inventoryTransaction = new InventoryTransaction(); |
| 585 | 581 | inventoryTransaction.setWarehouseCode(task.getWarehouseCode()); |
| 586 | 582 | inventoryTransaction.setLocationCode(taskDetail.getToLocation()); |
| ... | ... | @@ -615,10 +611,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 615 | 611 | inventoryTransaction.setSupplierCode(item.getSupplierCode()); |
| 616 | 612 | inventoryDetailList.add(inventoryDetail); |
| 617 | 613 | } |
| 618 | - if(inventoryDetailService.saveOrUpdateBatch(inventoryDetails)){ | |
| 614 | + if (inventoryDetailService.saveOrUpdateBatch(inventoryDetails)) { | |
| 619 | 615 | //更新库存明细成功后，写入库存交易 |
| 620 | 616 | inventoryTransactionService.saveBatch(inventoryTransactionList); |
| 621 | - }else{ | |
| 617 | + } else { | |
| 622 | 618 | throw new ServiceException("库存明细更新错误!"); |
| 623 | 619 | } |
| 624 | 620 | |
| ... | ... | @@ -654,30 +650,30 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 654 | 650 | } |
| 655 | 651 | |
| 656 | 652 | /** |
| 657 | - *生成 | |
| 658 | - *出库查看 | |
| 653 | + * 生成 | |
| 654 | + * 出库查看 | |
| 659 | 655 | * 任务 |
| 660 | - * */ | |
| 656 | + */ | |
| 661 | 657 | @Override |
| 662 | 658 | @Transactional |
| 663 | 659 | public AjaxResult createCheckOutTask(String[] ids) { |
| 664 | 660 | |
| 665 | - for(String id:ids){ | |
| 666 | - InventoryHeader inventoryHeader = inventoryHeaderService.getById(Integer.parseInt(id)); | |
| 661 | + for (String id : ids) { | |
| 662 | + InventoryHeader inventoryHeader = inventoryHeaderService.getById(Integer.parseInt(id)); | |
| 667 | 663 | //检查库位容器 |
| 668 | 664 | Location temp = new Location(); |
| 669 | 665 | temp.setCode(inventoryHeader.getLocationCode()); |
| 670 | 666 | temp.setWarehouseCode(inventoryHeader.getWarehouseCode()); |
| 671 | 667 | LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(temp); |
| 672 | 668 | Location loc = locationService.getOne(lambdaQueryWrapper); |
| 673 | - if(loc == null){ | |
| 669 | + if (loc == null) { | |
| 674 | 670 | throw new ServiceException("库存没有库位！"); |
| 675 | 671 | } |
| 676 | - if(!loc.getStatus().equals("empty")){ | |
| 677 | - throw new ServiceException(inventoryHeader.getLocationCode()+"状态非空闲，操作失败"); | |
| 672 | + if (!loc.getStatus().equals("empty")) { | |
| 673 | + throw new ServiceException(inventoryHeader.getLocationCode() + "状态非空闲，操作失败"); | |
| 678 | 674 | } |
| 679 | - if(StringUtils.isEmpty(loc.getContainerCode())){ | |
| 680 | - throw new ServiceException(inventoryHeader.getLocationCode()+"没有容器，操作失败"); | |
| 675 | + if (StringUtils.isEmpty(loc.getContainerCode())) { | |
| 676 | + throw new ServiceException(inventoryHeader.getLocationCode() + "没有容器，操作失败"); | |
| 681 | 677 | } |
| 682 | 678 | //通过库存头，找到库存明细 |
| 683 | 679 | InventoryDetail inventoryDetail = new InventoryDetail(); |
| ... | ... | @@ -685,7 +681,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 685 | 681 | inventoryDetail.setCompanyCode(inventoryHeader.getCompanyCode()); |
| 686 | 682 | inventoryDetail.setInventoryHeaderId(inventoryHeader.getId()); |
| 687 | 683 | LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery(inventoryDetail); |
| 688 | - List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); | |
| 684 | + List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper); | |
| 689 | 685 | |
| 690 | 686 | //写入任务主表 |
| 691 | 687 | TaskHeader taskHeader = new TaskHeader(); |
| ... | ... | @@ -704,7 +700,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 704 | 700 | taskHeaderMapper.insert(taskHeader); |
| 705 | 701 | //分拆库存明细，并写入任务细表 |
| 706 | 702 | List<TaskDetail> taskDetails = new ArrayList<>(); |
| 707 | - for(InventoryDetail item:inventoryDetailList){ | |
| 703 | + for (InventoryDetail item : inventoryDetailList) { | |
| 708 | 704 | |
| 709 | 705 | TaskDetail taskDetail = new TaskDetail(); |
| 710 | 706 | taskDetail.setTaskId(taskHeader.getId());//主单ID |
| ... | ... | @@ -720,13 +716,13 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 720 | 716 | taskDetail.setLastUpdated(new Date()); |
| 721 | 717 | taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName()); |
| 722 | 718 | taskDetails.add(taskDetail); |
| 723 | - } | |
| 724 | - if(taskDetailService.saveBatch(taskDetails)){ | |
| 725 | - //锁定库位状态 | |
| 726 | - locationService.updateStatus(loc.getContainerCode(),"lock"); | |
| 727 | - }else{ | |
| 728 | - throw new ServiceException("出库查看任务明细生成失败！"); | |
| 729 | - } | |
| 719 | + } | |
| 720 | + if (taskDetailService.saveBatch(taskDetails)) { | |
| 721 | + //锁定库位状态 | |
| 722 | + locationService.updateStatus(loc.getContainerCode(), "lock"); | |
| 723 | + } else { | |
| 724 | + throw new ServiceException("出库查看任务明细生成失败！"); | |
| 725 | + } | |
| 730 | 726 | |
| 731 | 727 | } |
| 732 | 728 | return AjaxResult.success("出库查看任务生成成功！"); |
| ... | ... | @@ -736,7 +732,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 736 | 732 | * 完成 |
| 737 | 733 | * 盘点，出库查看 |
| 738 | 734 | * 更新状态即可 |
| 739 | - * */ | |
| 735 | + */ | |
| 740 | 736 | @Transactional |
| 741 | 737 | @Override |
| 742 | 738 | public AjaxResult completeCycleCountOrSeeOutTask(TaskHeader taskHeader) { |
| ... | ... | @@ -750,17 +746,17 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 750 | 746 | taskDetail.setTaskId(taskHeader.getId()); |
| 751 | 747 | LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail); |
| 752 | 748 | List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单 |
| 753 | - for(TaskDetail item:taskDetailList){ | |
| 749 | + for (TaskDetail item : taskDetailList) { | |
| 754 | 750 | item.setStatus(100); |
| 755 | 751 | item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户 |
| 756 | 752 | item.setLastUpdated(new Date()); //更新时间 |
| 757 | 753 | taskDetailList.add(item); |
| 758 | 754 | } |
| 759 | - if( taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false){ | |
| 755 | + if (taskDetailService.saveOrUpdateBatch(taskDetailList) == false || taskHeaderService.saveOrUpdate(taskHeader) == false) { | |
| 760 | 756 | throw new ServiceException("任务单据状态更新失败！"); |
| 761 | 757 | } |
| 762 | 758 | //盘点完成时，修改盘点详细中的状态为100，容器恢复为空 |
| 763 | - if(taskHeader.getTaskType() == 700){ | |
| 759 | + if (taskHeader.getTaskType() == 700) { | |
| 764 | 760 | /*CyclecountDetail cyclecountDetai = cyclecountDetailService.selectEntityById( |
| 765 | 761 | task.getAllocationHeadId()); |
| 766 | 762 | cyclecountDetai.setStatus(40); |
| ... | ... | @@ -769,7 +765,78 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea |
| 769 | 765 | } |
| 770 | 766 | //释放库位状态 |
| 771 | 767 | locationService.updateStatus(taskHeader.getFromLocation(), "empty"); |
| 772 | - return AjaxResult.success("完成出库查看任务"); | |
| 768 | + return AjaxResult.success("完成出库查看任务"); | |
| 769 | + } | |
| 770 | + | |
| 771 | + /** | |
| 772 | + * 创建上架任务 | |
| 773 | + * | |
| 774 | + * @param ids | |
| 775 | + * @return | |
| 776 | + */ | |
| 777 | + @Override | |
| 778 | + public AjaxResult createReceiptTask(List<Integer> ids) { | |
| 779 | + for (Integer id : ids) { | |
| 780 | + ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(id); | |
| 781 | + if (receiptContainerHeader == null) | |
| 782 | + throw new ServiceException("任务不存在！"); | |
| 783 | + if (receiptContainerHeader.getWarehouseCode() != ShiroUtils.getWarehouseCode()) | |
| 784 | + throw new ServiceException("任务不在当前仓库！"); | |
| 785 | + LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery(); | |
| 786 | + containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, id); | |
| 787 | + List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda); | |
| 788 | + if (list.size() < 1) | |
| 789 | + throw new ServiceException("没有组盘明细，请先组盘！"); | |
| 790 | + if (receiptContainerHeader.getStatus() == 0) { | |
| 791 | + if (receiptContainerHeader.getStatus().intValue() < 10) { | |
| 792 | + receiptContainerHeader.setStatus((short) 10); | |
| 793 | + receiptContainerHeaderService.updateById(receiptContainerHeader); | |
| 794 | + } | |
| 795 | + //添加任务主表 | |
| 796 | + TaskHeader task = new TaskHeader(); | |
| 797 | + task.setWarehouseCode(receiptContainerHeader.getWarehouseCode()); | |
| 798 | + task.setCompanyCode(receiptContainerHeader.getCompanyCode()); | |
| 799 | + task.setFromLocation(receiptContainerHeader.getFromLocation()); | |
| 800 | + task.setTaskType(Integer.valueOf(receiptContainerHeader.getTaskType())); | |
| 801 | + task.setFromLocation(receiptContainerHeader.getFromLocation()); | |
| 802 | + task.setToLocation(receiptContainerHeader.getToLocation()); | |
| 803 | + task.setContainerCode(receiptContainerHeader.getContainerCode()); | |
| 804 | + task.setCreated(new Date()); | |
| 805 | + task.setCreatedBy(ShiroUtils.getLoginName()); | |
| 806 | + this.save(task); | |
| 807 | + //添加任务明细表 | |
| 808 | + for(ReceiptContainerDetail item : list) { | |
| 809 | + TaskDetail taskDetail = new TaskDetail(); | |
| 810 | + taskDetail.setTaskId(task.getId()); | |
| 811 | + taskDetail.setWarehouseCode(task.getWarehouseCode()); | |
| 812 | + taskDetail.setCompanyCode(task.getCompanyCode()); | |
| 813 | + taskDetail.setCompanyCode(task.getCompanyCode()); | |
| 814 | + taskDetail.setMaterialCode(item.getMaterialCode()); | |
| 815 | + taskDetail.setMaterialName(item.getMaterialName()); | |
| 816 | + taskDetail.setBillCode(item.getReceiptCode()); | |
| 817 | + taskDetail.setBillDetailId(item.getReceiptDetailId()); | |
| 818 | + taskDetail.setBillCode(item.getReceiptCode()); | |
| 819 | + taskDetail.setQty(BigDecimal.valueOf(item.getQty())); | |
| 820 | + taskDetail.setContainerCode(task.getContainerCode()); | |
| 821 | + taskDetail.setFromLocation(task.getFromLocation()); | |
| 822 | + taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
| 823 | + taskDetail.setBatch(item.getBatch()); | |
| 824 | + taskDetailService.save(taskDetail); | |
| 825 | + | |
| 826 | + ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId()); | |
| 827 | + if ("300".equals(receiptDetail.getProcessStamp())){ | |
| 828 | + ReceiptDetail detail = receiptDetailService.queryflow(receiptDetail); | |
| 829 | + if (!receiptDetailService.updateById(detail)){ | |
| 830 | + throw new ServiceException("更新入库单详情失败"); | |
| 831 | + } | |
| 832 | + receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId()); | |
| 833 | + } | |
| 834 | + } | |
| 835 | + | |
| 836 | + | |
| 837 | + } | |
| 838 | + } | |
| 839 | + return AjaxResult.success("生成上架任务成功！"); | |
| 773 | 840 | } |
| 774 | 841 | |
| 775 | 842 | |
| ... | ... |