Commit d44da4ed3c191a96086fc318c72c1442c2fb88c5
1 parent
ef9152a6
库存明细service 导包
Showing
3 changed files
with
13 additions
and
39 deletions
.idea/workspace.xml
| @@ -2,40 +2,8 @@ | @@ -2,40 +2,8 @@ | ||
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> | 4 | <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> |
| 5 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java" afterDir="false" /> | ||
| 6 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/domain/MaterialMultiple.java" afterDir="false" /> | ||
| 7 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/mapper/MaterialMultipleMapper.java" afterDir="false" /> | ||
| 8 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleService.java" afterDir="false" /> | ||
| 9 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleServiceImpl.java" afterDir="false" /> | ||
| 10 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java" afterDir="false" /> | ||
| 11 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/domain/MaterialUnit.java" afterDir="false" /> | ||
| 12 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitService.java" afterDir="false" /> | ||
| 13 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitServiceImpl.java" afterDir="false" /> | ||
| 14 | - <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMultipleMapper.xml" afterDir="false" /> | ||
| 15 | - <change beforePath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" afterDir="false" /> | ||
| 16 | - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||
| 17 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" /> | ||
| 18 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/domain/MaterialUnit.java" beforeDir="false" /> | ||
| 19 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/mapper/MaterialUnitMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialUnit/mapper/MaterialUnitMapper.java" afterDir="false" /> | ||
| 20 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java" beforeDir="false" /> | ||
| 21 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java" beforeDir="false" /> | ||
| 22 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" /> | ||
| 23 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" beforeDir="false" /> | ||
| 24 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java" afterDir="false" /> | 5 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" /> |
| 25 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" afterDir="false" /> | 6 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" afterDir="false" /> |
| 26 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" afterDir="false" /> | ||
| 27 | - <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" /> | ||
| 28 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" /> | ||
| 29 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java" afterDir="false" /> | ||
| 30 | - <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" /> | ||
| 31 | - <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" /> | ||
| 32 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" afterDir="false" /> | ||
| 33 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" afterDir="false" /> | ||
| 34 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" afterDir="false" /> | ||
| 35 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" afterDir="false" /> | ||
| 36 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialUnitMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialUnitMapper.xml" afterDir="false" /> | ||
| 37 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml" beforeDir="false" /> | ||
| 38 | - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" /> | ||
| 39 | </list> | 7 | </list> |
| 40 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 41 | <option name="SHOW_DIALOG" value="false" /> | 9 | <option name="SHOW_DIALOG" value="false" /> |
| @@ -229,7 +197,7 @@ | @@ -229,7 +197,7 @@ | ||
| 229 | <workItem from="1565833342181" duration="13946000" /> | 197 | <workItem from="1565833342181" duration="13946000" /> |
| 230 | <workItem from="1565936336169" duration="3845000" /> | 198 | <workItem from="1565936336169" duration="3845000" /> |
| 231 | <workItem from="1565941296716" duration="6217000" /> | 199 | <workItem from="1565941296716" duration="6217000" /> |
| 232 | - <workItem from="1566175534262" duration="11146000" /> | 200 | + <workItem from="1566175534262" duration="11506000" /> |
| 233 | </task> | 201 | </task> |
| 234 | <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> | 202 | <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> |
| 235 | <created>1565226427512</created> | 203 | <created>1565226427512</created> |
| @@ -329,7 +297,14 @@ | @@ -329,7 +297,14 @@ | ||
| 329 | <option name="project" value="LOCAL" /> | 297 | <option name="project" value="LOCAL" /> |
| 330 | <updated>1566176469173</updated> | 298 | <updated>1566176469173</updated> |
| 331 | </task> | 299 | </task> |
| 332 | - <option name="localTasksCounter" value="15" /> | 300 | + <task id="LOCAL-00015" summary="添加物料单位，重新生成库存主表和库存明细表"> |
| 301 | + <created>1566192821310</created> | ||
| 302 | + <option name="number" value="00015" /> | ||
| 303 | + <option name="presentableId" value="LOCAL-00015" /> | ||
| 304 | + <option name="project" value="LOCAL" /> | ||
| 305 | + <updated>1566192821310</updated> | ||
| 306 | + </task> | ||
| 307 | + <option name="localTasksCounter" value="16" /> | ||
| 333 | <servers /> | 308 | <servers /> |
| 334 | </component> | 309 | </component> |
| 335 | <component name="TypeScriptGeneratedFilesManager"> | 310 | <component name="TypeScriptGeneratedFilesManager"> |
| @@ -377,7 +352,8 @@ | @@ -377,7 +352,8 @@ | ||
| 377 | <MESSAGE value="添加承运商" /> | 352 | <MESSAGE value="添加承运商" /> |
| 378 | <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" /> | 353 | <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" /> |
| 379 | <MESSAGE value="添加仓库配置" /> | 354 | <MESSAGE value="添加仓库配置" /> |
| 380 | - <option name="LAST_COMMIT_MESSAGE" value="添加仓库配置" /> | 355 | + <MESSAGE value="添加物料单位，重新生成库存主表和库存明细表" /> |
| 356 | + <option name="LAST_COMMIT_MESSAGE" value="添加物料单位，重新生成库存主表和库存明细表" /> | ||
| 381 | </component> | 357 | </component> |
| 382 | <component name="XDebuggerManager"> | 358 | <component name="XDebuggerManager"> |
| 383 | <breakpoint-manager> | 359 | <breakpoint-manager> |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
| @@ -9,16 +9,13 @@ import com.huaheng.common.utils.security.ShiroUtils; | @@ -9,16 +9,13 @@ import com.huaheng.common.utils.security.ShiroUtils; | ||
| 9 | import com.huaheng.framework.aspectj.lang.annotation.Log; | 9 | import com.huaheng.framework.aspectj.lang.annotation.Log; |
| 10 | import com.huaheng.framework.aspectj.lang.constant.BusinessType; | 10 | import com.huaheng.framework.aspectj.lang.constant.BusinessType; |
| 11 | import com.huaheng.framework.web.controller.BaseController; | 11 | import com.huaheng.framework.web.controller.BaseController; |
| 12 | -import com.huaheng.framework.web.domain.AjaxResult; | ||
| 13 | import com.huaheng.framework.web.page.PageDomain; | 12 | import com.huaheng.framework.web.page.PageDomain; |
| 14 | import com.huaheng.framework.web.page.TableDataInfo; | 13 | import com.huaheng.framework.web.page.TableDataInfo; |
| 15 | import com.huaheng.framework.web.page.TableSupport; | 14 | import com.huaheng.framework.web.page.TableSupport; |
| 16 | import com.huaheng.pc.general.material.service.MaterialServiceImpl; | 15 | import com.huaheng.pc.general.material.service.MaterialServiceImpl; |
| 17 | import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | 16 | import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; |
| 18 | import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; | 17 | import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; |
| 19 | -import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; | ||
| 20 | import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; | 18 | import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; |
| 21 | -import org.apache.shiro.authz.annotation.RequiresPermissions; | ||
| 22 | import org.springframework.stereotype.Controller; | 19 | import org.springframework.stereotype.Controller; |
| 23 | import org.springframework.web.bind.annotation.GetMapping; | 20 | import org.springframework.web.bind.annotation.GetMapping; |
| 24 | import org.springframework.web.bind.annotation.PostMapping; | 21 | import org.springframework.web.bind.annotation.PostMapping; |
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java
| 1 | package com.huaheng.pc.inventory.inventoryDetail.service; | 1 | package com.huaheng.pc.inventory.inventoryDetail.service; |
| 2 | 2 | ||
| 3 | import com.baomidou.mybatisplus.extension.service.IService; | 3 | import com.baomidou.mybatisplus.extension.service.IService; |
| 4 | +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; | ||
| 4 | 5 | ||
| 5 | public interface InventoryDetailService extends IService<InventoryDetail> { | 6 | public interface InventoryDetailService extends IService<InventoryDetail> { |
| 6 | 7 |