From 6a045c990129d22d81e383c52a6cfe9f26e8a6a4 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Fri, 23 Aug 2024 10:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=BB=91=E5=AE=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BpmPurchaseBindController.java | 17 +++++++++ .../BpmPurchaseStorageController.java | 2 +- .../bonus/purchase/dto/PurchaseBindDto.java | 37 +++++++++++++++++++ .../service/BpmPurchaseBindService.java | 3 ++ .../impl/BpmPurchaseBindServiceImpl.java | 18 +++++++++ .../bonus/purchase/vo/PurchaseAcceptVo.java | 19 ++++------ .../mapper/BpmPurchaseBindMapper.xml | 4 +- 7 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseBindDto.java diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseBindController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseBindController.java index f8da9bd..4aa6730 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseBindController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseBindController.java @@ -5,6 +5,7 @@ import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.purchase.domain.BpmPurchaseInfo; +import com.bonus.purchase.dto.PurchaseBindDto; import com.bonus.purchase.dto.PurchaseDto; import com.bonus.purchase.dto.PurchaseTaskDto; import com.bonus.purchase.service.BpmPurchaseBindService; @@ -14,6 +15,7 @@ import com.bonus.purchase.vo.PurchaseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import javax.validation.constraints.NotNull; import javax.validation.constraints.Positive; import java.util.List; @@ -56,4 +58,19 @@ public class BpmPurchaseBindController extends BaseController { return getDataTable(list); } + /** + * 新购管理--物资绑定 + * + * @param bindDto 新购设备DTO + * @return 新增结果 + */ + @PostMapping(value = "/addBind") + @RequiresPermissions("purchase:bpmPurchaseInfo:add") + public ResultBean addBind(@RequestBody PurchaseBindDto bindDto) { + + int res = this.bpmPurchaseBindService.addBind(bindDto); + + return ResultBean.toIsSuccess(1,"急急急"); + } + } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java index e6af133..554bb6d 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseStorageController.java @@ -26,7 +26,7 @@ import java.util.List; @RequestMapping("/purchase/store") public class BpmPurchaseStorageController extends BaseController { - @Autowired + private BpmPurchaseStorageService purchaseStorageService; @Autowired diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseBindDto.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseBindDto.java new file mode 100644 index 0000000..9e2352e --- /dev/null +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseBindDto.java @@ -0,0 +1,37 @@ +package com.bonus.purchase.dto; + +import com.bonus.purchase.domain.BpmPurchaseInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 新购模块查询传参类 + * @Author ma_sh + * @create 2024/8/19 17:50 + */ +@Data +public class PurchaseBindDto { + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "类型id") + private Integer typeId; + + @ApiModelProperty(value = "任务详细表dId") + private String detailId; + + @ApiModelProperty(value = "机具编号") + private String maCode; + + @ApiModelProperty(value = "出厂编号") + private String productionCode; + + @ApiModelProperty(value = "本次检验时间") + private String thisCheckTime; + + @ApiModelProperty(value="新购绑定设备列表") + private List dtoList; +} diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseBindService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseBindService.java index 86e1d3f..0928157 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseBindService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/BpmPurchaseBindService.java @@ -2,6 +2,7 @@ package com.bonus.purchase.service; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.purchase.domain.BpmPurchaseInfo; +import com.bonus.purchase.dto.PurchaseBindDto; import com.bonus.purchase.dto.PurchaseDto; import com.bonus.purchase.vo.PurchaseAcceptVo; import com.bonus.purchase.vo.PurchaseVo; @@ -17,4 +18,6 @@ public interface BpmPurchaseBindService { List selectManageList(PurchaseDto purchaseDto); List getDetailsList(PurchaseDto record); + + int addBind(PurchaseBindDto bindDto); } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseBindServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseBindServiceImpl.java index fa67f8f..bf297ee 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseBindServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.purchase.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.purchase.domain.BpmPurchaseInfo; +import com.bonus.purchase.dto.PurchaseBindDto; import com.bonus.purchase.dto.PurchaseDto; import com.bonus.purchase.mapper.BpmPurchaseAcceptMapper; import com.bonus.purchase.mapper.BpmPurchaseBindMapper; @@ -40,4 +41,21 @@ public class BpmPurchaseBindServiceImpl implements BpmPurchaseBindService { public List getDetailsList(PurchaseDto record) { return mapper.getDetailsList(record); } + + @Override + @Transactional(rollbackFor = Exception.class) + public int addBind(PurchaseBindDto bindDto) { + int res =0; + try{ + if(CollectionUtils.isNotEmpty(bindDto.getDtoList())){ + for(PurchaseBindDto dto:bindDto.getDtoList()){ + + } + } + }catch (Exception e){ + e.getMessage().toString(); + } + + return res; + } } diff --git a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java index c391a1e..cf047a5 100644 --- a/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseAcceptVo.java @@ -17,14 +17,17 @@ public class PurchaseAcceptVo { @ApiModelProperty(value="任务id") private Integer id; - + @ApiModelProperty(value="任务详细id") + private Integer detailId; + @ApiModelProperty(value="typeId") + private Integer typeId; @ApiModelProperty("物资名称") private String materialName; @ApiModelProperty("规格型号") - private String materialModel; + private String specificationCode; - @ApiModelProperty(value="单位名称") + @ApiModelProperty(value="单位") private String unitName; @ApiModelProperty(value="供应商名称") @@ -60,7 +63,8 @@ public class PurchaseAcceptVo { private Integer notaxPrice; @ApiModelProperty(value="税率") - private String taxRate; + @Excel(name = "税率") + private Integer taxRate; @ApiModelProperty(value="验收数量") @Excel(name = "验收数量") @@ -88,11 +92,4 @@ public class PurchaseAcceptVo { @ApiModelProperty(value="备注") @Excel(name = "备注") private String remark; - - @ApiModelProperty(value = "二级明细id") - private String purchaseId; - - @ApiModelProperty(value = "管理类型0是编码1计数") - private String manageType; - } diff --git a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseBindMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseBindMapper.xml index 7e45579..19efdc9 100644 --- a/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseBindMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseBindMapper.xml @@ -97,9 +97,11 @@