diff --git a/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java b/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java new file mode 100644 index 00000000..0a1124af --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/controller/SrmSupplierController.java @@ -0,0 +1,46 @@ +package com.xujie.sys.modules.srm.controller; + +import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.common.utils.R; +import com.xujie.sys.modules.part.vo.BomHeaderVo; +import com.xujie.sys.modules.srm.data.SrmSupplierData; +import com.xujie.sys.modules.srm.data.SrmSupplierGroupRequsetData; +import com.xujie.sys.modules.srm.service.SrmSupplierService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/srmSupplier") +public class SrmSupplierController { + @Autowired + private SrmSupplierService srmSupplierService; + + /** + * @description: + * @author: rq + * @date: 2025/08/10 + * @param: [data] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping(value="/searchSrmSupplierList") + @ResponseBody + public R searchSrmSupplierList(@RequestBody SrmSupplierData data) { + PageUtils page = srmSupplierService.searchSrmSupplierList(data); + return R.ok().put("page", page); + } + /** + * @description: + * @author: rq + * @date: 2025/08/10 + * @param: [data] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping(value="/searchSupplierGroupRequestList") + @ResponseBody + public R searchSupplierGroupRequestList(@RequestBody SrmSupplierGroupRequsetData data) { + List rows = srmSupplierService.searchSupplierGroupRequestList(data); + return R.ok().put("rows", rows); + } +} diff --git a/src/main/java/com/xujie/sys/modules/srm/data/SrmSupplierData.java b/src/main/java/com/xujie/sys/modules/srm/data/SrmSupplierData.java new file mode 100644 index 00000000..91ba16b4 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/data/SrmSupplierData.java @@ -0,0 +1,11 @@ +package com.xujie.sys.modules.srm.data; + +import com.xujie.sys.modules.srm.entity.SrmSupplier; +import lombok.Data; +import org.apache.ibatis.type.Alias; + +@Data +@Alias("SrmSupplierData") +public class SrmSupplierData extends SrmSupplier { + +} diff --git a/src/main/java/com/xujie/sys/modules/srm/data/SrmSupplierGroupRequsetData.java b/src/main/java/com/xujie/sys/modules/srm/data/SrmSupplierGroupRequsetData.java new file mode 100644 index 00000000..e02f9ebe --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/data/SrmSupplierGroupRequsetData.java @@ -0,0 +1,14 @@ +package com.xujie.sys.modules.srm.data; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xujie.sys.modules.srm.entity.SrmSupplierGroupRequset; +import lombok.Data; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +@Alias("SrmSupplierGroupRequsetData") +public class SrmSupplierGroupRequsetData extends SrmSupplierGroupRequset { + private String requestBy; +} \ No newline at end of file diff --git a/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java b/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java new file mode 100644 index 00000000..427b7a00 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplier.java @@ -0,0 +1,63 @@ +package com.xujie.sys.modules.srm.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xujie.sys.common.utils.QueryPage; +import lombok.Data; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Alias("SrmSupplier") +@Data +public class SrmSupplier extends QueryPage { + /** + * + */ + private Integer id; + + /** + * + */ + private String site; + + /** + * + */ + private String supplierNo; + + /** + * + */ + private String supplierName; + + /** + * + */ + private String supplierGroup; + + /** + * + */ + @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; + + +} \ No newline at end of file diff --git a/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplierGroupRequset.java b/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplierGroupRequset.java new file mode 100644 index 00000000..733bd45f --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/entity/SrmSupplierGroupRequset.java @@ -0,0 +1,82 @@ +package com.xujie.sys.modules.srm.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +public class SrmSupplierGroupRequset { + /** + * + */ + private Integer id; + + /** + * + */ + private String site; + + /** + * + */ + private String requestNo; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date requestDate; + + /** + * + */ + private String supplierNo; + + /** + * + */ + private String oldSupplierGroup; + + /** + * + */ + private String newSupplierGroup; + + /** + * + */ + private String reason; + + /** + * + */ + private String status; + + /** + * + */ + @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; + + +} \ No newline at end of file diff --git a/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java b/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java new file mode 100644 index 00000000..b3bc4bd6 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/mapper/SrmSupplierMapper.java @@ -0,0 +1,18 @@ +package com.xujie.sys.modules.srm.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.sys.modules.srm.data.SrmSupplierData; +import com.xujie.sys.modules.srm.data.SrmSupplierGroupRequsetData; +import com.xujie.sys.modules.srm.entity.SrmSupplier; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SrmSupplierMapper { + + IPage searchSrmSupplierList(Page SrmSupplierPage, @Param("query") SrmSupplierData data); + List searchSupplierGroupRequestList(SrmSupplierGroupRequsetData data); +} diff --git a/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java b/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java new file mode 100644 index 00000000..dbc7fc51 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/service/SrmSupplierService.java @@ -0,0 +1,17 @@ +package com.xujie.sys.modules.srm.service; + +import com.xujie.sys.common.utils.PageUtils; + +import com.xujie.sys.modules.srm.data.SrmSupplierData; +import com.xujie.sys.modules.srm.data.SrmSupplierGroupRequsetData; + +import java.util.List; + +public interface SrmSupplierService { + + + PageUtils searchSrmSupplierList(SrmSupplierData data); + + + List searchSupplierGroupRequestList(SrmSupplierGroupRequsetData data); +} diff --git a/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java b/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java new file mode 100644 index 00000000..374051e0 --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/srm/service/impl/SrmSupplierServiceImpl.java @@ -0,0 +1,30 @@ +package com.xujie.sys.modules.srm.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.xujie.sys.common.utils.PageUtils; +import com.xujie.sys.modules.part.vo.AgentInformationVo; +import com.xujie.sys.modules.srm.data.SrmSupplierData; +import com.xujie.sys.modules.srm.data.SrmSupplierGroupRequsetData; +import com.xujie.sys.modules.srm.mapper.SrmSupplierMapper; +import com.xujie.sys.modules.srm.service.SrmSupplierService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SrmSupplierServiceImpl implements SrmSupplierService { + @Autowired + private SrmSupplierMapper srmSupplierMapper; + + @Override + public PageUtils searchSrmSupplierList(SrmSupplierData data){ + IPage resultList = srmSupplierMapper.searchSrmSupplierList(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + @Override + public List searchSupplierGroupRequestList(SrmSupplierGroupRequsetData data){ + return srmSupplierMapper.searchSupplierGroupRequestList(data); + } +} diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml new file mode 100644 index 00000000..9a023fae --- /dev/null +++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + \ No newline at end of file