diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java new file mode 100644 index 00000000..e9111005 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java @@ -0,0 +1,36 @@ +package com.bonus.sgzb.material.controller; + +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import com.bonus.sgzb.material.domain.PutInStorageBean; +import com.bonus.sgzb.material.service.InventoryAndWarehousingService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:28 +*/ +@Api(tags = " 入库盘点") +@RestController +@RequestMapping("/inventoryAndWarehousing") +public class InventoryAndWarehousingController extends BaseController { + @Autowired + private InventoryAndWarehousingService inventoryAndWarehousingService; + + /** + * 查询入库盘点列表 + */ + @ApiOperation(value = "获取入库盘点列表") + @GetMapping("/getList") + public TableDataInfo getList(PutInStorageBean bean) { + startPage(); + List list = inventoryAndWarehousingService.getList(bean); + return getDataTable(list); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java new file mode 100644 index 00000000..b240ee45 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PutInStorageBean.java @@ -0,0 +1,88 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 16:30 +*/ +@Data +public class PutInStorageBean extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + @ApiModelProperty(value = "id") + private Integer id; + + /** 入库形式 */ + @ApiModelProperty(value = "入库形式") + private String putInType; + + /** 入库数量 */ + @ApiModelProperty(value = "入库数量") + private BigDecimal num; + + /** 创建者 */ + @ApiModelProperty(value = "创建者") + private Integer creator; + + /** 入库人 */ + @ApiModelProperty(value = "入库人") + private String userName; + + /** 盘点入库单号 */ + @ApiModelProperty(value = "盘点入库单号") + private String code; + + /** 单位ID */ + @ApiModelProperty(value = "单位ID") + private String unitId; + + /** 单位名称 */ + @ApiModelProperty(value = "单位名称") + private String unitName; + + /** 工程ID */ + @ApiModelProperty(value = "工程ID") + private String projectId; + + /** 工程名称 */ + @ApiModelProperty(value = "工程名称") + private String projectName; + + /** 创建日期 */ + @ApiModelProperty(value = "创建日期") + private String createDate; + + /** 备注 */ + @ApiModelProperty(value = "备注") + private String remarks; + + + /** 主信息 */ + @ApiModelProperty(value = "主信息") + private Integer info; + + /** 库房 */ + @ApiModelProperty(value = "库房") + private Integer ram; + + /** 设备工器具类型 */ + @ApiModelProperty(value = "设备工器具类型") + private Integer type; + + /** 设备工器具类型名称 */ + @ApiModelProperty(value = "设备工器具类型名称") + private String typeName; + + /** 设备主键 */ + @ApiModelProperty(value = "设备主键") + private Integer machine; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java new file mode 100644 index 00000000..1b0a8047 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java @@ -0,0 +1,23 @@ +package com.bonus.sgzb.material.mapper; + +import com.bonus.sgzb.material.domain.PutInStorageBean; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:33 +*/ +@Mapper +public interface InventoryAndWarehousingMapper { + + /** + * 查询入库盘点列表 + * @param bean + * @return 结果 + */ + List getList(PutInStorageBean bean); + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java new file mode 100644 index 00000000..1f4eab8c --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InventoryAndWarehousingService.java @@ -0,0 +1,21 @@ +package com.bonus.sgzb.material.service; + + +import com.bonus.sgzb.material.domain.PutInStorageBean; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:31 +*/ +public interface InventoryAndWarehousingService { + + /** + * 查询入库盘点列表 + * @param bean + * @return 结果 + */ + List getList(PutInStorageBean bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java new file mode 100644 index 00000000..974a1d22 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java @@ -0,0 +1,26 @@ +package com.bonus.sgzb.material.service.impl; + +import com.bonus.sgzb.material.domain.PutInStorageBean; +import com.bonus.sgzb.material.mapper.InventoryAndWarehousingMapper; +import com.bonus.sgzb.material.service.InventoryAndWarehousingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** +* @description 入库盘点 +* @author hay +* @date 2024/3/27 13:32 +*/ +@Service +public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousingService { + + @Autowired + private InventoryAndWarehousingMapper inventoryAndWarehousingMapper; + + @Override + public List getList(PutInStorageBean bean) { + return inventoryAndWarehousingMapper.getList(bean); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml new file mode 100644 index 00000000..3f06814d --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file