diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java index 3d17bcc..a172083 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java @@ -1,13 +1,16 @@ package com.bonus.canteen.core.ims.controller; import java.util.List; +import java.util.Objects; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import com.bonus.canteen.core.ims.domain.ImsIntoInventoryDetail; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryAdd; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryQuery; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryUpdate; import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryVO; +import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -54,6 +57,23 @@ public class ImsIntoInventoryController extends BaseController return getDataTable(list); } + /** + * 查询入库货品记录按照仓库编号 + */ + @ApiOperation(value = "查询入库货品记录按照仓库编号") + //@RequiresPermissions("ims:inventory:list") + @PostMapping("/warehouse/materials") + public TableDataInfo selectDetailListByWarehouseIdAndMaterialId(@RequestBody ImsIntoInventoryQuery imsIntoInventoryQuery) + { + if(Objects.isNull(imsIntoInventoryQuery.getMaterialId()) || Objects.isNull(imsIntoInventoryQuery.getWarehouseId())) { + throw new ServiceException("参数错误"); + } + startPage(); + List list = imsIntoInventoryService. + selectDetailListByWarehouseIdAndMaterialId(imsIntoInventoryQuery); + return getDataTable(list); + } + /** * 导出入库记录列表 */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java index 64121b6..3a8de92 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsInventoryController.java @@ -75,7 +75,7 @@ public class ImsInventoryController extends BaseController @ApiOperation(value = "获取库存详细信息") //@RequiresPermissions("ims:inventory:query") @GetMapping(value = "/{inventoryId}") - public AjaxResult getInfo(@PathVariable("inventoryId") Long inventoryId) + public AjaxResult getInfoByInventoryId(@PathVariable("inventoryId") Long inventoryId) { return success(imsInventoryService.selectImsInventoryByInventoryId(inventoryId)); } @@ -83,20 +83,20 @@ public class ImsInventoryController extends BaseController /** * 新增库存 */ - @ApiOperation(value = "新增库存") - //@PreventRepeatSubmit - //@RequiresPermissions("ims:inventory:add") - @SysLog(title = "库存", businessType = OperaType.INSERT, logType = 1,module = "库存->新增库存") - @PostMapping - public AjaxResult add(@RequestBody ImsInventoryAdd imsInventoryAdd) - { - try { - imsInventoryService.insertImsInventory(imsInventoryAdd); - }catch (Exception e) { - return AjaxResult.error(e.getMessage()); - } - return AjaxResult.success(); - } +// @ApiOperation(value = "新增库存") +// //@PreventRepeatSubmit +// //@RequiresPermissions("ims:inventory:add") +// @SysLog(title = "库存", businessType = OperaType.INSERT, logType = 1,module = "库存->新增库存") +// @PostMapping +// public AjaxResult add(@RequestBody ImsInventoryAdd imsInventoryAdd) +// { +// try { +// imsInventoryService.insertImsInventory(imsInventoryAdd); +// }catch (Exception e) { +// return AjaxResult.error(e.getMessage()); +// } +// return AjaxResult.success(); +// } /** * 修改库存 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventory.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventory.java index 080206a..1a82778 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventory.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventory.java @@ -106,6 +106,9 @@ public class ImsIntoInventory extends BaseEntity @Excel(name = "区域ID") private Long areaId; + @ApiModelProperty(value = "原料id") + private Long materialId; + @ApiModelProperty("开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startDateTime; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventoryDetail.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventoryDetail.java index 596fb2c..632bd52 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventoryDetail.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsIntoInventoryDetail.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.ToString; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; + import com.fasterxml.jackson.annotation.JsonFormat; /** @@ -152,4 +154,13 @@ public class ImsIntoInventoryDetail extends BaseEntity @Excel(name = "货品编码") private String materialCode; + @ApiModelProperty(value = "仓库名称") + @Excel(name = "仓库名称") + private String warehouseName; + + @ApiModelProperty(value = "入库时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime intoDate; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsInventory.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsInventory.java index ec5c4d8..3817a55 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsInventory.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsInventory.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; @@ -110,4 +111,7 @@ public class ImsInventory extends BaseEntity @ApiModelProperty(value = "货品编码") @Excel(name = "货品编码") private String materialCode; + + @ApiModelProperty(value = "货品名称") + private List materialTypeIds; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryQuery.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryQuery.java index 6f33ad4..1c8773c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryQuery.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsIntoInventoryQuery.java @@ -8,6 +8,8 @@ import java.io.Serializable; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; + +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -88,4 +90,7 @@ public class ImsIntoInventoryQuery implements Serializable @ApiModelProperty(value = "区域id") private Long areaId; + + @ApiModelProperty(value = "原料id") + private Long materialId; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsInventoryQuery.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsInventoryQuery.java index 55a2995..5b21fbc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsInventoryQuery.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/ImsInventoryQuery.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; -import java.io.Serializable; +import java.util.List; import java.time.LocalDateTime; /** @@ -63,4 +63,13 @@ public class ImsInventoryQuery implements Serializable @ApiModelProperty(value = "区域id") private Long areaId; + + @ApiModelProperty(value = "货品名称") + private String materialName; + + @ApiModelProperty(value = "货品编码") + private String materialCode; + + @ApiModelProperty(value = "货品名称") + private List materialTypeIds; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/ImsIntoInventoryDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/ImsIntoInventoryDetailVO.java index 488c84b..d2f6d28 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/ImsIntoInventoryDetailVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/ImsIntoInventoryDetailVO.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.ToString; import java.math.BigDecimal; import java.time.LocalDate; +import java.time.LocalDateTime; + import com.fasterxml.jackson.annotation.JsonFormat; /** @@ -149,4 +151,13 @@ public class ImsIntoInventoryDetailVO extends BaseEntity @Excel(name = "货品编码") private String materialCode; + @ApiModelProperty(value = "仓库名称") + @Excel(name = "仓库名称") + private String warehouseName; + + @ApiModelProperty(value = "入库时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime intoDate; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java index 0fe8165..248095b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java @@ -91,4 +91,6 @@ public interface ImsIntoInventoryMapper { public int updateIntoInventoryNum(@Param("intoDetailId") Long intoDetailId, @Param("fetchNum") BigDecimal fetchNum); public ImsIntoInventoryDetail selectImsIntoInventoryDetailListByIntoDetailId(@Param("intoDetailId") Long intoDetailId); + + public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventory imsIntoInventory); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java index cc848b1..87243d8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java @@ -2,10 +2,12 @@ package com.bonus.canteen.core.ims.service; import java.util.List; import com.bonus.canteen.core.ims.domain.ImsIntoInventory; +import com.bonus.canteen.core.ims.domain.ImsIntoInventoryDetail; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryAdd; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryQuery; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryUpdate; import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryVO; +import org.apache.ibatis.annotations.Param; /** * 入库记录Service接口 @@ -62,4 +64,6 @@ public interface IImsIntoInventoryService * @return 结果 */ public int deleteImsIntoInventoryByIntoId(Long intoId); + + public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventoryQuery imsIntoInventoryQuery); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java index cee1000..c477f54 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.ims.service.impl; import java.math.BigDecimal; +import java.util.Collections; import java.util.List; import cn.hutool.core.collection.CollUtil; @@ -168,6 +169,13 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService return imsIntoInventoryMapper.deleteImsIntoInventoryByIntoId(intoId); } + @Override + public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventoryQuery imsIntoInventoryQuery) { + ImsIntoInventory imsIntoInventory = new ImsIntoInventory(); + BeanUtils.copyProperties(imsIntoInventoryQuery, imsIntoInventory); + return imsIntoInventoryMapper.selectDetailListByWarehouseIdAndMaterialId(imsIntoInventory); + } + /** * 新增入库记录明细信息 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml index 44d482a..0f770fe 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml @@ -67,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -172,6 +174,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by iii.into_date + +