diff --git a/src/main/java/com/xujie/modules/baseInformation/controller/SrmPartFamilyController.java b/src/main/java/com/xujie/modules/baseInformation/controller/SrmPartFamilyController.java new file mode 100644 index 0000000..3692c2d --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/controller/SrmPartFamilyController.java @@ -0,0 +1,43 @@ +package com.xujie.modules.baseInformation.controller; + +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.baseInformation.entity.SrmPartFamily; +import com.xujie.modules.baseInformation.service.SrmPartFamilyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/srmPartFamily") +public class SrmPartFamilyController { + + @Autowired + private SrmPartFamilyService srmPartFamilyService; + + /** + * part_family 分页查询 - rqrq + */ + @PostMapping("/getPartFamilyListPaging") + public R getPartFamilyListPaging(@RequestBody SrmPartFamily partFamily) { + PageUtils page = srmPartFamilyService.getPartFamilyListPaging(partFamily); + return R.ok().put("data", page); + } + + @PostMapping("/savePartFamily") + public R savePartFamily(@RequestBody SrmPartFamily partFamily) { + return srmPartFamilyService.savePartFamily(partFamily); + } + + @PostMapping("/updatePartFamily") + public R updatePartFamily(@RequestBody SrmPartFamily partFamily) { + return srmPartFamilyService.updatePartFamily(partFamily); + } + + @PostMapping("/deletePartFamily") + public R deletePartFamily(@RequestBody SrmPartFamily partFamily) { + return srmPartFamilyService.deletePartFamily(partFamily.getFamilyId(), partFamily.getSite()); + } +} diff --git a/src/main/java/com/xujie/modules/baseInformation/controller/SrmUmController.java b/src/main/java/com/xujie/modules/baseInformation/controller/SrmUmController.java new file mode 100644 index 0000000..e6ba993 --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/controller/SrmUmController.java @@ -0,0 +1,43 @@ +package com.xujie.modules.baseInformation.controller; + +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.baseInformation.entity.SrmUm; +import com.xujie.modules.baseInformation.service.SrmUmService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/srmUm") +public class SrmUmController { + + @Autowired + private SrmUmService srmUmService; + + /** + * UM 分页查询 - rqrq + */ + @PostMapping("/getUmListPaging") + public R getUmListPaging(@RequestBody SrmUm um) { + PageUtils page = srmUmService.getUmListPaging(um); + return R.ok().put("data", page); + } + + @PostMapping("/saveUm") + public R saveUm(@RequestBody SrmUm um) { + return srmUmService.saveUm(um); + } + + @PostMapping("/updateUm") + public R updateUm(@RequestBody SrmUm um) { + return srmUmService.updateUm(um); + } + + @PostMapping("/deleteUm") + public R deleteUm(@RequestBody SrmUm um) { + return srmUmService.deleteUm(um.getUmId(), um.getSite()); + } +} diff --git a/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartFamily.java b/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartFamily.java new file mode 100644 index 0000000..7ba447d --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/entity/SrmPartFamily.java @@ -0,0 +1,37 @@ +package com.xujie.modules.baseInformation.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xujie.common.utils.QueryPage; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * part_family 维护实体 - rqrq + */ +@Data +public class SrmPartFamily extends QueryPage { + + private String site; + + private String familyId; + + private String familyName; + + private String active; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createDate; + + private String createBy; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateDate; + + private String updateBy; + + private String showInQueryFlag; +} diff --git a/src/main/java/com/xujie/modules/baseInformation/entity/SrmUm.java b/src/main/java/com/xujie/modules/baseInformation/entity/SrmUm.java new file mode 100644 index 0000000..7ff4465 --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/entity/SrmUm.java @@ -0,0 +1,19 @@ +package com.xujie.modules.baseInformation.entity; + +import com.xujie.common.utils.QueryPage; +import lombok.Data; + +/** + * UM 维护实体 - rqrq + */ +@Data +public class SrmUm extends QueryPage { + + private String site; + + private String umId; + + private String umName; + + private String active; +} diff --git a/src/main/java/com/xujie/modules/baseInformation/mapper/SrmPartFamilyMapper.java b/src/main/java/com/xujie/modules/baseInformation/mapper/SrmPartFamilyMapper.java new file mode 100644 index 0000000..9038061 --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/mapper/SrmPartFamilyMapper.java @@ -0,0 +1,24 @@ +package com.xujie.modules.baseInformation.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.modules.baseInformation.entity.SrmPartFamily; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface SrmPartFamilyMapper { + + IPage selectPartFamilyListWithPaging(@Param("page") Page page, + @Param("partFamily") SrmPartFamily partFamily); + + SrmPartFamily selectPartFamilyByCode(@Param("familyId") String familyId, @Param("site") String site); + + int insertPartFamily(SrmPartFamily partFamily); + + int updatePartFamily(SrmPartFamily partFamily); + + Integer checkPartFamilyReference(@Param("familyId") String familyId, @Param("site") String site); + + int deletePartFamily(@Param("familyId") String familyId, @Param("site") String site); +} diff --git a/src/main/java/com/xujie/modules/baseInformation/mapper/SrmUmMapper.java b/src/main/java/com/xujie/modules/baseInformation/mapper/SrmUmMapper.java new file mode 100644 index 0000000..b531b20 --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/mapper/SrmUmMapper.java @@ -0,0 +1,23 @@ +package com.xujie.modules.baseInformation.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.modules.baseInformation.entity.SrmUm; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface SrmUmMapper { + + IPage selectUmListWithPaging(@Param("page") Page page, @Param("um") SrmUm um); + + SrmUm selectUmByCode(@Param("umId") String umId, @Param("site") String site); + + int insertUm(SrmUm um); + + int updateUm(SrmUm um); + + Integer checkUmReference(@Param("umId") String umId, @Param("site") String site); + + int deleteUm(@Param("umId") String umId, @Param("site") String site); +} diff --git a/src/main/java/com/xujie/modules/baseInformation/service/SrmPartFamilyService.java b/src/main/java/com/xujie/modules/baseInformation/service/SrmPartFamilyService.java new file mode 100644 index 0000000..3cef6aa --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/service/SrmPartFamilyService.java @@ -0,0 +1,16 @@ +package com.xujie.modules.baseInformation.service; + +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.baseInformation.entity.SrmPartFamily; + +public interface SrmPartFamilyService { + + PageUtils getPartFamilyListPaging(SrmPartFamily partFamily); + + R savePartFamily(SrmPartFamily partFamily); + + R updatePartFamily(SrmPartFamily partFamily); + + R deletePartFamily(String familyId, String site); +} diff --git a/src/main/java/com/xujie/modules/baseInformation/service/SrmUmService.java b/src/main/java/com/xujie/modules/baseInformation/service/SrmUmService.java new file mode 100644 index 0000000..187065b --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/service/SrmUmService.java @@ -0,0 +1,16 @@ +package com.xujie.modules.baseInformation.service; + +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.baseInformation.entity.SrmUm; + +public interface SrmUmService { + + PageUtils getUmListPaging(SrmUm um); + + R saveUm(SrmUm um); + + R updateUm(SrmUm um); + + R deleteUm(String umId, String site); +} diff --git a/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartFamilyServiceImpl.java b/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartFamilyServiceImpl.java new file mode 100644 index 0000000..228e9d6 --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmPartFamilyServiceImpl.java @@ -0,0 +1,110 @@ +package com.xujie.modules.baseInformation.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.baseInformation.entity.SrmPartFamily; +import com.xujie.modules.baseInformation.mapper.SrmPartFamilyMapper; +import com.xujie.modules.baseInformation.service.SrmPartFamilyService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SrmPartFamilyServiceImpl implements SrmPartFamilyService { + + @Autowired + private SrmPartFamilyMapper srmPartFamilyMapper; + + @Override + public PageUtils getPartFamilyListPaging(SrmPartFamily partFamily) { + Page page = new Page<>(partFamily.getPage(), partFamily.getLimit()); + IPage iPage = this.srmPartFamilyMapper.selectPartFamilyListWithPaging(page, partFamily); + return new PageUtils(iPage); + } + + @Override + public R savePartFamily(SrmPartFamily partFamily) { + // 新增前校验与标准化 - rqrq + normalizeInput(partFamily); + if (StringUtils.isBlank(partFamily.getSite())) { + return R.error("site 不能为空"); + } + if (StringUtils.isBlank(partFamily.getFamilyId())) { + return R.error("编码不能为空"); + } + if (StringUtils.isBlank(partFamily.getFamilyName())) { + return R.error("名称不能为空"); + } + if (StringUtils.isBlank(partFamily.getActive())) { + partFamily.setActive("Y"); + } + + SrmPartFamily existing = srmPartFamilyMapper.selectPartFamilyByCode(partFamily.getFamilyId(), partFamily.getSite()); + if (existing != null) { + return R.error("编码已存在"); + } + + int result = srmPartFamilyMapper.insertPartFamily(partFamily); + return result > 0 ? R.ok().put("msg", "新增成功") : R.error("新增失败"); + } + + @Override + public R updatePartFamily(SrmPartFamily partFamily) { + // 编辑前校验与标准化 - rqrq + normalizeInput(partFamily); + if (StringUtils.isBlank(partFamily.getSite())) { + return R.error("site 不能为空"); + } + if (StringUtils.isBlank(partFamily.getFamilyId())) { + return R.error("编码不能为空"); + } + if (StringUtils.isBlank(partFamily.getFamilyName())) { + return R.error("名称不能为空"); + } + if (StringUtils.isBlank(partFamily.getActive())) { + return R.error("是否在用不能为空"); + } + + SrmPartFamily existing = srmPartFamilyMapper.selectPartFamilyByCode(partFamily.getFamilyId(), partFamily.getSite()); + if (existing == null) { + return R.error("记录不存在"); + } + + int result = srmPartFamilyMapper.updatePartFamily(partFamily); + return result > 0 ? R.ok().put("msg", "更新成功") : R.error("更新失败"); + } + + @Override + public R deletePartFamily(String familyId, String site) { + familyId = StringUtils.trimToEmpty(familyId); + site = StringUtils.trimToEmpty(site); + if (StringUtils.isBlank(site)) { + return R.error("site 不能为空"); + } + if (StringUtils.isBlank(familyId)) { + return R.error("编码不能为空"); + } + + Integer referenceCount = srmPartFamilyMapper.checkPartFamilyReference(familyId, site); + if (referenceCount != null && referenceCount > 0) { + return R.error("该编码已被物料使用，无法删除"); + } + + int result = srmPartFamilyMapper.deletePartFamily(familyId, site); + return result > 0 ? R.ok().put("msg", "删除成功") : R.error("删除失败"); + } + + private void normalizeInput(SrmPartFamily partFamily) { + if (partFamily == null) { + return; + } + partFamily.setSite(StringUtils.trimToEmpty(partFamily.getSite())); + partFamily.setFamilyId(StringUtils.trimToEmpty(partFamily.getFamilyId())); + partFamily.setFamilyName(StringUtils.trimToEmpty(partFamily.getFamilyName())); + partFamily.setActive(StringUtils.trimToEmpty(partFamily.getActive())); + partFamily.setCreateBy(StringUtils.trimToEmpty(partFamily.getCreateBy())); + partFamily.setUpdateBy(StringUtils.trimToEmpty(partFamily.getUpdateBy())); + } +} diff --git a/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmUmServiceImpl.java b/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmUmServiceImpl.java new file mode 100644 index 0000000..67b12f7 --- /dev/null +++ b/src/main/java/com/xujie/modules/baseInformation/service/impl/SrmUmServiceImpl.java @@ -0,0 +1,108 @@ +package com.xujie.modules.baseInformation.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.common.utils.PageUtils; +import com.xujie.common.utils.R; +import com.xujie.modules.baseInformation.entity.SrmUm; +import com.xujie.modules.baseInformation.mapper.SrmUmMapper; +import com.xujie.modules.baseInformation.service.SrmUmService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SrmUmServiceImpl implements SrmUmService { + + @Autowired + private SrmUmMapper srmUmMapper; + + @Override + public PageUtils getUmListPaging(SrmUm um) { + Page page = new Page<>(um.getPage(), um.getLimit()); + IPage iPage = this.srmUmMapper.selectUmListWithPaging(page, um); + return new PageUtils(iPage); + } + + @Override + public R saveUm(SrmUm um) { + // 新增前校验与标准化 - rqrq + normalizeInput(um); + if (StringUtils.isBlank(um.getSite())) { + return R.error("site 不能为空"); + } + if (StringUtils.isBlank(um.getUmId())) { + return R.error("编码不能为空"); + } + if (StringUtils.isBlank(um.getUmName())) { + return R.error("名称不能为空"); + } + if (StringUtils.isBlank(um.getActive())) { + um.setActive("Y"); + } + + SrmUm existing = srmUmMapper.selectUmByCode(um.getUmId(), um.getSite()); + if (existing != null) { + return R.error("编码已存在"); + } + + int result = srmUmMapper.insertUm(um); + return result > 0 ? R.ok().put("msg", "新增成功") : R.error("新增失败"); + } + + @Override + public R updateUm(SrmUm um) { + // 编辑前校验与标准化 - rqrq + normalizeInput(um); + if (StringUtils.isBlank(um.getSite())) { + return R.error("site 不能为空"); + } + if (StringUtils.isBlank(um.getUmId())) { + return R.error("编码不能为空"); + } + if (StringUtils.isBlank(um.getUmName())) { + return R.error("名称不能为空"); + } + if (StringUtils.isBlank(um.getActive())) { + return R.error("是否在用不能为空"); + } + + SrmUm existing = srmUmMapper.selectUmByCode(um.getUmId(), um.getSite()); + if (existing == null) { + return R.error("记录不存在"); + } + + int result = srmUmMapper.updateUm(um); + return result > 0 ? R.ok().put("msg", "更新成功") : R.error("更新失败"); + } + + @Override + public R deleteUm(String umId, String site) { + umId = StringUtils.trimToEmpty(umId); + site = StringUtils.trimToEmpty(site); + if (StringUtils.isBlank(site)) { + return R.error("site 不能为空"); + } + if (StringUtils.isBlank(umId)) { + return R.error("编码不能为空"); + } + + Integer referenceCount = srmUmMapper.checkUmReference(umId, site); + if (referenceCount != null && referenceCount > 0) { + return R.error("该编码已被物料使用，无法删除"); + } + + int result = srmUmMapper.deleteUm(umId, site); + return result > 0 ? R.ok().put("msg", "删除成功") : R.error("删除失败"); + } + + private void normalizeInput(SrmUm um) { + if (um == null) { + return; + } + um.setSite(StringUtils.trimToEmpty(um.getSite())); + um.setUmId(StringUtils.trimToEmpty(um.getUmId())); + um.setUmName(StringUtils.trimToEmpty(um.getUmName())); + um.setActive(StringUtils.trimToEmpty(um.getActive())); + } +} diff --git a/src/main/resources/mapper/baseInformation/SrmPartFamilyMapper.xml b/src/main/resources/mapper/baseInformation/SrmPartFamilyMapper.xml new file mode 100644 index 0000000..5e897de --- /dev/null +++ b/src/main/resources/mapper/baseInformation/SrmPartFamilyMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO part_family ( + site, + family_id, + family_name, + active, + create_date, + create_by, + update_date, + update_by, + show_in_query_flag + ) VALUES ( + #{site}, + #{familyId}, + #{familyName}, + #{active}, + GETDATE(), + #{createBy}, + GETDATE(), + #{updateBy}, + #{showInQueryFlag} + ) + + + + UPDATE part_family + + family_name = #{familyName}, + active = #{active}, + update_date = GETDATE(), + update_by = #{updateBy} + + WHERE site = #{site} + AND family_id = #{familyId} + + + + + + DELETE FROM part_family + WHERE site = #{site} + AND family_id = #{familyId} + + diff --git a/src/main/resources/mapper/baseInformation/SrmUmMapper.xml b/src/main/resources/mapper/baseInformation/SrmUmMapper.xml new file mode 100644 index 0000000..d240429 --- /dev/null +++ b/src/main/resources/mapper/baseInformation/SrmUmMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + INSERT INTO UM ( + UMID, + Site, + UMName, + Active + ) VALUES ( + #{umId}, + #{site}, + #{umName}, + #{active} + ) + + + + UPDATE UM + + UMName = #{umName}, + Active = #{active} + + WHERE Site = #{site} + AND UMID = #{umId} + + + + + + DELETE FROM UM + WHERE Site = #{site} + AND UMID = #{umId} + +