bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

业务代码提交

This commit is contained in:
dingjie 2023-12-10 17:35:50 +08:00
parent e7eb563f81
commit b86632443c
46 changed files with 1022 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java
View File

@ -1,16 +1,19 @@
package com.bonus.sgzb.system.api.domain;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.annotation.Excel.ColumnType;
import com.bonus.sgzb.common.core.annotation.Excel.Type;
import com.bonus.sgzb.common.core.annotation.Excels;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import com.bonus.sgzb.common.core.xss.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
/**
* 用户对象 sys_user
@ -89,6 +92,9 @@ public class SysUser extends BaseEntity
/** 角色ID */
private Long roleId;
/** 所属组织id */
private Long companyId;
public SysUser()
{
@ -296,6 +302,15 @@ public class SysUser extends BaseEntity
{
this.roleId = roleId;
}
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -318,6 +333,7 @@ public class SysUser extends BaseEntity
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
.append("companyId", getCompanyId())
.toString();
}
}

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java
View File

@ -2,25 +2,22 @@ package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.BmProjectInfo;
import com.bonus.sgzb.base.domain.BmUnitInfo;
import com.bonus.sgzb.base.service.BmProjectInfoService;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.bonus.sgzb.common.log.annotation.Log;
import java.util.List;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 基础管理 工程项目

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java
View File

@ -10,10 +10,7 @@ import com.bonus.sgzb.common.log.annotation.Log;
import com.bonus.sgzb.common.log.enums.BusinessType;
import com.bonus.sgzb.common.security.annotation.RequiresPermissions;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.system.api.domain.SysUser;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java
View File

@ -7,7 +7,6 @@ import com.bonus.sgzb.base.service.BmUnitPersonService;
import com.bonus.sgzb.base.service.DeptService;
import com.bonus.sgzb.common.core.constant.SecurityConstants;
import com.bonus.sgzb.common.core.domain.R;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;

16
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java
View File

@ -1,11 +1,11 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.service.IhouseService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.service.IhouseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -37,17 +37,15 @@ public class MaHouseController extends BaseController {
}
/**
* 查询仓库列表
* 查询仓库组织树列表
* @param house
* @return
*/
@ApiOperation(value = "查询仓库货架列表")
@GetMapping("/tree")
public TableDataInfo tree(MaHouse house)
@ApiOperation(value = "查询仓库组织树列表")
@GetMapping("/houseTree")
public AjaxResult tree(MaHouse house)
{
startPage();
List<MaHouse> list = houseService.getHouseTree(house);
return getDataTable(list);
return success(houseService.getHouseTree(house));
}
/**

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java
View File

@ -1,10 +1,10 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaHouseSet;
import com.bonus.sgzb.base.service.MaHouseSetService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.domain.MaHouseSet;
import com.bonus.sgzb.base.service.MaHouseSetService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -51,10 +51,10 @@ public class MaHouseSetController extends BaseController {
/**
* 删除仓库货架配置
*/
@DeleteMapping("/{houseId}")
public AjaxResult remove(@PathVariable Long houseId)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long id)
{
maHouseSetService.deleteHouseSetById(houseId);
maHouseSetService.deleteHouseSetById(id);
return success();
}
/**

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java
View File

@ -1,11 +1,11 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaHouseShel;
import com.bonus.sgzb.base.service.MaHouseShelService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.domain.MaHouseShel;
import com.bonus.sgzb.base.service.MaHouseShelService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java
View File

@ -1,12 +1,12 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.service.IMaLabelBindService;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.service.IMaLabelBindService;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

25
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java
View File

@ -1,10 +1,12 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaMachine;
import com.bonus.sgzb.base.service.MaMachineService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.domain.MaMachine;
import com.bonus.sgzb.base.service.MaMachineService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -15,6 +17,7 @@ import java.util.List;
* 机具设备管理
*/
@RestController
@Api(tags = "机具设备管理")
@RequestMapping("/machine")
public class MaMachineController extends BaseController {
@ -24,8 +27,9 @@ public class MaMachineController extends BaseController {
/**
* 根据条件进行查询机具设备管理
*/
@PostMapping("/getMachine")
public TableDataInfo getMaMachine(@Validated @RequestBody MaMachine maMachine)
@ApiOperation(value = "根据条件进行查询机具设备管理")
@GetMapping("/getMachine")
public TableDataInfo getMaMachine(MaMachine maMachine)
{
startPage();
List<MaMachine> list = maMachineService.getMaMachine(maMachine);
@ -35,6 +39,7 @@ public class MaMachineController extends BaseController {
/**
* 新增机具设备管理
*/
@ApiOperation(value = "新增机具设备管理")
@PostMapping
public AjaxResult maMachineAdd(@Validated @RequestBody MaMachine maMachine)
{
@ -44,6 +49,7 @@ public class MaMachineController extends BaseController {
/**
* 删除机具设备管理
*/
@ApiOperation(value = "删除机具设备管理")
@DeleteMapping("/{maIds}")
public AjaxResult remove(@PathVariable Long[] maIds)
{
@ -54,10 +60,21 @@ public class MaMachineController extends BaseController {
/**
* 修改机具设备管理
*/
@ApiOperation(value = "修改机具设备管理")
@PutMapping
public AjaxResult edit(@Validated @RequestBody MaMachine maMachine)
{
return toAjax(maMachineService.updateMaMachine(maMachine));
}
/**
* 获取机具设备管理ma_machine详细信息
*/
@ApiOperation(value = "获取机具设备管理详细信息")
@GetMapping(value = "/{maId}")
public AjaxResult getInfo(@PathVariable("maId") Long maId)
{
return success(maMachineService.selectMaMachineByMaId(maId));
}
}

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java
View File

@ -1,12 +1,12 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaPartType;
import com.bonus.sgzb.base.service.IPartTypeService;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.domain.MaPartType;
import com.bonus.sgzb.base.service.IPartTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java
View File

@ -1,12 +1,12 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaPropInfo;
import com.bonus.sgzb.base.service.IMaPropInfoService;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.base.domain.MaPropInfo;
import com.bonus.sgzb.base.service.IMaPropInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

94
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java Normal file
View File

@ -0,0 +1,94 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaSupplierInfo;
import com.bonus.sgzb.base.service.IMaSupplierInfoService;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 供应商管理
*
* @author bonus
* @date 2023-12-10
*/
@RestController
@Api(tags = "供应商管理")
@RequestMapping("/supplierInfo")
public class MaSupplierInfoController extends BaseController
{
@Autowired
private IMaSupplierInfoService maSupplierInfoService;
/**
* 查询供应商管理列表
*/
@ApiOperation(value = "查询供应商管理列表")
@GetMapping("/list")
public TableDataInfo list(MaSupplierInfo maSupplierInfo)
{
startPage();
List<MaSupplierInfo> list = maSupplierInfoService.selectMaSupplierInfoList(maSupplierInfo);
return getDataTable(list);
}
/**
* 导出供应商管理列表
*/
@ApiOperation(value = "导出查询供应商管理列表")
@PostMapping("/export")
public void export(HttpServletResponse response, MaSupplierInfo maSupplierInfo)
{
List<MaSupplierInfo> list = maSupplierInfoService.selectMaSupplierInfoList(maSupplierInfo);
ExcelUtil<MaSupplierInfo> util = new ExcelUtil<MaSupplierInfo>(MaSupplierInfo.class);
util.exportExcel(response, list, "供应商管理数据");
}
/**
* 获取供应商管理详细信息
*/
@ApiOperation(value = "获取供应商管理详细信息")
@GetMapping(value = "/{supplierId}")
public AjaxResult getInfo(@PathVariable("supplierId") Long supplierId)
{
return success(maSupplierInfoService.selectMaSupplierInfoBySupplierId(supplierId));
}
/**
* 新增供应商管理
*/
@ApiOperation(value = "新增供应商管理")
@PostMapping
public AjaxResult add(@RequestBody MaSupplierInfo maSupplierInfo)
{
return toAjax(maSupplierInfoService.insertMaSupplierInfo(maSupplierInfo));
}
/**
* 修改供应商管理
*/
@ApiOperation(value = "修改供应商管理")
@PutMapping
public AjaxResult edit(@RequestBody MaSupplierInfo maSupplierInfo)
{
return toAjax(maSupplierInfoService.updateMaSupplierInfo(maSupplierInfo));
}
/**
* 删除供应商管理
*/
@ApiOperation(value = "删除供应商管理")
@DeleteMapping("/{supplierIds}")
public AjaxResult remove(@PathVariable Long[] supplierIds)
{
return toAjax(maSupplierInfoService.deleteMaSupplierInfoBySupplierIds(supplierIds));
}
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
View File

@ -1,9 +1,9 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.service.ITypeService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.service.ITypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java
View File

@ -1,11 +1,11 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaTypeHisNum;
import com.bonus.sgzb.base.service.MaTypeHisNumService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.domain.MaTypeHisNum;
import com.bonus.sgzb.base.service.MaTypeHisNumService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java
View File

@ -1,11 +1,11 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.domain.MaTypeHisPrice;
import com.bonus.sgzb.base.service.MaTypeHisPriceService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.domain.MaTypeHisPrice;
import com.bonus.sgzb.base.service.MaTypeHisPriceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java
View File

@ -1,9 +1,9 @@
package com.bonus.sgzb.base.controller;
import com.bonus.sgzb.base.service.IMaTypeKeeperService;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.core.web.page.TableDataInfo;
import com.bonus.sgzb.base.service.IMaTypeKeeperService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java
View File

@ -132,11 +132,11 @@ public class BmProjectInfo {
}
public java.sql.Timestamp getCreateTime() {
public Timestamp getCreateTime() {
return createTime;
}
public void setCreateTime(java.sql.Timestamp createTime) {
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
@ -150,11 +150,11 @@ public class BmProjectInfo {
}
public java.sql.Timestamp getUpdateTime() {
public Timestamp getUpdateTime() {
return updateTime;
}
public void setUpdateTime(java.sql.Timestamp updateTime) {
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java
View File

@ -131,11 +131,11 @@ public class BmUnitInfo {
}
public java.sql.Timestamp getCreateTime() {
public Timestamp getCreateTime() {
return createTime;
}
public void setCreateTime(java.sql.Timestamp createTime) {
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
@ -149,11 +149,11 @@ public class BmUnitInfo {
}
public java.sql.Timestamp getUpdateTime() {
public Timestamp getUpdateTime() {
return updateTime;
}
public void setUpdateTime(java.sql.Timestamp updateTime) {
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitType.java
View File

@ -62,11 +62,11 @@ public class BmUnitType {
}
public java.sql.Timestamp getCreateTime() {
public Timestamp getCreateTime() {
return createTime;
}
public void setCreateTime(java.sql.Timestamp createTime) {
public void setCreateTime(Timestamp createTime) {
this.createTime = createTime;
}
@ -80,11 +80,11 @@ public class BmUnitType {
}
public java.sql.Timestamp getUpdateTime() {
public Timestamp getUpdateTime() {
return updateTime;
}
public void setUpdateTime(java.sql.Timestamp updateTime) {
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}

13
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java
View File

@ -1,9 +1,9 @@
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -64,6 +64,9 @@ public class MaHouse extends BaseEntity {
@ApiModelProperty(value= "排序")
private int sort;
/** 子部门 */
private List<MaHouse> children = new ArrayList<MaHouse>();
public Long getHouseId() {
return houseId;
}
@ -177,4 +180,12 @@ public class MaHouse extends BaseEntity {
public void setSort(int sort) {
this.sort = sort;
}
public List<MaHouse> getChildren() {
return children;
}
public void setChildren(List<MaHouse> children) {
this.children = children;
}
}

24
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java
View File

@ -1,13 +1,16 @@
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="com.bonus.sgzb.base.domain.MaHouseSet")
public class MaHouseSet {
/**
* 主键Id
*/
@ApiModelProperty(value="主键Id")
private long id; /**
* 仓库ID
*/
@ApiModelProperty(value="仓库ID")
@ -66,12 +69,24 @@ public class MaHouseSet {
*/
@ApiModelProperty(value= "备注")
private String remark;
/**
* 备注
*/
@ApiModelProperty(value= "货架编号")
private String shelfNum;
/**
* 数据所属组织
*/
@ApiModelProperty(value= "数据所属组织")
private String companyId;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public long getHouseId() {
return houseId;
@ -189,4 +204,11 @@ public class MaHouseSet {
this.companyId = companyId;
}
public String getShelfNum() {
return shelfNum;
}
public void setShelfNum(String shelfNum) {
this.shelfNum = shelfNum;
}
}

29
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java
View File

@ -1,94 +1,121 @@
package com.bonus.sgzb.base.domain;
public class MaMachine {
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(value="com.bonus.sgzb.base.domain.MaMachine")
public class MaMachine extends BaseEntity {
/**
* 机具ID
*/
@ApiModelProperty(value = "机具ID")
private long maId;
/**
* 类型ID
*/
@ApiModelProperty(value = "类型ID")
private long typeId;
/**
* 机具编号
*/
@ApiModelProperty(value = "机具编号")
private String maCode;
/**
* 原编号
*/
@ApiModelProperty(value = "原编号")
private String preCode;
/**
* 机具状态（数据字典）
*/
@ApiModelProperty(value = "机具状态（数据字典）")
private String maStatus;
/**
* 二维码
*/
@ApiModelProperty(value = "二维码")
private String qrCode;
/**
* 购置价
*/
@ApiModelProperty(value = "购置价")
private String buyPrice;
/**
* 厂家
*/
@ApiModelProperty(value = "厂家")
private String maVender;
/**
* 出厂日期
*/
@ApiModelProperty(value = "出厂日期")
private String outFacTime;
/**
* 出厂编号
*/
@ApiModelProperty(value = "出厂编号")
private String outFacCode;
/**
* 固定资产编号
*/
@ApiModelProperty(value = "固定资产编号")
private String assetsCode;
/**
* 本次检验人
*/
@ApiModelProperty(value = "本次检验人")
private String checkMan;
/**
* 本次检验日期
*/
@ApiModelProperty(value = "本次检验日期")
private String thisCheckTime;
/**
* 下次检验日期
*/
@ApiModelProperty(value = "下次检验日期")
private String nextCheckTime;
/**
* gps编号
*/
@ApiModelProperty(value = "gps编号")
private String gpsCode;
/**
* rfid编号
*/
@ApiModelProperty(value = "rfid编号")
private String rfidCode;
/**
* erp编号
*/
@ApiModelProperty(value = "erp编号")
private String erpCode;
/**
* 调拨编号
*/
@ApiModelProperty(value = "调拨编号")
private String transferCode;
/**
* 出入库次数
*/
@ApiModelProperty(value = "出入库次数")
private String inOutNum;
/**
* 购置批次
*/
@ApiModelProperty(value = "购置批次")
private String buyTask;
/**
* 所在仓库
*/
@ApiModelProperty(value = "所在仓库")
private String ownHouse;
/**
* 数据所属组织
*/
@ApiModelProperty(value = "数据所属组织")
private String companyId;

185
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaSupplierInfo.java Normal file
View File

@ -0,0 +1,185 @@
package com.bonus.sgzb.base.domain;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 供应商管理ma_supplier_info对象 ma_supplier_info
*
* @author bonus
* @date 2023-12-10
*/
@ApiModel(value="com.bonus.sgzb.base.domain.MaSupplierInfo")
public class MaSupplierInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 仓库ID */
@ApiModelProperty(value = "主键id")
private Long supplierId;
/** 名称 */
@ApiModelProperty(value = "名称")
private String supplier;
/** 地址 */
@ApiModelProperty(value = "地址")
private String address;
/** 法人代表 */
@ApiModelProperty(value = "法人代表")
private String legalPerson;
/** 主要联系人 */
@ApiModelProperty(value = "主要联系人")
private String primaryContact;
/** 联系方式 */
@ApiModelProperty(value = "联系方式")
private String phone;
/** 经营范围 */
@ApiModelProperty(value = "经营范围")
private String businessScope;
/** 营业执照 */
@ApiModelProperty(value = "营业执照")
private String businessLicense;
/** 删除标志（0代表存在 2代表删除） */
@ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
private String delFlag;
/** 数据所属组织 */
@ApiModelProperty(value = "数据所属组织")
private String companyId;
/** 状态(0开 1关) */
@ApiModelProperty(value = "状态(0开 1关)")
private Integer status;
public void setSupplierId(Long supplierId)
{
this.supplierId = supplierId;
}
public Long getSupplierId()
{
return supplierId;
}
public void setSupplier(String supplier)
{
this.supplier = supplier;
}
public String getSupplier()
{
return supplier;
}
public void setAddress(String address)
{
this.address = address;
}
public String getAddress()
{
return address;
}
public void setLegalPerson(String legalPerson)
{
this.legalPerson = legalPerson;
}
public String getLegalPerson()
{
return legalPerson;
}
public void setPrimaryContact(String primaryContact)
{
this.primaryContact = primaryContact;
}
public String getPrimaryContact()
{
return primaryContact;
}
public void setPhone(String phone)
{
this.phone = phone;
}
public String getPhone()
{
return phone;
}
public void setBusinessScope(String businessScope)
{
this.businessScope = businessScope;
}
public String getBusinessScope()
{
return businessScope;
}
public void setBusinessLicense(String businessLicense)
{
this.businessLicense = businessLicense;
}
public String getBusinessLicense()
{
return businessLicense;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
public void setCompanyId(String companyId)
{
this.companyId = companyId;
}
public String getCompanyId()
{
return companyId;
}
public void setStatus(Integer status)
{
this.status = status;
}
public Integer getStatus()
{
return status;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("supplierId", getSupplierId())
.append("supplier", getSupplier())
.append("address", getAddress())
.append("legalPerson", getLegalPerson())
.append("primaryContact", getPrimaryContact())
.append("phone", getPhone())
.append("businessScope", getBusinessScope())
.append("businessLicense", getBusinessLicense())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("companyId", getCompanyId())
.append("status", getStatus())
.toString();
}
}

70
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/TreeSelect.java Normal file
View File

@ -0,0 +1,70 @@
package com.bonus.sgzb.base.domain.vo;
import com.bonus.sgzb.base.domain.MaHouse;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.io.Serializable;
import java.util.List;
import java.util.stream.Collectors;
/**
* Treeselect树结构实体类
*
* @author ruoyi
*/
public class TreeSelect implements Serializable
{
private static final long serialVersionUID = 1L;
/** 节点ID */
private Long id;
/** 节点名称 */
private String label;
/** 子节点 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<TreeSelect> children;
public TreeSelect()
{
}
public TreeSelect(MaHouse maHouse)
{
this.id = maHouse.getDeptId();
this.label = maHouse.getHouseName();
this.children = maHouse.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
}
public Long getId()
{
return id;
}
public void setId(Long id)
{
this.id = id;
}
public String getLabel()
{
return label;
}
public void setLabel(String label)
{
this.label = label;
}
public List<TreeSelect> getChildren()
{
return children;
}
public void setChildren(List<TreeSelect> children)
{
this.children = children;
}
}

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java
View File

@ -1,6 +1,5 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.domain.BmProjectInfo;
import com.bonus.sgzb.base.domain.BmUnitInfo;
import org.apache.ibatis.annotations.Mapper;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java
View File

@ -9,7 +9,7 @@ public interface MaHouseSetMapper {
public int maHouseSetAdd(MaHouseSet maHouseSet);
public int deleteHouseSetById(Long houseId);
public int deleteHouseSetById(Long id);
public int updateHouseSet(MaHouseSet maHouseSet);
}

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java
View File

@ -12,4 +12,12 @@ public interface MaMachineMapper {
public int remove(Long[] maIds);
public int updateMaMachine(MaMachine maMachine);
/**
* 查询机具设备管理ma_machine
*
* @param maId 机具设备管理ma_machine主键
* @return 机具设备管理ma_machine
*/
public MaMachine selectMaMachineByMaId(Long maId);
}

62
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaSupplierInfoMapper.java Normal file
View File

@ -0,0 +1,62 @@
package com.bonus.sgzb.base.mapper;
import com.bonus.sgzb.base.domain.MaSupplierInfo;
import java.util.List;
/**
* 供应商管理ma_supplier_infoMapper接口
*
* @author bonus
* @date 2023-12-10
*/
public interface MaSupplierInfoMapper
{
/**
* 查询供应商管理ma_supplier_info
*
* @param supplierId 供应商管理ma_supplier_info主键
* @return 供应商管理ma_supplier_info
*/
public MaSupplierInfo selectMaSupplierInfoBySupplierId(Long supplierId);
/**
* 查询供应商管理ma_supplier_info列表
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 供应商管理ma_supplier_info集合
*/
public List<MaSupplierInfo> selectMaSupplierInfoList(MaSupplierInfo maSupplierInfo);
/**
* 新增供应商管理ma_supplier_info
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 结果
*/
public int insertMaSupplierInfo(MaSupplierInfo maSupplierInfo);
/**
* 修改供应商管理ma_supplier_info
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 结果
*/
public int updateMaSupplierInfo(MaSupplierInfo maSupplierInfo);
/**
* 删除供应商管理ma_supplier_info
*
* @param supplierId 供应商管理ma_supplier_info主键
* @return 结果
*/
public int deleteMaSupplierInfoBySupplierId(Long supplierId);
/**
* 批量删除供应商管理ma_supplier_info
*
* @param supplierIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteMaSupplierInfoBySupplierIds(Long[] supplierIds);
}

62
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaSupplierInfoService.java Normal file
View File

@ -0,0 +1,62 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.domain.MaSupplierInfo;
import java.util.List;
/**
* 供应商管理ma_supplier_infoService接口
*
* @author bonus
* @date 2023-12-10
*/
public interface IMaSupplierInfoService
{
/**
* 查询供应商管理ma_supplier_info
*
* @param supplierId 供应商管理ma_supplier_info主键
* @return 供应商管理ma_supplier_info
*/
public MaSupplierInfo selectMaSupplierInfoBySupplierId(Long supplierId);
/**
* 查询供应商管理ma_supplier_info列表
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 供应商管理ma_supplier_info集合
*/
public List<MaSupplierInfo> selectMaSupplierInfoList(MaSupplierInfo maSupplierInfo);
/**
* 新增供应商管理ma_supplier_info
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 结果
*/
public int insertMaSupplierInfo(MaSupplierInfo maSupplierInfo);
/**
* 修改供应商管理ma_supplier_info
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 结果
*/
public int updateMaSupplierInfo(MaSupplierInfo maSupplierInfo);
/**
* 批量删除供应商管理ma_supplier_info
*
* @param supplierIds 需要删除的供应商管理ma_supplier_info主键集合
* @return 结果
*/
public int deleteMaSupplierInfoBySupplierIds(Long[] supplierIds);
/**
* 删除供应商管理ma_supplier_info信息
*
* @param supplierId 供应商管理ma_supplier_info主键
* @return 结果
*/
public int deleteMaSupplierInfoBySupplierId(Long supplierId);
}

20
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.base.service;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.domain.vo.TreeSelect;
import java.util.List;
@ -55,5 +56,22 @@ public interface IhouseService {
*/
boolean hasChildByHouseId(Long houseId);
List<MaHouse> getHouseTree(MaHouse house);
List<TreeSelect> getHouseTree(MaHouse house);
/**
* 构建前端所需要下拉树结构
*
* @param maHouseList 部门列表
* @return 下拉树结构列表
*/
public List<TreeSelect> buildDeptTreeSelect(List<MaHouse> maHouseList);
/**
* 构建前端所需要树结构
*
* @param maHouseList 部门列表
* @return 树结构列表
*/
public List<MaHouse> buildDeptTree(List<MaHouse> maHouseList);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java
View File

@ -10,7 +10,7 @@ public interface MaHouseSetService {
public int maHouseSetAdd(MaHouseSet maHouseSet);
public int deleteHouseSetById(Long houseId);
public int deleteHouseSetById(Long id);
public int updateHouseSet(MaHouseSet maHouseSet);
}

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java
View File

@ -12,4 +12,13 @@ public interface MaMachineService {
public int remove(Long[] maIds);
public int updateMaMachine(MaMachine maMachine);
/**
* 查询机具设备管理ma_machine
*
* @param maId 机具设备管理ma_machine主键
* @return 机具设备管理ma_machine
*/
public MaMachine selectMaMachineByMaId(Long maId);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.BmProjectInfo;
import com.bonus.sgzb.base.domain.BmUnitInfo;
import com.bonus.sgzb.base.domain.BmUnitPerson;
import com.bonus.sgzb.base.mapper.BmProjectInfoMapper;
import com.bonus.sgzb.base.service.BmProjectInfoService;
import com.bonus.sgzb.common.core.exception.ServiceException;

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/DeptServiceImpl.java
View File

@ -1,13 +1,15 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.BmUnitPerson;
import com.bonus.sgzb.base.mapper.DeptMapper;
import com.bonus.sgzb.base.service.DeptService;
import com.bonus.sgzb.system.api.domain.SysDept;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class DeptServiceImpl implements DeptService {

115
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java
View File

@ -1,16 +1,19 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.domain.vo.TreeSelect;
import com.bonus.sgzb.base.mapper.MaHouseMapper;
import com.bonus.sgzb.base.service.IhouseService;
import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.base.domain.MaHouse;
import com.bonus.sgzb.base.mapper.MaHouseMapper;
import com.bonus.sgzb.base.service.IhouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
/**
* 仓库信息 服务层处理
@ -20,7 +23,7 @@ import java.util.List;
@Service
public class MaHouseServiceImpl implements IhouseService {
@Autowired
@Resource
private MaHouseMapper houseMapper;
/**
* 校验工程项目名称
@ -49,7 +52,7 @@ public class MaHouseServiceImpl implements IhouseService {
public int insertHouse(MaHouse house) {
MaHouse info = houseMapper.selectHouseById(house.getParentId());
// 如果父节点不为正常状态,则不允许新增子节点
if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
if (house.getParentId() != 0 && !UserConstants.DEPT_NORMAL.equals(info.getStatus()))
{
throw new ServiceException("仓库货架停用，不允许新增");
}
@ -104,11 +107,101 @@ public class MaHouseServiceImpl implements IhouseService {
* @return 结果
*/
@Override
public List<MaHouse> getHouseTree(MaHouse house) {
List<MaHouse> houseList = houseMapper.selectHouseParent(0L);
for (MaHouse maHouse : houseList) {
houseMapper.selectHouseParent(0L);
public List<TreeSelect> getHouseTree(MaHouse house) {
List<MaHouse> houseList = houseMapper.selectHouseList(house);
return buildDeptTreeSelect(houseList);
}
/**
* 构建前端所需要树结构
*
* @param maHouseList 部门列表
* @return 树结构列表
*/
@Override
public List<MaHouse> buildDeptTree(List<MaHouse> maHouseList)
{
List<MaHouse> returnList = new ArrayList<MaHouse>();
List<Long> tempList = maHouseList.stream().map(MaHouse::getHouseId).collect(Collectors.toList());
for (MaHouse maHouse : maHouseList)
{
// 如果是顶级节点, 遍历该父节点的所有子节点
if (!tempList.contains(maHouse.getParentId()))
{
recursionFn(maHouseList, maHouse);
returnList.add(maHouse);
}
}
return null;
if (returnList.isEmpty())
{
returnList = maHouseList;
}
return returnList;
}
/**
* 构建前端所需要下拉树结构
*
* @param depts 部门列表
* @return 下拉树结构列表
*/
@Override
public List<TreeSelect> buildDeptTreeSelect(List<MaHouse> depts)
{
List<MaHouse> deptTrees = buildDeptTree(depts);
return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
}
/**
* 递归列表
*/
private void recursionFn(List<MaHouse> list, MaHouse t)
{
// 得到子节点列表
List<MaHouse> childList = getChildList(list, t);
t.setChildren(childList);
for (MaHouse tChild : childList)
{
if (hasChild(list, tChild))
{
recursionFn(list, tChild);
}
}
}
/**
* 得到子节点列表
*/
private List<MaHouse> getChildList(List<MaHouse> list, MaHouse t)
{
List<MaHouse> tlist = new ArrayList<MaHouse>();
Iterator<MaHouse> it = list.iterator();
while (it.hasNext())
{
MaHouse n = (MaHouse) it.next();
if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getHouseId().longValue())
{
tlist.add(n);
}
}
return tlist;
}
/**
* 判断是否有子节点
*/
private boolean hasChild(List<MaHouse> list, MaHouse t)
{
return getChildList(list, t).size() > 0 ? true : false;
}
}

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java
View File

@ -25,8 +25,8 @@ public class MaHouseSetImpl implements MaHouseSetService {
}
@Override
public int deleteHouseSetById(Long houseId) {
return maHouseSetMapper.deleteHouseSetById(houseId);
public int deleteHouseSetById(Long id) {
return maHouseSetMapper.deleteHouseSetById(id);
}
@Override

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
View File

@ -1,11 +1,11 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.utils.bean.BeanValidators;
import com.bonus.sgzb.base.mapper.MaLabelBindMapper;
import com.bonus.sgzb.base.service.IMaLabelBindService;
import com.bonus.sgzb.base.vo.MaLabelBindVO;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.utils.bean.BeanValidators;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
View File

@ -34,4 +34,16 @@ public class MaMachineServiceImpl implements MaMachineService {
public int updateMaMachine(MaMachine maMachine) {
return maMachineMapper.updateMaMachine(maMachine);
}
/**
* 查询机具设备管理ma_machine
*
* @param maId 机具设备管理ma_machine主键
* @return 机具设备管理ma_machine
*/
@Override
public MaMachine selectMaMachineByMaId(Long maId)
{
return maMachineMapper.selectMaMachineByMaId(maId);
}
}

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java
View File

@ -1,10 +1,10 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.base.domain.MaPartType;
import com.bonus.sgzb.base.mapper.MaPartTypeMapper;
import com.bonus.sgzb.base.service.IPartTypeService;
import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.MaPropInfo;
import com.bonus.sgzb.base.mapper.MaPropInfoMapper;
import com.bonus.sgzb.base.service.IMaPropInfoService;
import com.bonus.sgzb.common.core.constant.UserConstants;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.utils.bean.BeanValidators;
import com.bonus.sgzb.base.domain.MaPropInfo;
import com.bonus.sgzb.base.mapper.MaPropInfoMapper;
import com.bonus.sgzb.base.service.IMaPropInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

97
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaSupplierInfoServiceImpl.java Normal file
View File

@ -0,0 +1,97 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.base.domain.MaSupplierInfo;
import com.bonus.sgzb.base.mapper.MaSupplierInfoMapper;
import com.bonus.sgzb.base.service.IMaSupplierInfoService;
import com.bonus.sgzb.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 供应商管理ma_supplier_infoService业务层处理
*
* @author bonus
* @date 2023-12-10
*/
@Service
public class MaSupplierInfoServiceImpl implements IMaSupplierInfoService
{
@Autowired
private MaSupplierInfoMapper maSupplierInfoMapper;
/**
* 查询供应商管理ma_supplier_info
*
* @param supplierId 供应商管理ma_supplier_info主键
* @return 供应商管理ma_supplier_info
*/
@Override
public MaSupplierInfo selectMaSupplierInfoBySupplierId(Long supplierId)
{
return maSupplierInfoMapper.selectMaSupplierInfoBySupplierId(supplierId);
}
/**
* 查询供应商管理ma_supplier_info列表
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 供应商管理ma_supplier_info
*/
@Override
public List<MaSupplierInfo> selectMaSupplierInfoList(MaSupplierInfo maSupplierInfo)
{
return maSupplierInfoMapper.selectMaSupplierInfoList(maSupplierInfo);
}
/**
* 新增供应商管理ma_supplier_info
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 结果
*/
@Override
public int insertMaSupplierInfo(MaSupplierInfo maSupplierInfo)
{
maSupplierInfo.setCreateTime(DateUtils.getNowDate());
return maSupplierInfoMapper.insertMaSupplierInfo(maSupplierInfo);
}
/**
* 修改供应商管理ma_supplier_info
*
* @param maSupplierInfo 供应商管理ma_supplier_info
* @return 结果
*/
@Override
public int updateMaSupplierInfo(MaSupplierInfo maSupplierInfo)
{
maSupplierInfo.setUpdateTime(DateUtils.getNowDate());
return maSupplierInfoMapper.updateMaSupplierInfo(maSupplierInfo);
}
/**
* 批量删除供应商管理ma_supplier_info
*
* @param supplierIds 需要删除的供应商管理ma_supplier_info主键
* @return 结果
*/
@Override
public int deleteMaSupplierInfoBySupplierIds(Long[] supplierIds)
{
return maSupplierInfoMapper.deleteMaSupplierInfoBySupplierIds(supplierIds);
}
/**
* 删除供应商管理ma_supplier_info信息
*
* @param supplierId 供应商管理ma_supplier_info主键
* @return 结果
*/
@Override
public int deleteMaSupplierInfoBySupplierId(Long supplierId)
{
return maSupplierInfoMapper.deleteMaSupplierInfoBySupplierId(supplierId);
}
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.bonus.sgzb.base.service.impl;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.base.domain.MaType;
import com.bonus.sgzb.base.mapper.MaTypeMapper;
import com.bonus.sgzb.base.service.ITypeService;
import com.bonus.sgzb.common.core.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

32
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml
View File

@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="companyId" column="company_id" />
<result property="shelfNum" column="shelf_num" />
</resultMap>
<sql id="selectHouseSetVo">
select house_id, type_id, ma_id, num, status, dept_id, del_flag, create_by, create_time, update_by,update_time,remark,company_id
select house_id, type_id, ma_id, num, status, dept_id, del_flag, create_by, create_time, update_by,update_time,remark,company_id,shelf_num
from ma_house_set
</sql>
@ -36,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null and updateTime != ''">update_time,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="companyId != null and companyId != ''">company_id,</if>
<if test="shelfNum != null and shelfNum != ''">shelf_num,</if>
create_time
)values(
<if test="houseId != null and houseId != 0">#{houseId},</if>
@ -50,8 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null and updateTime != ''">#{updateTime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="companyId != null and companyId != ''">#{companyId},</if>
<if test="shelfNum != null and shelfNum != ''">#{shelfNum},</if>
sysdate()
)
</insert>
@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateHouseSet">
update ma_house_info
<set>
<if test="houseId != null and houseId != ''">house_id = #{houseId},</if>
<if test="typeId != null and typeId != ''">type_id = #{typeId},</if>
<if test="maId != null and maId != ''">ma_id = #{maId},</if>
<if test="num != null and num != ''">num = #{num},</if>
@ -66,17 +69,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null and deptId != ''">dept_id = #{deptId},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null and createTime != ''">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
update_time = sysdate()
</set>
where house_id = #{houseId}
where id = #{id}
</update>
<delete id="deleteHouseSetById" parameterType="Long">
update ma_house_set set del_flag = '2' where house_id = #{houseId}
update ma_house_set set del_flag = '2' where id = #{id}
</delete>
@ -94,9 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="maId != null and maId != ''">
AND ma_id = #{maId}
</if>
<if test="num != null and num != ''">
AND num = #{num}
</if>
<if test="status != null and status != ''">
and status = #{status}
</if>
@ -106,21 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="delFlag != null and delFlag != ''">
and del_flag = #{delFlag}
</if>
<if test="createBy != null and createBy != ''">
and create_by = #{createBy}
</if>
<if test="createTime != null and createTime != ''">
and create_time = #{createTime}
</if>
<if test="updateBy != null and updateBy != ''">
and update_by = #{updateBy}
</if>
<if test="updateTime != null and updateTime != ''">
and update_time = #{updateTime}
</if>
<if test="remark != null and remark != ''">
and remark = #{remark}
</if>
<if test="companyId != null and companyId != ''">
and company_id = #{companyId}
</if>

11
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="getMaMachine" resultType="com.bonus.sgzb.base.domain.MaMachine">
<select id="getMaMachine" parameterType="com.bonus.sgzb.base.domain.MaMachine" resultMap="MaMachineResult">
select ma_id, type_id, ma_code, pre_code, ma_status, qr_code, buy_price, ma_vender, out_fac_time, out_fac_code,
assets_code, check_man, this_check_time, next_check_time, gps_code, rfid_code, erp_code, transfer_code,
@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="gpsCode != null and gpsCode != ''">gps_code,</if>
<if test="rfidCode != null and rfidCode != ''">rfid_code,</if>
<if test="erpCode != null and erpCode != ''">erp_code,</if>
<if test="transferCode != null and transferCode != ''">erp_code,</if>
<if test="transferCode != null and transferCode != ''">transfer_code,</if>
<if test="inOutNum != null and inOutNum != ''">in_out_num,</if>
<if test="buyTask != null and buyTask != ''">buy_task,</if>
<if test="ownHouse != null and ownHouse != ''">own_house,</if>
@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="maCode != null and maCode != ''">#{maCode},</if>
<if test="preCode != null and preCode != ''">#{preCode},</if>
<if test="maStatus != null and maStatus != ''">#{maStatus},</if>
<if test="qrCode != null and qrCode != ''">#{telphone},</if>
<if test="qrCode != null and qrCode != ''">#{qrCode},</if>
<if test="buyPrice != null and buyPrice != ''">#{buyPrice},</if>
<if test="maVender != null and maVender != ''">#{maVender},</if>
<if test="outFacTime != null and outFacTime != ''">#{outFacTime},</if>
@ -198,4 +198,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{maId}
</foreach>
</delete>
<select id="selectMaMachineByMaId" parameterType="Long" resultMap="MaMachineResult">
<include refid="selectMaMachine"/>
where ma_id = #{maId}
</select>
</mapper>

120
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaSupplierInfoMapper.xml Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.base.mapper.MaSupplierInfoMapper">
<resultMap type="com.bonus.sgzb.base.domain.MaSupplierInfo" id="MaSupplierInfoResult">
<result property="supplierId" column="supplier_id" />
<result property="supplier" column="supplier" />
<result property="address" column="address" />
<result property="legalPerson" column="legal_person" />
<result property="primaryContact" column="primary_contact" />
<result property="phone" column="phone" />
<result property="businessScope" column="business_scope" />
<result property="businessLicense" column="business_license" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="companyId" column="company_id" />
<result property="status" column="status" />
</resultMap>
<sql id="selectMaSupplierInfoVo">
select supplier_id, supplier, address, legal_person, primary_contact, phone, business_scope, business_license, del_flag, create_by, create_time, update_by, update_time, remark, company_id, status from ma_supplier_info
</sql>
<select id="selectMaSupplierInfoList" parameterType="com.bonus.sgzb.base.domain.MaSupplierInfo" resultMap="MaSupplierInfoResult">
<include refid="selectMaSupplierInfoVo"/>
<where>
<if test="supplier != null and supplier != ''"> and supplier = #{supplier}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="legalPerson != null and legalPerson != ''"> and legal_person = #{legalPerson}</if>
<if test="primaryContact != null and primaryContact != ''"> and primary_contact = #{primaryContact}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
<if test="businessScope != null and businessScope != ''"> and business_scope = #{businessScope}</if>
<if test="businessLicense != null and businessLicense != ''"> and business_license = #{businessLicense}</if>
<if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
<if test="status != null "> and status = #{status}</if>
</where>
</select>
<select id="selectMaSupplierInfoBySupplierId" parameterType="Long" resultMap="MaSupplierInfoResult">
<include refid="selectMaSupplierInfoVo"/>
where supplier_id = #{supplierId}
</select>
<insert id="insertMaSupplierInfo" parameterType="com.bonus.sgzb.base.domain.MaSupplierInfo" useGeneratedKeys="true" keyProperty="supplierId">
insert into ma_supplier_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="supplier != null and supplier != ''">supplier,</if>
<if test="address != null">address,</if>
<if test="legalPerson != null">legal_person,</if>
<if test="primaryContact != null">primary_contact,</if>
<if test="phone != null">phone,</if>
<if test="businessScope != null">business_scope,</if>
<if test="businessLicense != null">business_license,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="companyId != null">company_id,</if>
<if test="status != null">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="supplier != null and supplier != ''">#{supplier},</if>
<if test="address != null">#{address},</if>
<if test="legalPerson != null">#{legalPerson},</if>
<if test="primaryContact != null">#{primaryContact},</if>
<if test="phone != null">#{phone},</if>
<if test="businessScope != null">#{businessScope},</if>
<if test="businessLicense != null">#{businessLicense},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="companyId != null">#{companyId},</if>
<if test="status != null">#{status},</if>
</trim>
</insert>
<update id="updateMaSupplierInfo" parameterType="com.bonus.sgzb.base.domain.MaSupplierInfo">
update ma_supplier_info
<trim prefix="SET" suffixOverrides=",">
<if test="supplier != null and supplier != ''">supplier = #{supplier},</if>
<if test="address != null">address = #{address},</if>
<if test="legalPerson != null">legal_person = #{legalPerson},</if>
<if test="primaryContact != null">primary_contact = #{primaryContact},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="businessScope != null">business_scope = #{businessScope},</if>
<if test="businessLicense != null">business_license = #{businessLicense},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="companyId != null">company_id = #{companyId},</if>
<if test="status != null">status = #{status},</if>
</trim>
where supplier_id = #{supplierId}
</update>
<delete id="deleteMaSupplierInfoBySupplierId" parameterType="Long">
delete from ma_supplier_info where supplier_id = #{supplierId}
</delete>
<delete id="deleteMaSupplierInfoBySupplierIds" parameterType="String">
delete from ma_supplier_info where supplier_id in
<foreach item="supplierId" collection="array" open="(" separator="," close=")">
#{supplierId}
</foreach>
</delete>
</mapper>

3
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeKeeperMapper.xml
View File

@ -22,8 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectListByUserId" resultType="com.bonus.sgzb.base.vo.MaTypeKeeperVO">
select mt.type_name, su.user_name from ma_type mt
left join ma_type_keeper mtk on mt.type_id = mtk
.type_id
left join ma_type_keeper mtk on mt.type_id = mtk.type_id
left join sys_user su on mtk.user_id = su.user_id
</select>