From afd057cc1444419fcb1e0c50602b53bfaf7a3558 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Tue, 12 Nov 2024 11:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bases/controller/PaTypeController.java | 13 +++++++ .../bases/controller/PartInputController.java | 17 ++++++--- .../bases/entity/PartInputDetails.java | 6 ++++ .../business/bases/entity/PartInputVo.java | 5 +++ .../gzgqj/business/bases/entity/VendVo.java | 30 ++++++++++++++++ .../business/bases/mapper/PaTypeMapper.java | 13 +++++++ .../business/bases/service/PaTypeService.java | 3 ++ .../bases/service/PaTypeServiceImpl.java | 36 ++++++++++++++----- .../bases/service/PartInputService.java | 11 ++++++ .../bases/service/PartInputServiceImpl.java | 27 ++++++++++++++ .../resources/mappers/bases/PaTypeMapper.xml | 7 +++- 11 files changed, 153 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/bonus/gzgqj/business/bases/entity/VendVo.java diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java index 72684be..09bfcd0 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PaTypeController.java @@ -2,6 +2,7 @@ package com.bonus.gzgqj.business.bases.controller; import com.bonus.gzgqj.business.bases.entity.PaTypeVo; import com.bonus.gzgqj.business.bases.entity.PartInputVo; +import com.bonus.gzgqj.business.bases.entity.VendVo; import com.bonus.gzgqj.business.bases.service.PaTypeService; import com.bonus.gzgqj.business.plan.entity.PlanApplyAuditBean; import com.bonus.gzgqj.manager.annotation.DecryptAndVerify; @@ -88,4 +89,16 @@ public class PaTypeController { return pageInfo; } + + /** + * 厂家下拉选 + * @param dto + * @return + */ + @GetMapping("getVendList") + @DecryptAndVerify(decryptedClass = VendVo.class) + public ServerResponse getVendList(EncryptedReq dto) { + return service.getVendList(dto.getData()); + } + } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java index 20a5911..149c536 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java @@ -5,14 +5,15 @@ import com.bonus.gzgqj.business.bases.service.PartInputService; import com.bonus.gzgqj.business.plan.entity.PlanApplyBean; import com.bonus.gzgqj.manager.annotation.DecryptAndVerify; import com.bonus.gzgqj.manager.core.entity.EncryptedReq; +import com.bonus.gzgqj.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -42,8 +43,14 @@ public class PartInputController { } - - + /** + * 配件入库接口 + * @return + */ + @PostMapping("addInputData") + public ServerResponse addInputData(HttpServletRequest request, @RequestParam("file[]") MultipartFile[] files) { + return service.addInputData(request,files); + } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputDetails.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputDetails.java index bb61bfc..8c5e9fc 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputDetails.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputDetails.java @@ -52,4 +52,10 @@ public class PartInputDetails { * 配件类型 */ private String partmodel; + + /** + * 配件类型 + */ + private String partUnit; + } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java index 33ba76d..503289c 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java @@ -3,6 +3,8 @@ package com.bonus.gzgqj.business.bases.entity; import lombok.Data; import org.apache.poi.hpsf.Decimal; +import java.util.List; + /** * @author 黑子 * 入库管理 @@ -72,4 +74,7 @@ public class PartInputVo { */ private String keyWord; + + private List details; + } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/VendVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/VendVo.java new file mode 100644 index 0000000..d3e9734 --- /dev/null +++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/VendVo.java @@ -0,0 +1,30 @@ +package com.bonus.gzgqj.business.bases.entity; + +import lombok.Data; + +/** + * @author 黑子 + * 厂家 + */ +@Data +public class VendVo { + + private String id; + /** + * 名称 + */ + private String name; + /** + * 地址 + */ + private String address; + + + private String companyMan; + /** + * 手机号 + */ + private String phone; + + +} diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java index 0d2b4a8..4f2a42f 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PaTypeMapper.java @@ -1,6 +1,7 @@ package com.bonus.gzgqj.business.bases.mapper; import com.bonus.gzgqj.business.bases.entity.PaTypeVo; +import com.bonus.gzgqj.business.bases.entity.VendVo; import io.lettuce.core.dynamic.annotation.Param; import org.springframework.stereotype.Repository; @@ -52,5 +53,17 @@ public interface PaTypeMapper { */ int getActByName(PaTypeVo data); + /** + * 分页查询 配件 + * @param data + * @return + */ List findByPage(PaTypeVo data); + + /** + * 差价下拉选 + * @param data + * @return + */ + List getVendList(VendVo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java index cb6824f..88e9792 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeService.java @@ -1,6 +1,7 @@ package com.bonus.gzgqj.business.bases.service; import com.bonus.gzgqj.business.bases.entity.PaTypeVo; +import com.bonus.gzgqj.business.bases.entity.VendVo; import com.bonus.gzgqj.manager.webResult.ServerResponse; import lombok.extern.slf4j.Slf4j; @@ -45,4 +46,6 @@ public interface PaTypeService { * @return */ List findByPage(PaTypeVo data); + + ServerResponse getVendList(VendVo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java index 2a0374e..feeb845 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PaTypeServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.gzgqj.business.bases.service; import com.bonus.gzgqj.business.bases.entity.PaTypeVo; +import com.bonus.gzgqj.business.bases.entity.VendVo; import com.bonus.gzgqj.business.bases.mapper.PaTypeMapper; import com.bonus.gzgqj.manager.webResult.ServerResponse; import lombok.extern.slf4j.Slf4j; @@ -61,19 +62,20 @@ public class PaTypeServiceImpl implements PaTypeService{ } data.setLevel(level); } - int nums=mapper.getActByName(data); - if(nums>0){ - return ServerResponse.createErroe("该节点名称已存在"); + } + int nums=mapper.getActByName(data); + if(nums>0){ + return ServerResponse.createErroe("该节点名称已存在"); + }else{ + int num= mapper.addTypeData(data); + if(num>0){ + return ServerResponse.createSuccess("添加成功",data); }else{ - int num= mapper.addTypeData(data); - if(num>0){ - return ServerResponse.createSuccess("添加成功",data); - }else{ - return ServerResponse.createErroe("添加失败"); - } + return ServerResponse.createErroe("添加失败"); } } + }catch (Exception e){ log.error(e.toString(),e); } @@ -156,5 +158,21 @@ public class PaTypeServiceImpl implements PaTypeService{ return list; } + /** + * 查询厂家下拉选 + * @param data + * @return + */ + @Override + public ServerResponse getVendList(VendVo data) { + List list=new ArrayList<>(); + try{ + list=mapper.getVendList(data); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createSuccess(list); + } + } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java index b37ff1e..fe00c31 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java @@ -1,7 +1,10 @@ package com.bonus.gzgqj.business.bases.service; import com.bonus.gzgqj.business.bases.entity.PartInputVo; +import com.bonus.gzgqj.manager.webResult.ServerResponse; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -14,4 +17,12 @@ public interface PartInputService { * @return */ List findByPage(PartInputVo data); + + /** + * 配件入库接口 + * @param request + * @param files + * @return + */ + ServerResponse addInputData(HttpServletRequest request, MultipartFile[] files); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java index e2f0348..b4a785f 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java @@ -1,12 +1,17 @@ package com.bonus.gzgqj.business.bases.service; +import com.alibaba.fastjson.JSON; import com.bonus.gzgqj.business.bases.entity.PartInputVo; import com.bonus.gzgqj.business.bases.mapper.PartInputMapper; +import com.bonus.gzgqj.business.plan.entity.ProOutInfoVo; import com.bonus.gzgqj.manager.common.util.StringHelper; +import com.bonus.gzgqj.manager.webResult.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; @@ -40,4 +45,26 @@ public class PartInputServiceImpl implements PartInputService{ } return list; } + + /** + * 配件入库接口 + * @param request + * @param files + * @return + */ + @Override + public ServerResponse addInputData(HttpServletRequest request, MultipartFile[] files) { + try{ + String params=request.getParameter("params"); + PartInputVo vo= JSON.parseObject(params,PartInputVo.class); + + + + + + }catch (Exception e){ + + } + return null; + } } diff --git a/src/main/resources/mappers/bases/PaTypeMapper.xml b/src/main/resources/mappers/bases/PaTypeMapper.xml index 4b87a35..72f4aad 100644 --- a/src/main/resources/mappers/bases/PaTypeMapper.xml +++ b/src/main/resources/mappers/bases/PaTypeMapper.xml @@ -42,7 +42,7 @@ + \ No newline at end of file