diff --git a/.idea/workspace.xml b/.idea/workspace.xml index eeefb65..318cd05 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,13 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> - <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" /> - <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" /> + <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" /> + <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" /> + <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" /> + <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" /> + <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" /> + <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" /> + <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" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -197,7 +202,7 @@ <workItem from="1565833342181" duration="13946000" /> <workItem from="1565936336169" duration="3845000" /> <workItem from="1565941296716" duration="6217000" /> - <workItem from="1566175534262" duration="11506000" /> + <workItem from="1566175534262" duration="11810000" /> </task> <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> <created>1565226427512</created> @@ -304,7 +309,14 @@ <option name="project" value="LOCAL" /> <updated>1566192821310</updated> </task> - <option name="localTasksCounter" value="16" /> + <task id="LOCAL-00016" summary="库存明细service 导包"> + <created>1566193184820</created> + <option name="number" value="00016" /> + <option name="presentableId" value="LOCAL-00016" /> + <option name="project" value="LOCAL" /> + <updated>1566193184820</updated> + </task> + <option name="localTasksCounter" value="17" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -353,7 +365,8 @@ <MESSAGE value="添加物料导入、导出模板,添加Excel导入导出配置文件" /> <MESSAGE value="添加仓库配置" /> <MESSAGE value="添加物料单位,重新生成库存主表和库存明细表" /> - <option name="LAST_COMMIT_MESSAGE" value="添加物料单位,重新生成库存主表和库存明细表" /> + <MESSAGE value="库存明细service 导包" /> + <option name="LAST_COMMIT_MESSAGE" value="库存明细service 导包" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> diff --git a/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java b/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java index c095058..0583595 100644 --- a/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java +++ b/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java @@ -17,6 +17,7 @@ import com.huaheng.framework.web.page.TableSupport; import com.huaheng.pc.general.company.service.CompanyService; import com.huaheng.pc.general.warehouse.service.WarehouseService; import com.huaheng.pc.general.warehouse.domain.Warehouse; +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService; import com.huaheng.pc.system.dict.service.IDictDataService; import com.huaheng.pc.system.dict.service.IDictTypeService; diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java index f4efd21..acf051d 100644 --- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java +++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.huaheng.pc.inventory.inventoryDetail.service; +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.huaheng.pc.inventory.inventoryDetail.mapper.InventoryDetailMapper; diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java index 59f2e1a..235e175 100644 --- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java +++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java @@ -1,6 +1,7 @@ package com.huaheng.pc.inventory.inventoryHeader.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java index 01ffd9b..001d882 100644 --- a/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java +++ b/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java @@ -1,5 +1,6 @@ package com.huaheng.pc.inventory.inventoryHeader.service; +import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper; diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java index 6f40849..d716247 100644 --- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java +++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java @@ -9,6 +9,7 @@ import com.huaheng.pc.general.location.domain.Location; import com.huaheng.pc.general.location.service.LocationService; import com.huaheng.pc.general.material.domain.Material; import com.huaheng.pc.general.material.service.MaterialService; +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService; import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail; import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService; diff --git a/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java b/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java index 834263c..5823af4 100644 --- a/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java +++ b/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java @@ -1,6 +1,7 @@ package com.huaheng.pc.shipment.shippingCombination.mapper; +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch; import java.util.List; diff --git a/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java b/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java index 1f59115..fba8f25 100644 --- a/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java +++ b/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java @@ -1,6 +1,7 @@ package com.huaheng.pc.shipment.shippingCombination.service; +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail; import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch; import com.huaheng.pc.shipment.shippingCombination.mapper.ShippingCombinationMapper; import org.springframework.stereotype.Service;