diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java index 89b578f0..7f978aa2 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysUser.java @@ -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(); } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index 8dd1d1a0..7fcfa447 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -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; /** * 基础管理 工程项目 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index 2205000c..1e2d1f8b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java index 944d0eac..422eea1b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java index 3cf820eb..cc84fbad 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseController.java @@ -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 list = houseService.getHouseTree(house); - return getDataTable(list); + return success(houseService.getHouseTree(house)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java index dfeda199..a56c7c94 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseSetController.java @@ -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(); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java index afe677a6..69913c45 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaHouseShelController.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java index 8377a837..21f01a99 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaLabelBindController.java @@ -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.*; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java index a586e629..83991b62 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaMachineController.java @@ -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 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)); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java index 38f590ea..779cbb66 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java @@ -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.*; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java index 478ec0b0..dda7f160 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPropInfoController.java @@ -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.*; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java new file mode 100644 index 00000000..b16c76bb --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java @@ -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 list = maSupplierInfoService.selectMaSupplierInfoList(maSupplierInfo); + return getDataTable(list); + } + + /** + * 导出供应商管理列表 + */ + @ApiOperation(value = "导出查询供应商管理列表") + @PostMapping("/export") + public void export(HttpServletResponse response, MaSupplierInfo maSupplierInfo) + { + List list = maSupplierInfoService.selectMaSupplierInfoList(maSupplierInfo); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 9ba021f9..844f6675 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java index 63d9ec2d..48db9978 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisNumController.java @@ -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.*; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java index c8f1af6f..4b7c1e62 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeHisPriceController.java @@ -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.*; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java index 8f5be3bf..cedac9aa 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeKeeperController.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java index 27e8a3f2..b9530360 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmProjectInfo.java @@ -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; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java index c0ce2e19..fe3d8b73 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitInfo.java @@ -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; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitType.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitType.java index 498ce4c9..b49c9c30 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitType.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitType.java @@ -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; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java index 8b5ea4b8..c37ef322 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouse.java @@ -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 children = new ArrayList(); + public Long getHouseId() { return houseId; } @@ -177,4 +180,12 @@ public class MaHouse extends BaseEntity { public void setSort(int sort) { this.sort = sort; } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java index 24137291..ec587f9b 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java @@ -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; + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java index 93fc7c67..cea3e2f4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaMachine.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaSupplierInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaSupplierInfo.java new file mode 100644 index 00000000..70383bf2 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaSupplierInfo.java @@ -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(); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/TreeSelect.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/TreeSelect.java new file mode 100644 index 00000000..7e3da8c5 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/TreeSelect.java @@ -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 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 getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java index c2e11a18..81e4e049 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitInfoMapper.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java index 52818a39..1801977f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaHouseSetMapper.java @@ -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); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java index 1e2aeb29..ceaea775 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaMachineMapper.java @@ -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); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaSupplierInfoMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaSupplierInfoMapper.java new file mode 100644 index 00000000..dc9aee4c --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaSupplierInfoMapper.java @@ -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 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); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaSupplierInfoService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaSupplierInfoService.java new file mode 100644 index 00000000..b9fee903 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IMaSupplierInfoService.java @@ -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 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); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java index e3e6ff8f..f7dbd685 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/IhouseService.java @@ -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 getHouseTree(MaHouse house); + List getHouseTree(MaHouse house); + + /** + * 构建前端所需要下拉树结构 + * + * @param maHouseList 部门列表 + * @return 下拉树结构列表 + */ + public List buildDeptTreeSelect(List maHouseList); + + + /** + * 构建前端所需要树结构 + * + * @param maHouseList 部门列表 + * @return 树结构列表 + */ + public List buildDeptTree(List maHouseList); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java index 2d1cb60c..078f2ed5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaHouseSetService.java @@ -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); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java index 8cc867b6..7ab94af6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/MaMachineService.java @@ -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); + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java index a0e0af05..1c6260b9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmProjectInfoServiceImpl.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/DeptServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/DeptServiceImpl.java index e9ef6616..87fd6c68 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/DeptServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/DeptServiceImpl.java @@ -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 { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java index bf546a34..779a4896 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseServiceImpl.java @@ -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 getHouseTree(MaHouse house) { - List houseList = houseMapper.selectHouseParent(0L); - for (MaHouse maHouse : houseList) { - houseMapper.selectHouseParent(0L); + public List getHouseTree(MaHouse house) { + List houseList = houseMapper.selectHouseList(house); + return buildDeptTreeSelect(houseList); + } + + + + + + + + /** + * 构建前端所需要树结构 + * + * @param maHouseList 部门列表 + * @return 树结构列表 + */ + @Override + public List buildDeptTree(List maHouseList) + { + List returnList = new ArrayList(); + List 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 buildDeptTreeSelect(List depts) + { + List deptTrees = buildDeptTree(depts); + return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + + /** + * 递归列表 + */ + private void recursionFn(List list, MaHouse t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (MaHouse tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + + + + /** + * 得到子节点列表 + */ + private List getChildList(List list, MaHouse t) + { + List tlist = new ArrayList(); + Iterator 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 list, MaHouse t) + { + return getChildList(list, t).size() > 0 ? true : false; } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java index 692fbf51..5f096dcd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaHouseSetImpl.java @@ -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 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java index 7c423280..9ab74e3e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index a8e7049c..a165b490 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -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); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java index 8590c5cb..38249cfc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPartTypeServiceImpl.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java index 0ec36a5b..0581a433 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaPropInfoServiceImpl.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaSupplierInfoServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaSupplierInfoServiceImpl.java new file mode 100644 index 00000000..d43ba24f --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaSupplierInfoServiceImpl.java @@ -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 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); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index c410b1ec..51f33b4c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -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; diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml index 3caddfd1..317e28ee 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml @@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - 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 @@ -36,9 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag, create_by, update_by, - update_time, remark, company_id, + shelf_num, create_time )values( #{houseId}, @@ -50,8 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{createBy}, #{updateBy}, - #{updateTime}, + #{remark}, #{companyId}, + #{shelfNum}, sysdate() ) @@ -59,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_house_info + house_id = #{houseId}, type_id = #{typeId}, ma_id = #{maId}, num = #{num}, @@ -66,17 +69,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id = #{deptId}, del_flag = #{delFlag}, create_by = #{createBy}, - create_time = #{createTime}, update_by = #{updateBy}, remark = #{remark}, company_id = #{companyId}, update_time = sysdate() - where house_id = #{houseId} + where id = #{id} - update ma_house_set set del_flag = '2' where house_id = #{houseId} + update ma_house_set set del_flag = '2' where id = #{id} @@ -94,9 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ma_id = #{maId} - - AND num = #{num} - and status = #{status} @@ -106,21 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and del_flag = #{delFlag} - - and create_by = #{createBy} - - - and create_time = #{createTime} - - - and update_by = #{updateBy} - - - and update_time = #{updateTime} - - - and remark = #{remark} - and company_id = #{companyId} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml index 6b04d603..31f87d8c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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" gps_code, rfid_code, erp_code, - erp_code, + transfer_code, in_out_num, buy_task, own_house, @@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{maCode}, #{preCode}, #{maStatus}, - #{telphone}, + #{qrCode}, #{buyPrice}, #{maVender}, #{outFacTime}, @@ -198,4 +198,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{maId} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaSupplierInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaSupplierInfoMapper.xml new file mode 100644 index 00000000..86747242 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaSupplierInfoMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into ma_supplier_info + + 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, + + + #{supplier}, + #{address}, + #{legalPerson}, + #{primaryContact}, + #{phone}, + #{businessScope}, + #{businessLicense}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{companyId}, + #{status}, + + + + + update ma_supplier_info + + supplier = #{supplier}, + address = #{address}, + legal_person = #{legalPerson}, + primary_contact = #{primaryContact}, + phone = #{phone}, + business_scope = #{businessScope}, + business_license = #{businessLicense}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + company_id = #{companyId}, + status = #{status}, + + where supplier_id = #{supplierId} + + + + delete from ma_supplier_info where supplier_id = #{supplierId} + + + + delete from ma_supplier_info where supplier_id in + + #{supplierId} + + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeKeeperMapper.xml index 564a1167..57973bc5 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeKeeperMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeKeeperMapper.xml @@ -22,8 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"