wms / wms_shandonghaiwang · Commits

Commit 54104a15560fc9360545a34aa1eeb7d4975f2b49

Authored by mahuandong
1 parent f0563f9a

添加根据容器编码查找容器的方法 

配置规则添加自动添加模块类型
添加是否自动生成临时容器
Inline Side-by-side
Showing 18 changed files with 499 additions and 127 deletions
.idea/workspace.xml
  View file @54104a1
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="">
  4 + <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" 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/config/FilterConfigDetail/service/FilterConfigDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java" afterDir="false" />
  7 + <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" />
  8 + <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" />
  9 + <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" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" />
7 12 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" />
8 13 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java" afterDir="false" />
9 16 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/check/checkDetail/checkDetail.html" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" afterDir="false" />
12   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html" afterDir="false" />
  17 + <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" />
  18 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/add.html" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html" afterDir="false" />
13 21 <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
14   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html" afterDir="false" />
15   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/add.html" afterDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/receiving.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiving/receiving.html" afterDir="false" />
16 23 </list>
17 24 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
18 25 <option name="SHOW_DIALOG" value="false" />
... ... @@ -31,59 +38,7 @@
31 38 <option name="HIDDEN_KINDS">
32 39 <set />
33 40 </option>
34   - <expand>
35   - <path>
36   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
37   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
38   - </path>
39   - <path>
40   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
41   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
42   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
43   - </path>
44   - <path>
45   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
46   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
47   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
48   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
49   - </path>
50   - <path>
51   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
52   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
53   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
54   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
55   - <item name="receipt_header: table" type="285a2a93:MysqlImplModel$Table" />
56   - </path>
57   - <path>
58   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
59   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
60   - </path>
61   - <path>
62   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
63   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
64   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
65   - </path>
66   - <path>
67   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
68   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
69   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
70   - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
71   - </path>
72   - <path>
73   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
74   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
75   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
76   - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
77   - <item name="check_detail: table" type="285a2a93:MysqlImplModel$Table" />
78   - </path>
79   - <path>
80   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
81   - <item name="@localhost" type="feb32156:DbDataSourceImpl" />
82   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
83   - <item name="wms2.0: schema" type="76f4a085:MysqlImplModel$Schema" />
84   - <item name="check_header: table" type="285a2a93:MysqlImplModel$Table" />
85   - </path>
86   - </expand>
  41 + <expand />
87 42 <select />
88 43 </component>
89 44 <component name="FileTemplateManagerImpl">
... ... @@ -104,6 +59,7 @@
104 59 <OptionsSetting value="false" id="Update" />
105 60 </component>
106 61 <component name="PropertiesComponent">
  62 + <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
107 63 <property name="DefaultHtmlFileTemplate" value="HTML File" />
108 64 <property name="RequestMappingsPanelOrder0" value="0" />
109 65 <property name="RequestMappingsPanelOrder1" value="1" />
... ... @@ -112,17 +68,30 @@
112 68 <property name="WebServerToolWindowFactoryState" value="false" />
113 69 <property name="aspect.path.notification.shown" value="true" />
114 70 <property name="full.screen.before.presentation.mode" value="false" />
115   - <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
  71 + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" />
116 72 <property name="node.js.detected.package.eslint" value="true" />
117 73 <property name="node.js.detected.package.tslint" value="true" />
118 74 <property name="node.js.path.for.package.eslint" value="project" />
119 75 <property name="node.js.path.for.package.tslint" value="project" />
120 76 <property name="node.js.selected.package.eslint" value="(autodetect)" />
121 77 <property name="node.js.selected.package.tslint" value="(autodetect)" />
  78 + <property name="project.structure.last.edited" value="Modules" />
  79 + <property name="project.structure.proportion" value="0.15429688" />
  80 + <property name="project.structure.side.proportion" value="0.2" />
122 81 <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
123   - <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Console Font" />
  82 + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  83 + </component>
  84 + <component name="RecentsManager">
  85 + <key name="CopyFile.RECENT_KEYS">
  86 + <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" />
  87 + </key>
124 88 </component>
125 89 <component name="RunDashboard">
  90 + <option name="configurationTypes">
  91 + <set>
  92 + <option value="SpringBootApplicationConfigurationType" />
  93 + </set>
  94 + </option>
126 95 <option name="ruleStates">
127 96 <list>
128 97 <RuleState>
... ... @@ -135,6 +104,19 @@
135 104 </option>
136 105 </component>
137 106 <component name="RunManager" selected="Spring Boot.HuaHengApplication">
  107 + <configuration name="ReceiptContainerHeaderServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
  108 + <option name="MAIN_CLASS_NAME" value="com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderServiceImpl" />
  109 + <module name="huaheng" />
  110 + <extension name="coverage">
  111 + <pattern>
  112 + <option name="PATTERN" value="com.huaheng.pc.receipt.receiptContainerHeader.service.*" />
  113 + <option name="ENABLED" value="true" />
  114 + </pattern>
  115 + </extension>
  116 + <method v="2">
  117 + <option name="Make" enabled="true" />
  118 + </method>
  119 + </configuration>
138 120 <configuration name="ServiceTest.sendSimpleMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
139 121 <module name="huaheng" />
140 122 <extension name="coverage">
... ... @@ -168,12 +150,14 @@
168 150 </method>
169 151 </configuration>
170 152 <list>
  153 + <item itemvalue="Application.ReceiptContainerHeaderServiceImpl" />
171 154 <item itemvalue="JUnit.ServiceTest.sendSimpleMail" />
172 155 <item itemvalue="Spring Boot.HuaHengApplication" />
173 156 </list>
174 157 <recent_temporary>
175 158 <list>
176 159 <item itemvalue="Spring Boot.HuaHengApplication" />
  160 + <item itemvalue="Application.ReceiptContainerHeaderServiceImpl" />
177 161 <item itemvalue="JUnit.ServiceTest.sendSimpleMail" />
178 162 </list>
179 163 </recent_temporary>
... ... @@ -181,13 +165,9 @@
181 165 <component name="ServiceViewManager">
182 166 <option name="allServicesViewState">
183 167 <serviceView>
  168 + <option name="contentProportion" value="0.1612554" />
184 169 <treeState>
185   - <expand>
186   - <path>
187   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
188   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@20dd4d1b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
189   - </path>
190   - </expand>
  170 + <expand />
191 171 <select />
192 172 </treeState>
193 173 </serviceView>
... ... @@ -224,7 +204,73 @@
224 204 <workItem from="1568102802104" duration="132000" />
225 205 <workItem from="1568108585629" duration="2016000" />
226 206 <workItem from="1568162278389" duration="3299000" />
227   - <workItem from="1568170378983" duration="10947000" />
  207 + <workItem from="1568170378983" duration="18141000" />
  208 + <workItem from="1568249510258" duration="10225000" />
  209 + <workItem from="1568266250892" duration="1333000" />
  210 + <workItem from="1568269799447" duration="99000" />
  211 + <workItem from="1568270609232" duration="2008000" />
  212 + <workItem from="1568277784815" duration="3397000" />
  213 + <workItem from="1568595092050" duration="120000" />
  214 + <workItem from="1568595230891" duration="859000" />
  215 + <workItem from="1568597823149" duration="18415000" />
  216 + <workItem from="1568622349963" duration="1657000" />
  217 + <workItem from="1568625672966" duration="1471000" />
  218 + <workItem from="1568680155591" duration="361000" />
  219 + <workItem from="1568680712425" duration="2511000" />
  220 + <workItem from="1568684486098" duration="957000" />
  221 + <workItem from="1568685565340" duration="4430000" />
  222 + <workItem from="1568691952276" duration="8650000" />
  223 + <workItem from="1568707800753" duration="1137000" />
  224 + <workItem from="1568710796434" duration="1618000" />
  225 + <workItem from="1568766055582" duration="6000" />
  226 + <workItem from="1568768025248" duration="5346000" />
  227 + <workItem from="1568778175920" duration="2572000" />
  228 + <workItem from="1568787162277" duration="1740000" />
  229 + <workItem from="1568788907625" duration="7345000" />
  230 + <workItem from="1568853208604" duration="1177000" />
  231 + <workItem from="1568854399388" duration="3001000" />
  232 + <workItem from="1568861704814" duration="2380000" />
  233 + <workItem from="1568865359898" duration="108000" />
  234 + <workItem from="1568865651366" duration="623000" />
  235 + <workItem from="1568868902957" duration="3468000" />
  236 + <workItem from="1568875455023" duration="3979000" />
  237 + <workItem from="1568882661913" duration="1883000" />
  238 + <workItem from="1568887498559" duration="554000" />
  239 + <workItem from="1568940290765" duration="1255000" />
  240 + <workItem from="1568943643646" duration="634000" />
  241 + <workItem from="1568946720514" duration="599000" />
  242 + <workItem from="1568951675236" duration="5060000" />
  243 + <workItem from="1568963416874" duration="848000" />
  244 + <workItem from="1568964502775" duration="3587000" />
  245 + <workItem from="1568970279520" duration="8000" />
  246 + <workItem from="1569032862367" duration="1792000" />
  247 + <workItem from="1569037677538" duration="64000" />
  248 + <workItem from="1569134046393" duration="65000" />
  249 + <workItem from="1569198499251" duration="8680000" />
  250 + <workItem from="1569207254306" duration="18489000" />
  251 + <workItem from="1569285398457" duration="5908000" />
  252 + <workItem from="1569295518709" duration="463000" />
  253 + <workItem from="1569299856099" duration="4172000" />
  254 + <workItem from="1569312420091" duration="6208000" />
  255 + <workItem from="1569318779053" duration="35000" />
  256 + <workItem from="1569372049669" duration="4595000" />
  257 + <workItem from="1569390345693" duration="1418000" />
  258 + <workItem from="1569393808742" duration="10588000" />
  259 + <workItem from="1569411369199" duration="191000" />
  260 + <workItem from="1569457959376" duration="2373000" />
  261 + <workItem from="1569461866204" duration="777000" />
  262 + <workItem from="1569462694383" duration="6561000" />
  263 + <workItem from="1569477197991" duration="8695000" />
  264 + <workItem from="1569545011335" duration="12640000" />
  265 + <workItem from="1569565238961" duration="5096000" />
  266 + <workItem from="1569571884664" duration="2032000" />
  267 + <workItem from="1569577676760" duration="124000" />
  268 + <workItem from="1569717688488" duration="13568000" />
  269 + <workItem from="1569743740441" duration="1168000" />
  270 + <workItem from="1569745589865" duration="2739000" />
  271 + <workItem from="1569748443357" duration="438000" />
  272 + <workItem from="1569803438585" duration="13789000" />
  273 + <workItem from="1570581146682" duration="827000" />
228 274 </task>
229 275 <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
230 276 <created>1567664306836</created>
... ... @@ -268,7 +314,196 @@
268 314 <option name="project" value="LOCAL" />
269 315 <updated>1568174134623</updated>
270 316 </task>
271   - <option name="localTasksCounter" value="7" />
  317 + <task id="LOCAL-00007" summary="修改入库单审核移动到入库单头表">
  318 + <created>1568186231357</created>
  319 + <option name="number" value="00007" />
  320 + <option name="presentableId" value="LOCAL-00007" />
  321 + <option name="project" value="LOCAL" />
  322 + <updated>1568186231357</updated>
  323 + </task>
  324 + <task id="LOCAL-00008" summary="修改任务完成更新库位的错误">
  325 + <created>1568191139437</created>
  326 + <option name="number" value="00008" />
  327 + <option name="presentableId" value="LOCAL-00008" />
  328 + <option name="project" value="LOCAL" />
  329 + <updated>1568191139437</updated>
  330 + </task>
  331 + <task id="LOCAL-00009" summary="修改入库类型自动判断">
  332 + <created>1568259182874</created>
  333 + <option name="number" value="00009" />
  334 + <option name="presentableId" value="LOCAL-00009" />
  335 + <option name="project" value="LOCAL" />
  336 + <updated>1568259182874</updated>
  337 + </task>
  338 + <task id="LOCAL-00010" summary="修改入库单页面">
  339 + <created>1568281128408</created>
  340 + <option name="number" value="00010" />
  341 + <option name="presentableId" value="LOCAL-00010" />
  342 + <option name="project" value="LOCAL" />
  343 + <updated>1568281128408</updated>
  344 + </task>
  345 + <task id="LOCAL-00011" summary="修改入库单页面，入库单审核，质检页面后台跳转接口">
  346 + <created>1568616697584</created>
  347 + <option name="number" value="00011" />
  348 + <option name="presentableId" value="LOCAL-00011" />
  349 + <option name="project" value="LOCAL" />
  350 + <updated>1568616697584</updated>
  351 + </task>
  352 + <task id="LOCAL-00012" summary="修改 入库收货，生成上架任务自动执行定位">
  353 + <created>1568692224269</created>
  354 + <option name="number" value="00012" />
  355 + <option name="presentableId" value="LOCAL-00012" />
  356 + <option name="project" value="LOCAL" />
  357 + <updated>1568692224269</updated>
  358 + </task>
  359 + <task id="LOCAL-00013" summary="修复商品管理、物料类别种bug">
  360 + <created>1568784920330</created>
  361 + <option name="number" value="00013" />
  362 + <option name="presentableId" value="LOCAL-00013" />
  363 + <option name="project" value="LOCAL" />
  364 + <updated>1568784920330</updated>
  365 + </task>
  366 + <task id="LOCAL-00014" summary="修改入库明细添加加载定位规则的错误">
  367 + <created>1568788287608</created>
  368 + <option name="number" value="00014" />
  369 + <option name="presentableId" value="LOCAL-00014" />
  370 + <option name="project" value="LOCAL" />
  371 + <updated>1568788287608</updated>
  372 + </task>
  373 + <task id="LOCAL-00015" summary="添加入库质检行内编辑">
  374 + <created>1568857387442</created>
  375 + <option name="number" value="00015" />
  376 + <option name="presentableId" value="LOCAL-00015" />
  377 + <option name="project" value="LOCAL" />
  378 + <updated>1568857387442</updated>
  379 + </task>
  380 + <task id="LOCAL-00016" summary="行内编辑完成后更新数据库">
  381 + <created>1568875291383</created>
  382 + <option name="number" value="00016" />
  383 + <option name="presentableId" value="LOCAL-00016" />
  384 + <option name="project" value="LOCAL" />
  385 + <updated>1568875291383</updated>
  386 + </task>
  387 + <task id="LOCAL-00017" summary="修改质检登记使用bootstarp boot原生方法初始化">
  388 + <created>1568885639106</created>
  389 + <option name="number" value="00017" />
  390 + <option name="presentableId" value="LOCAL-00017" />
  391 + <option name="project" value="LOCAL" />
  392 + <updated>1568885639106</updated>
  393 + </task>
  394 + <task id="LOCAL-00018" summary="表单头创建时间添加默认创建时间&#10;开始时间默认提前一周，结束时间默认当天">
  395 + <created>1569207792528</created>
  396 + <option name="number" value="00018" />
  397 + <option name="presentableId" value="LOCAL-00018" />
  398 + <option name="project" value="LOCAL" />
  399 + <updated>1569207792528</updated>
  400 + </task>
  401 + <task id="LOCAL-00019" summary="配置中所有页面添加重置按钮">
  402 + <created>1569218224945</created>
  403 + <option name="number" value="00019" />
  404 + <option name="presentableId" value="LOCAL-00019" />
  405 + <option name="project" value="LOCAL" />
  406 + <updated>1569218224945</updated>
  407 + </task>
  408 + <task id="LOCAL-00020" summary="收货添加定位、取消定位、取消组盘按钮">
  409 + <created>1569232154274</created>
  410 + <option name="number" value="00020" />
  411 + <option name="presentableId" value="LOCAL-00020" />
  412 + <option name="project" value="LOCAL" />
  413 + <updated>1569232154274</updated>
  414 + </task>
  415 + <task id="LOCAL-00021" summary="修改入库单数量使用BigDecimal类型，修改入库单添加、修改、物理类型添加和修改页面">
  416 + <created>1569318560852</created>
  417 + <option name="number" value="00021" />
  418 + <option name="presentableId" value="LOCAL-00021" />
  419 + <option name="project" value="LOCAL" />
  420 + <updated>1569318560852</updated>
  421 + </task>
  422 + <task id="LOCAL-00022" summary="修改物料管理中物料类型使用物料类别表，不在使用数据字典">
  423 + <created>1569395439782</created>
  424 + <option name="number" value="00022" />
  425 + <option name="presentableId" value="LOCAL-00022" />
  426 + <option name="project" value="LOCAL" />
  427 + <updated>1569395439782</updated>
  428 + </task>
  429 + <task id="LOCAL-00023" summary="修改波次主表、波次流程头表、波次流程明细页面">
  430 + <created>1569402291802</created>
  431 + <option name="number" value="00023" />
  432 + <option name="presentableId" value="LOCAL-00023" />
  433 + <option name="project" value="LOCAL" />
  434 + <updated>1569402291802</updated>
  435 + </task>
  436 + <task id="LOCAL-00024" summary="修改入库首选项修改添加模块为select">
  437 + <created>1569411473661</created>
  438 + <option name="number" value="00024" />
  439 + <option name="presentableId" value="LOCAL-00024" />
  440 + <option name="project" value="LOCAL" />
  441 + <updated>1569411473661</updated>
  442 + </task>
  443 + <task id="LOCAL-00025" summary="修改任务取消入库组盘状态不回滚，修改任务完成入库单状态不完成">
  444 + <created>1569477488017</created>
  445 + <option name="number" value="00025" />
  446 + <option name="presentableId" value="LOCAL-00025" />
  447 + <option name="project" value="LOCAL" />
  448 + <updated>1569477488017</updated>
  449 + </task>
  450 + <task id="LOCAL-00026" summary="添加自动生成容器编码">
  451 + <created>1569484931952</created>
  452 + <option name="number" value="00026" />
  453 + <option name="presentableId" value="LOCAL-00026" />
  454 + <option name="project" value="LOCAL" />
  455 + <updated>1569484931952</updated>
  456 + </task>
  457 + <task id="LOCAL-00027" summary="修改入库首选项页面，规则查询使用数据字典值，表格值显示修改">
  458 + <created>1569553028716</created>
  459 + <option name="number" value="00027" />
  460 + <option name="presentableId" value="LOCAL-00027" />
  461 + <option name="project" value="LOCAL" />
  462 + <updated>1569553028716</updated>
  463 + </task>
  464 + <task id="LOCAL-00028" summary="入库单添加重置按钮，入库单历史添加上游单号搜索">
  465 + <created>1569554438854</created>
  466 + <option name="number" value="00028" />
  467 + <option name="presentableId" value="LOCAL-00028" />
  468 + <option name="project" value="LOCAL" />
  469 + <updated>1569554438854</updated>
  470 + </task>
  471 + <task id="LOCAL-00029" summary="添加取消入库组盘时容器为临时容器，删除容器">
  472 + <created>1569567112288</created>
  473 + <option name="number" value="00029" />
  474 + <option name="presentableId" value="LOCAL-00029" />
  475 + <option name="project" value="LOCAL" />
  476 + <updated>1569567112288</updated>
  477 + </task>
  478 + <task id="LOCAL-00030" summary="出库完成时删除临时容器">
  479 + <created>1569568426923</created>
  480 + <option name="number" value="00030" />
  481 + <option name="presentableId" value="LOCAL-00030" />
  482 + <option name="project" value="LOCAL" />
  483 + <updated>1569568426923</updated>
  484 + </task>
  485 + <task id="LOCAL-00031" summary="修改容器新增时容器enable状态">
  486 + <created>1569577849038</created>
  487 + <option name="number" value="00031" />
  488 + <option name="presentableId" value="LOCAL-00031" />
  489 + <option name="project" value="LOCAL" />
  490 + <updated>1569577849039</updated>
  491 + </task>
  492 + <task id="LOCAL-00032" summary="修改入库组盘页面中任务类型的显示问题&#10;修改任务完成不修改入库组盘状态的问题">
  493 + <created>1569740895495</created>
  494 + <option name="number" value="00032" />
  495 + <option name="presentableId" value="LOCAL-00032" />
  496 + <option name="project" value="LOCAL" />
  497 + <updated>1569740895496</updated>
  498 + </task>
  499 + <task id="LOCAL-00033" summary="添加根据code查询物料">
  500 + <created>1569743042718</created>
  501 + <option name="number" value="00033" />
  502 + <option name="presentableId" value="LOCAL-00033" />
  503 + <option name="project" value="LOCAL" />
  504 + <updated>1569743042718</updated>
  505 + </task>
  506 + <option name="localTasksCounter" value="34" />
272 507 <servers />
273 508 </component>
274 509 <component name="TypeScriptGeneratedFilesManager">
... ... @@ -288,41 +523,88 @@
288 523 </option>
289 524 </component>
290 525 <component name="VcsManagerConfiguration">
291   - <MESSAGE value="修改添加物料时使用物料类别生成物料编码" />
292   - <MESSAGE value="修改质检页面、添加完成质检" />
293   - <MESSAGE value="修复入库质检请求地址冲突" />
294   - <MESSAGE value="添加入库单打印" />
295   - <option name="LAST_COMMIT_MESSAGE" value="添加入库单打印" />
  526 + <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
  527 + <MESSAGE value="修改入库类型自动判断" />
  528 + <MESSAGE value="修改入库单页面" />
  529 + <MESSAGE value="修改入库单页面，入库单审核，质检页面后台跳转接口" />
  530 + <MESSAGE value="修改 入库收货，生成上架任务自动执行定位" />
  531 + <MESSAGE value="修复商品管理、物料类别种bug" />
  532 + <MESSAGE value="修改入库明细添加加载定位规则的错误" />
  533 + <MESSAGE value="添加入库质检行内编辑" />
  534 + <MESSAGE value="行内编辑完成后更新数据库" />
  535 + <MESSAGE value="修改质检登记使用bootstarp boot原生方法初始化" />
  536 + <MESSAGE value="表单头创建时间添加默认创建时间&#10;开始时间默认提前一周，结束时间默认当天" />
  537 + <MESSAGE value="配置中所有页面添加重置按钮" />
  538 + <MESSAGE value="收货添加定位、取消定位、取消组盘按钮" />
  539 + <MESSAGE value="修改入库单数量使用BigDecimal类型，修改入库单添加、修改、物理类型添加和修改页面" />
  540 + <MESSAGE value="修改物料管理中物料类型使用物料类别表，不在使用数据字典" />
  541 + <MESSAGE value="修改波次主表、波次流程头表、波次流程明细页面" />
  542 + <MESSAGE value="修改入库首选项修改添加模块为select" />
  543 + <MESSAGE value="修改任务取消入库组盘状态不回滚，修改任务完成入库单状态不完成" />
  544 + <MESSAGE value="添加自动生成容器编码" />
  545 + <MESSAGE value="修改入库首选项页面，规则查询使用数据字典值，表格值显示修改" />
  546 + <MESSAGE value="入库单添加重置按钮，入库单历史添加上游单号搜索" />
  547 + <MESSAGE value="添加取消入库组盘时容器为临时容器，删除容器" />
  548 + <MESSAGE value="出库完成时删除临时容器" />
  549 + <MESSAGE value="修改容器新增时容器enable状态" />
  550 + <MESSAGE value="修改入库组盘页面中任务类型的显示问题&#10;修改任务完成不修改入库组盘状态的问题" />
  551 + <MESSAGE value="添加根据code查询物料" />
  552 + <option name="LAST_COMMIT_MESSAGE" value="添加根据code查询物料" />
296 553 </component>
297 554 <component name="XDebuggerManager">
298 555 <breakpoint-manager>
299 556 <breakpoints>
300 557 <line-breakpoint enabled="true" type="java-line">
301   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java</url>
302   - <line>152</line>
303   - <option name="timeStamp" value="6" />
  558 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java</url>
  559 + <line>164</line>
  560 + <option name="timeStamp" value="24" />
  561 + </line-breakpoint>
  562 + <line-breakpoint enabled="true" type="java-line">
  563 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java</url>
  564 + <line>150</line>
  565 + <option name="timeStamp" value="26" />
304 566 </line-breakpoint>
305 567 <line-breakpoint enabled="true" type="java-line">
306   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java</url>
307   - <line>154</line>
308   - <option name="timeStamp" value="8" />
  568 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url>
  569 + <line>172</line>
  570 + <option name="timeStamp" value="28" />
309 571 </line-breakpoint>
310 572 <line-breakpoint enabled="true" type="java-line">
311   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java</url>
312   - <line>45</line>
313   - <option name="timeStamp" value="9" />
  573 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java</url>
  574 + <line>618</line>
  575 + <option name="timeStamp" value="48" />
314 576 </line-breakpoint>
315 577 <line-breakpoint enabled="true" type="java-line">
316   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java</url>
317   - <line>144</line>
318   - <option name="timeStamp" value="10" />
  578 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java</url>
  579 + <line>56</line>
  580 + <option name="timeStamp" value="49" />
319 581 </line-breakpoint>
320 582 <line-breakpoint enabled="true" type="java-line">
321   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java</url>
322   - <line>240</line>
323   - <option name="timeStamp" value="11" />
  583 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java</url>
  584 + <line>84</line>
  585 + <option name="timeStamp" value="51" />
  586 + </line-breakpoint>
  587 + <line-breakpoint enabled="true" type="javascript">
  588 + <url>file://$PROJECT_DIR$/src/main/resources/templates/check/checkingRegister/checkingRegister.html</url>
  589 + <line>308</line>
  590 + <option name="timeStamp" value="29" />
  591 + </line-breakpoint>
  592 + <line-breakpoint enabled="true" type="javascript">
  593 + <url>file://$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/waveFlowHeader.html</url>
  594 + <line>71</line>
  595 + <option name="timeStamp" value="43" />
324 596 </line-breakpoint>
325 597 </breakpoints>
326 598 </breakpoint-manager>
  599 + <watches-manager>
  600 + <configuration name="SpringBootApplicationConfigurationType">
  601 + <watch expression="receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId()).getLocatingRule()" language="JAVA" />
  602 + </configuration>
  603 + </watches-manager>
  604 + </component>
  605 + <component name="com.intellij.coverage.CoverageDataManagerImpl">
  606 + <SUITE FILE_PATH="coverage/huaheng$HuaHengApplication.ic" NAME="HuaHengApplication Coverage Results" MODIFIED="1568251952497" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
  607 + <FILTER>com.huaheng.*</FILTER>
  608 + </SUITE>
327 609 </component>
328 610 </project>
329 611 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/FilterConfigHeader/controller/FilterConfigHeaderController.java
  View file @54104a1
... ... @@ -98,8 +98,9 @@ public class FilterConfigHeaderController extends BaseController {
98 98 /**
99 99 * 新增规则配置主表
100 100 */
101   - @GetMapping("/add")
102   - public String add() {
  101 + @GetMapping("/add/{type}")
  102 + public String add(@PathVariable("type")String type, ModelMap modelMap) {
  103 + modelMap.put("moduleType", type);
103 104 return prefix + "/add";
104 105 }
105 106  
... ...
src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java
  View file @54104a1
... ... @@ -14,6 +14,7 @@ public interface ContainerMapper extends BaseMapper&lt;Container&gt; {
14 14  
15 15 void updateLocationCodeAndStatus(@Param("warehouseCode") String warehouseCode, @Param("containerCode") String containerCode, @Param("locationCode") String locationCode, @Param("status") String status);
16 16  
  17 + Container findAllByCode(@Param("code") String code);
17 18  
18 19  
19 20 }
20 21 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
  View file @54104a1
... ... @@ -20,4 +20,6 @@ public interface ContainerService extends IService&lt;Container&gt;{
20 20 void removeContainer(String containType, String containCode);
21 21  
22 22 void removeByCode(String containCode);
  23 +
  24 + Container findAllByCode(String containCode);
23 25 }
... ...
src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
  View file @54104a1
... ... @@ -162,4 +162,9 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
162 162 }
163 163  
164 164 }
  165 +
  166 + @Override
  167 + public Container findAllByCode(String code) {
  168 + return containerMapper.findAllByCode(code);
  169 + }
165 170 }
... ...
src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
  View file @54104a1
... ... @@ -156,7 +156,6 @@ public class MaterialController extends BaseController {
156 156  
157 157 /**
158 158 * 导出模板
159   - * @param file
160 159 * @return
161 160 * @throws Exception
162 161 */
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
  View file @54104a1
... ... @@ -59,6 +59,9 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
59 59 ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
60 60 receiptDetail.setOpenQty(receiptDetail.getOpenQty().subtract(receiptContainerDetail.getQty()));
61 61  
  62 + //如果为临时容器，则删除
  63 + receiptContainerDetail.getContainerCode();
  64 +
62 65 if (!receiptDetailService.updateById(receiptDetail)){throw new SecurityException("回滚入库单明细失败");}
63 66 //删除组盘明细
64 67 if (!this.removeById(id)){ throw new ServiceException("回滚入库组盘失败");}
... ... @@ -70,12 +73,15 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
70 73 throw new ServiceException("删除入库组盘头失败");
71 74 }
72 75 }
  76 +
73 77 //查询入库头表
74 78 LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
75 79 containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, receiptContainerDetail.getReceiptId());
76 80 List<ReceiptContainerDetail> containerDetailList = this.list(containerDetailLambda);
  81 +
  82 +
77 83 //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
78   - if (containerDetailList == null){
  84 + if (containerDetailList.size() == 0){
79 85 ReceiptHeader receiptHeader = new ReceiptHeader();
80 86 receiptHeader.setId(receiptContainerDetail.getReceiptId());
81 87 receiptHeader.setFirstStatus(200);
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @54104a1
... ... @@ -72,6 +72,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
72 72 //检查容器编码合法性
73 73 Integer taskType = checkContainer(containerCode, detail.getMaterialCode());
74 74 if (taskType == 1){
  75 + //创建临时容器
75 76 containerCode = createContainer();
76 77 taskType = 100;
77 78 }else {
... ... @@ -97,6 +98,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
97 98 receiptContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
98 99 receiptContainerHeader.setCompanyCode(receiptDetail.getCompanyCode());
99 100 receiptContainerHeader.setContainerCode(containerCode);
  101 + Container container = containerService.findAllByCode(containerCode);
  102 + receiptContainerHeader.setContainerType(container.getContainerType());
100 103 receiptContainerHeader.setTaskType(String.valueOf(taskType));
101 104 receiptContainerHeader.setProjectNo(receiptDetail.getProjectNo());
102 105 receiptContainerHeader.setToLocation(locationCode);
... ... @@ -128,6 +131,11 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
128 131 receiptContainerDetailAdd(receiptContainerHeaders.get(0).getId(), receiptDetail, qty, containerCode, locationCode);
129 132 //如果单据数量等于已收数量，更新入库详情状态和入库单状态
130 133 if (receiptDetail.getTotalQty() == receiptDetail.getOpenQty()){
  134 + receiptDetail.setProcessStamp("200");
  135 + if (!receiptDetailService.updateById(receiptDetail)){
  136 + throw new ServiceException("更新入库详情处理标记失败");
  137 + }
  138 +
131 139 ReceiptDetail receiptDetail1 = receiptDetailService.queryflow(receiptDetail);
132 140 if (!receiptDetailService.updateById(receiptDetail1)){
133 141 throw new ServiceException("更新入库详情下一流程失败");
... ... @@ -182,7 +190,9 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
182 190 }
183 191 }
184 192 //删除入库组盘头表
185   - this.removeById(id);
  193 + if (!this.removeById(id)){
  194 + throw new ServiceException("删除入库组盘头表失败");
  195 + }
186 196 } else {
187 197 throw new ServiceException("已生成任务不允许取消");
188 198 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @54104a1
... ... @@ -137,7 +137,8 @@ public class ReceiptHeaderController extends BaseController {
137 137 @PostMapping("/edit")
138 138 @ResponseBody
139 139 public AjaxResult editSave(ReceiptHeader receiptHeader) {
140   - if (receiptHeader.getFirstStatus() >100 | receiptHeader.getLastStatus()>100){
  140 + ReceiptHeader receiptHeader1 = receiptHeaderService.getById(receiptHeader.getId());
  141 + if (receiptHeader1.getFirstStatus() >100 | receiptHeader1.getLastStatus()>100){
141 142 return AjaxResult.error("已进入订单池，不允许修改");
142 143 }
143 144 receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
... ... @@ -223,7 +224,7 @@ public class ReceiptHeaderController extends BaseController {
223 224 */
224 225 @ApiOperation(value="保存入库预约", notes="保存入库预约", httpMethod = "POST")
225 226 @RequiresPermissions("receipt:receiptHeader:reservation")
226   - @Log(title = "入库-入库单 ",operating = "入库单到货", action = BusinessType.UPDATE)
  227 + @Log(title = "入库-入库单 ",operating = "入库单预约", action = BusinessType.UPDATE)
227 228 @PostMapping("/arrival")
228 229 @ResponseBody
229 230 public AjaxResult reservation(ReceiptHeader receiptHeader) {
... ... @@ -287,4 +288,19 @@ public class ReceiptHeaderController extends BaseController {
287 288 }
288 289 return AjaxResult.success(receiptHeaderService.getById(id));
289 290 }
  291 +
  292 + /**
  293 + * 到货通知
  294 + */
  295 + @ApiOperation(value="到货通知 ", notes="到货通知 ", httpMethod = "POST")
  296 + @RequiresPermissions("receipt:receiptDetail:add")
  297 + @Log(title = "入库-入库单 ",operating = "到货通知 ", action = BusinessType.OTHER)
  298 + @PostMapping("/arrivalNotice")
  299 + @ResponseBody
  300 + public AjaxResult arrivalNotice(String id) {
  301 + if (StringUtils.isEmpty(id)){
  302 + return AjaxResult.success("");
  303 + }
  304 + return AjaxResult.success(receiptHeaderService.arrivalNotice(id));
  305 + }
290 306 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @54104a1
... ... @@ -15,6 +15,7 @@ import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
15 15 import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
16 16 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
17 17 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
  18 +import com.huaheng.pc.config.sendMail.service.SendMailService;
18 19 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
19 20 import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
20 21 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
... ... @@ -41,6 +42,8 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
41 42 private CheckHeaderService checkHeaderService;
42 43 @Resource
43 44 private CheckDetailService checkDetailService;
  45 + @Resource
  46 + private SendMailService sendMailService;
44 47  
45 48 /**
46 49 * 保存入库单
... ... @@ -223,4 +226,24 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
223 226 }
224 227 return AjaxResult.success("提交审核成功");
225 228 }
  229 +
  230 + /**
  231 + * 到货通知
  232 + * @param id
  233 + * @return
  234 + */
  235 + public AjaxResult arrivalNotice(String id){
  236 + LambdaQueryWrapper<ReceiptDetail> lambda = Wrappers.lambdaQuery();
  237 + lambda.eq(ReceiptDetail::getReceiptId, id);
  238 + List<ReceiptDetail> receiptDetails = receiptDetailService.list(lambda);
  239 + for (ReceiptDetail receiptDetail : receiptDetails) {
  240 + receiptDetail.setProcessStamp(String.valueOf(150));
  241 + receiptDetailService.updateById(receiptDetail);
  242 + if (!receiptDetailService.updateById(receiptDetailService.queryflow(receiptDetail))){
  243 + throw new ServiceException("更新入库明细处理标记出错");
  244 + }
  245 + receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
  246 + }
  247 + return AjaxResult.success("");
  248 + }
226 249 }
... ...
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
  View file @54104a1
1 1 package com.huaheng.pc.receipt.receiving.controller;
2 2  
3   -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4   -import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5   -import com.huaheng.common.utils.security.ShiroUtils;
6 3 import com.huaheng.framework.aspectj.lang.annotation.Log;
7 4 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
8 5 import com.huaheng.framework.web.controller.BaseController;
... ... @@ -10,8 +7,6 @@ import com.huaheng.framework.web.domain.AjaxResult;
10 7 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
11 8 import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
12 9 import com.huaheng.pc.receipt.receiving.service.ReceivingService;
13   -import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
14   -import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
15 10 import io.swagger.annotations.ApiOperation;
16 11 import io.swagger.annotations.ApiParam;
17 12 import org.apache.shiro.authz.annotation.RequiresPermissions;
... ...
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
  View file @54104a1
... ... @@ -182,16 +182,17 @@ public class ReceivingService {
182 182 throw new ServiceException("组盘已生成任务不能取消定位");
183 183 }
184 184 //将入库组盘头表中的而库位编码赋值null
185   - receiptContainerHeader.setToLocation(null);
  185 + receiptContainerHeader.setToLocation("");
186 186 if (!receiptContainerHeaderService.updateById(receiptContainerHeader)){
187 187 throw new ServiceException("回滚入库组盘头失败");
188 188 }
189 189  
  190 + //将入库组盘明细的库位修改为空
190 191 LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
191 192 lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerDetail.getReceiptContainerId());
192 193 List<ReceiptContainerDetail> receiptContainerDetailList = receiptContainerDetailService.list(lambdaQueryWrapper);
193 194 for (ReceiptContainerDetail receiptContainerDetail2 : receiptContainerDetailList) {
194   - receiptContainerDetail2.setLocationCode(null);
  195 + receiptContainerDetail2.setLocationCode("");
195 196 if (!receiptContainerDetailService.updateById(receiptContainerDetail2)){
196 197 throw new ServiceException("回滚入库组盘明细失败");
197 198 }
... ...
src/main/resources/mybatis/config/ContainerMapper.xml
  View file @54104a1
... ... @@ -52,4 +52,7 @@
52 52 UPDATE container set `status`=#{status}, locationCode=#{locationCode} WHERE warehouseCode=#{warehouseCode} AND `code`=#{containerCode}
53 53 </update>
54 54  
  55 + <select id="findAllByCode" resultMap="BaseResultMap" parameterType="java.lang.String">
  56 + SELECT * FROM container WHERE code = #{code,jdbcType=VARCHAR}
  57 + </select>
55 58 </mapper>
56 59 \ No newline at end of file
... ...
src/main/resources/templates/config/filterConfigHeader/add.html
  View file @54104a1
... ... @@ -5,14 +5,7 @@
5 5 <body class="white-bg">
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-filterConfigHeader-add">
8   - <div class="form-group">
9   - <label class="col-sm-3 control-label">模块：</label>
10   - <div class="col-sm-8">
11   - <select class="form-control" name="moduleType" th:with="moduleType=${@dict.getType('moduleType')}">
12   - <option th:each="item : ${moduleType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"></option>
13   - </select>
14   - </div>
15   - </div>
  8 + <input name="moduleType" th:field="${moduleType}" type="hidden">
16 9 <div class="form-group">
17 10 <label class="col-sm-3 control-label">类型：</label>
18 11 <div class="col-sm-8">
... ...
src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html
  View file @54104a1
... ... @@ -79,7 +79,7 @@
79 79 $(function() {
80 80 var options = {
81 81 url: prefix + "/list",
82   - createUrl: prefix + "/add",
  82 + createUrl: prefix + "/add/"+[[${moduleType}]],
83 83 updateUrl: prefix + "/edit/{id}",
84 84 removeUrl: prefix + "/remove",
85 85 modalName: "规则配置主表",
... ...
src/main/resources/templates/receipt/receiptHeader/edit.html
  View file @54104a1
... ... @@ -54,9 +54,6 @@
54 54 },
55 55 companyCode:{
56 56 required:true,
57   - },
58   - scheduledArriveDate:{
59   - required:true,
60 57 }
61 58 },
62 59 submitHandler: function(form) {
... ...
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
  View file @54104a1
... ... @@ -807,6 +807,12 @@
807 807 var data = { "id": id };
808 808 $.operate.submit(url, "post", "json", data);
809 809 }
  810 +
  811 + function arrivalNotice(id) {
  812 + var url = prefix+"/arrivalNotice";
  813 + var data = { "id": id };
  814 + $.operate.submit(url, "post", "json", data);
  815 + }
810 816 </script>
811 817 </body>
812 818 </html>
813 819 \ No newline at end of file
... ...
src/main/resources/templates/receipt/receiving/receiving.html
  View file @54104a1
... ... @@ -189,15 +189,11 @@
189 189 updateUrl: prefix + "/edit/{id}",
190 190 removeUrl: prefix + "/remove",
191 191 contentType: "application/x-www-form-urlencoded",
192   - // search: true, //搜索
193   - // showRefresh: true,//刷新
194   - // showToggle:true, //视图切换
195 192 clickToSelect: true,
196   - // showColumns:true, //列选择
197   - // detailView:true,
198   - // showExport: true, //导出
199   - // exportDataType: "all", //导出类型basic', 'all', 'selected'.当前页、所有数据、选中数据
200 193 modalName: "收货",
  194 + onRefresh: function(){
  195 +
  196 + },
201 197 columns: [
202 198 {
203 199 field:'work',
... ... @@ -367,6 +363,7 @@
367 363 }
368 364 localStorage.removeItem("receiving_code");
369 365 }
  366 +
370 367 receiving_refresh();
371 368  
372 369 function remove(id) {
... ... @@ -390,7 +387,18 @@
390 387 ids += ",";
391 388 }
392 389 var data = { "ids": ids };
393   - $.operate.submit(url, "post", "json", data);
  390 + $.modal.loading("正在处理中，请稍后...");
  391 + var config = {
  392 + url: url,
  393 + type: "post",
  394 + dataType: "json",
  395 + data: data,
  396 + success: function(result) {
  397 + $.operate.ajaxSuccess(result);
  398 + list_receiptInfo($("#code").val());
  399 + }
  400 + };
  401 + $.ajax(config)
394 402 }
395 403  
396 404 function cancelPositioning() {
... ... @@ -406,7 +414,20 @@
406 414 ids += ",";
407 415 }
408 416 var data = { "ids": ids };
409   - $.operate.submit(url, "post", "json", data);
  417 +
  418 + $.modal.loading("正在处理中，请稍后...");
  419 + var config = {
  420 + url: url,
  421 + type: "post",
  422 + dataType: "json",
  423 + data: data,
  424 + success: function(result) {
  425 + $.operate.ajaxSuccess(result);
  426 + list_receiptInfo($("#code").val());
  427 + }
  428 + };
  429 + $.ajax(config)
  430 +
410 431 }
411 432  
412 433 function batRemove() {
... ... @@ -418,11 +439,22 @@
418 439 var url = ctx+"receipt/receiptContainerDetail/remove";
419 440 var ids = "";
420 441 for (var i = 0; i<rows.length; i++){
421   - ids += rows[i].receiptContainerId;
  442 + ids += rows[i].id;
422 443 ids += ",";
423 444 }
424 445 var data = { "ids": ids };
425   - $.operate.submit(url, "post", "json", data);
  446 + var config = {
  447 + url: url,
  448 + type: "post",
  449 + dataType: "json",
  450 + data: data,
  451 + success: function(result) {
  452 + $.operate.ajaxSuccess(result);
  453 + list_receiptInfo($("#code").val());
  454 + list_select($("#code").val());
  455 + }
  456 + };
  457 + $.ajax(config)
426 458 }
427 459 </script>
428 460 </body>
... ...