From bde96bd9984cfaa418866e72147829035c2927a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Wed, 25 Oct 2023 08:48:32 +0800 Subject: [PATCH] =?UTF-8?q?2023-10-13=20plm=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartInformationController.java | 55 ++++++++ .../part/entity/PartInformationEntity.java | 118 ++++++++++++++++++ .../part/mapper/PartInformationMapper.java | 16 +++ .../part/service/PartInformationService.java | 11 ++ .../impl/PartInformationServiceImpl.java | 60 +++++++++ .../modules/part/vo/PartInformationVo.java | 42 +++++++ .../mapper/part/PartInformationMapper.xml | 115 +++++++++++++++++ 7 files changed, 417 insertions(+) create mode 100644 src/main/java/com/spring/modules/part/controller/PartInformationController.java create mode 100644 src/main/java/com/spring/modules/part/entity/PartInformationEntity.java create mode 100644 src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java create mode 100644 src/main/java/com/spring/modules/part/service/PartInformationService.java create mode 100644 src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java create mode 100644 src/main/java/com/spring/modules/part/vo/PartInformationVo.java create mode 100644 src/main/resources/mapper/part/PartInformationMapper.xml diff --git a/src/main/java/com/spring/modules/part/controller/PartInformationController.java b/src/main/java/com/spring/modules/part/controller/PartInformationController.java new file mode 100644 index 00000000..9d115fef --- /dev/null +++ b/src/main/java/com/spring/modules/part/controller/PartInformationController.java @@ -0,0 +1,55 @@ +package com.spring.modules.part.controller; + +import com.spring.common.utils.PageUtils; +import com.spring.common.utils.R; +import com.spring.modules.part.entity.PartInformationEntity; +import com.spring.modules.part.service.PartInformationService; +import com.spring.modules.part.vo.PartInformationVo; +import com.spring.modules.quotation.entity.QuotationInformationEntity; +import com.spring.modules.quotation.vo.QuotationInformationVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @description: 材料信息 + * @author: fengyuan_yang + * @date: 2023/10/16 10:51 + * @param: + * @return: + **/ +@RestController +@RequestMapping("plm/partInformation") +public class PartInformationController { + + @Autowired + private PartInformationService partInformationService; + + /** + * @description: 材料信息列表 + * @author: fengyuan_yang + * @date: 2023/10/16 10:53 + * @param: [data] + * @return: com.spring.common.utils.R + **/ + @PostMapping(value="/partInformationSearch") + @ResponseBody + public R partInformationSearch(@RequestBody PartInformationVo data) { + PageUtils page = partInformationService.partInformationSearch(data); + return R.ok().put("page", page); + } + + /** + * @description: 材料信息新增 + * @author: fengyuan_yang + * @date: 2023/10/17 10:57 + * @param: [data] + * @return: com.spring.common.utils.R + **/ + @PostMapping(value="/partInformationSave") + @ResponseBody + public R partInformationSave(@RequestBody PartInformationEntity data) { + partInformationService.partInformationSave(data); + return R.ok(); + } + +} diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java new file mode 100644 index 00000000..e8eb8419 --- /dev/null +++ b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java @@ -0,0 +1,118 @@ +package com.spring.modules.part.entity; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.spring.common.utils.QueryPage; +import com.spring.modules.quotation.entity.QuotationInformationEntity; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName("part") +public class PartInformationEntity extends QueryPage implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 工厂 + **/ + private String site; + /** + * 物料编码 + **/ + private String partNo; + /** + * 物料描述 + **/ + private String partDesc; + /** + * 规格型号 + **/ + private String spec; + /** + * 物料类型（数据） + **/ + private String partTypeDb; + /** + * 物料类型 + **/ + private String partType; + /** + * 分类一 + **/ + private String familyId; + /** + * 分类二 + **/ + private String groupId; + /** + * 计量单位 + **/ + private String umId; + /** + * 是否在用 + **/ + private String active; + /** + * 备注 + **/ + private String remark; + /** + * 供应商编码 + **/ + private String supplierId; + /** + * 商品组1 + **/ + private String otherGroup1; + /** + * 商品组2 + **/ + private String otherGroup2; + /** + * 商品组3 + **/ + private String otherGroup3; + /** + * 商品组4 + **/ + private String otherGroup4; + /** + * erp物料编码 + **/ + private String erpPartNo; + /** + * 属性模板 + **/ + private String codeNo; + /** + * 制造商编码 + **/ + private String manufacturerId; + /** + * 创建时间 + **/ + @TableField(fill = FieldFill.INSERT) + private Date createDate; + /** + * 创建人 + **/ + private String createBy; + /** + * 更新时间 + **/ + @TableField(fill = FieldFill.UPDATE) + private Date updateDate; + /** + * 更新人 + **/ + private String updateBy; + /** + * 数据集 + */ + @TableField(exist = false) + private List informationList; +} diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java new file mode 100644 index 00000000..54c7129d --- /dev/null +++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java @@ -0,0 +1,16 @@ +package com.spring.modules.part.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.modules.part.entity.PartInformationEntity; +import com.spring.modules.part.vo.PartInformationVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface PartInformationMapper extends BaseMapper { + IPage partInformationSearch(Page partInformationVoPage, @Param("query") PartInformationVo data); + + String getPartNo(PartInformationEntity data); +} diff --git a/src/main/java/com/spring/modules/part/service/PartInformationService.java b/src/main/java/com/spring/modules/part/service/PartInformationService.java new file mode 100644 index 00000000..86109d1a --- /dev/null +++ b/src/main/java/com/spring/modules/part/service/PartInformationService.java @@ -0,0 +1,11 @@ +package com.spring.modules.part.service; + +import com.spring.common.utils.PageUtils; +import com.spring.modules.part.entity.PartInformationEntity; +import com.spring.modules.part.vo.PartInformationVo; + +public interface PartInformationService { + PageUtils partInformationSearch(PartInformationVo data); + + void partInformationSave(PartInformationEntity data); +} diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java new file mode 100644 index 00000000..5e3de981 --- /dev/null +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -0,0 +1,60 @@ +package com.spring.modules.part.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.spring.common.utils.PageUtils; +import com.spring.modules.oss.dao.SysOssDao; +import com.spring.modules.oss.service.SysOssService; +import com.spring.modules.part.entity.PartInformationEntity; +import com.spring.modules.part.mapper.PartInformationMapper; +import com.spring.modules.part.service.PartInformationService; +import com.spring.modules.part.vo.PartInformationVo; +import com.spring.modules.quotation.vo.QuotationInformationVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class PartInformationServiceImpl extends ServiceImpl implements PartInformationService { + + @Autowired + private PartInformationMapper partInformationMapper; + + @Autowired + private SysOssService sysOssService; + + @Autowired + private SysOssDao sysOssDao; + + @Value("${sys-file.file-path}") + private String filePath; + + /** + * @description: 材料信息列表 + * @author: fengyuan_yang + * @date: 2023/10/16 10:54 + * @param: [data] + * @return: com.spring.common.utils.PageUtils + **/ + @Override + public PageUtils partInformationSearch(PartInformationVo data) { + IPage resultList = this.partInformationMapper.partInformationSearch(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + + /** + * @description: 材料信息新增 + * @author: fengyuan_yang + * @date: 2023/10/17 10:57 + * @param: [data] + * @return: void + **/ + @Override + public void partInformationSave(PartInformationEntity data) { + // 获取材料编码 + String partNo = partInformationMapper.getPartNo(data); + data.setPartNo("P" + partNo); + partInformationMapper.insert(data); + } +} diff --git a/src/main/java/com/spring/modules/part/vo/PartInformationVo.java b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java new file mode 100644 index 00000000..37842939 --- /dev/null +++ b/src/main/java/com/spring/modules/part/vo/PartInformationVo.java @@ -0,0 +1,42 @@ +package com.spring.modules.part.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.spring.modules.part.entity.PartInformationEntity; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +public class PartInformationVo extends PartInformationEntity { + + /** + * 类型名称 + **/ + private String familyName; + /** + * 分组名称 + **/ + private String groupName; + /** + * 供应商名称 + **/ + private String supplierName; + /** + * 制造商名称 + **/ + private String manufacturerName; + /** + * 要求完成日期(开始) + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date startDate; + /** + * 要求完成日期(结束) + **/ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endDate; + +} diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml new file mode 100644 index 00000000..a75ed0b6 --- /dev/null +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + DELETE FROM sys_oss + + order_ref1 = #{orderRef1} and order_ref2 = #{orderRef2} + + AND file_name = #{fileName} + + + + +