diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 20d463f73..f283dab14 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.RepeatSubmit; @@ -181,9 +182,9 @@ public class PurApplyController { purPlanEntity.setCreateTime(new Date()); purPlanEntity.setUpdateTime(new Date()); purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); - purPlanEntity.setApplyCreateBy(purApplyEntity.getCreateUser()); + purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser()); purPlanEntity.setApplyRemark(purApplyEntity.getRemark()); - purPlanEntity.setApplyAuditBy(purApplyEntity.getAuditUser()); + purPlanEntity.setApplyAuditUser(purApplyEntity.getAuditUser()); purPlanEntity.setRemark("申购科室：" + purApplyRequest.getTargetInvCode() + ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark()); purApplyEntity.setPlanBillNo(purPlanEntity.getBillNo()); @@ -326,4 +327,21 @@ public class PurApplyController { } + /** + * 新增申购单 + */ + @AuthRuleAnnotation("") + @PostMapping("/purchase/apply/delApplyDetailAll") + public BaseResponse delApplyDetailAll(@RequestBody PurApplyEntity purApplyEntity) { + + if(purApplyEntity.getId()!=null){ + purApplyService.deleteById(purApplyEntity.getId()); + purApplyDetailService.deleteByOrderId(purApplyEntity.getId() + "" ); + }else { + return ResultVOUtils.error(999,"参数有误！"); + } + return ResultVOUtils.success(); + } + + } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 5cf8a1898..2e2dea4dc 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -10,9 +10,12 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PostPurPlanRequest; +import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.PageSimpleResponse; @@ -21,6 +24,8 @@ import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.purchase.PurApplyDetailService; +import com.glxp.api.service.purchase.PurApplyService; import com.glxp.api.service.purchase.PurPlanDetailService; import com.glxp.api.service.purchase.PurPlanService; import com.glxp.api.util.GennerOrderUtils; @@ -33,6 +38,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; import java.util.*; +import java.util.stream.Collectors; /** @@ -46,14 +52,18 @@ import java.util.*; @RestController public class PurPlanController { -// -// @Resource -// PurPlanService purPlanService; -// @Resource -// PurPlanDetailService purPlanDetailService; -// -// @Resource -// CustomerService customerService; + + @Resource + PurPlanService purPlanService; + @Resource + PurApplyService purApplyService; + @Resource + PurApplyDetailService purApplyDetailService; + @Resource + PurPlanDetailService purPlanDetailService; + + @Resource + CustomerService customerService; // @Resource // GennerOrderUtils gennerOrderUtils; // @Resource @@ -108,25 +118,25 @@ public class PurPlanController { // } // // -// /** -// * 查询采购计划列表 -// */ -// @GetMapping("/purchase/plan/list") -// public BaseResponse list(PurPlanRequest purApplyRequest) { -// -// if (purApplyRequest.getStatus() == null) { -// purApplyRequest.setStatus(11); //查询未审核和草稿状态 -// } -// -// List purApplyEntities = purPlanService.queryPageList(purApplyRequest); -// PageInfo pageInfo; -// pageInfo = new PageInfo<>(purApplyEntities); -// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); -// pageSimpleResponse.setTotal(pageInfo.getTotal()); -// pageSimpleResponse.setList(purApplyEntities); -// return ResultVOUtils.success(pageSimpleResponse); -// -// } + /** + * 查询采购计划列表 + */ + @GetMapping("/purchase/plan/list") + public BaseResponse list(PurPlanRequest purApplyRequest) { + + if (purApplyRequest.getStatus() == null) { + purApplyRequest.setStatus(11); //查询未审核和草稿状态 + } + + List purApplyEntities = purPlanService.queryPageList(purApplyRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } // // // /** @@ -334,4 +344,56 @@ public class PurPlanController { // } + /** + * 添加申购单到采购单里面 + */ + @PostMapping("/purchase/plan/addPlanDetail") + public BaseResponse addPlanDetail(@RequestBody PurPlanRequest purApplyRequest) { + + if (purApplyRequest.getRId() == null && purApplyRequest.getId() == null) { + return ResultVOUtils.error(999,"参数错误！"); + } + + //查询申购单详情 + PurApplyDetailRequest purApplyDetailRequest=new PurApplyDetailRequest(); + purApplyDetailRequest.setOrderIdFk(purApplyRequest.getRId()); + List purApplyDetailEntityList=purApplyDetailService.selectPurApplyDetailList(purApplyDetailRequest); + //使用stream拷贝list + List purPlanDetailEntityList = purApplyDetailEntityList.stream() + .map(e-> { + PurPlanDetailEntity d = new PurPlanDetailEntity(); + BeanUtils.copyProperties(e, d); + return d; + }) + .collect(Collectors.toList()); + + for (PurPlanDetailEntity obj:purPlanDetailEntityList){ + obj.setOrderIdFk(purApplyRequest.getId()+""); + } + boolean falg= purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList); + if(falg){ + //查询申购单 + return ResultVOUtils.success("添加成功"); + + }else{ + return ResultVOUtils.success("添加失败"); + } + } + + /** + * 新增计划单 + */ + @AuthRuleAnnotation("") + @PostMapping("/purchase/plan/add") + public BaseResponse add() { + Long userId = customerService.getUserId(); + PurPlanEntity purPlanEntity= new PurPlanEntity(); + purPlanEntity.setCreateUser(userId + ""); + purPlanEntity.setCreateTime(new Date()); + purPlanEntity.setUpdateTime(new Date()); + purPlanEntity.setUpdateUser(userId + ""); + purPlanService.insert(purPlanEntity); + Long id=purPlanEntity.getId(); + return ResultVOUtils.success(id); + } } diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java index 177c07cc5..6c2f1f5eb 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java @@ -20,4 +20,6 @@ public interface PurApplyDao { Boolean deleteByIds(@Param("ids") List ids); + Boolean deleteById(@Param("id") long id); + } diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java index a65d230d0..91ade1187 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java @@ -1,6 +1,7 @@ package com.glxp.api.dao.purchase; +import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +23,6 @@ public interface PurPlanDetailDao { Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); + boolean insertPurPlanDetailEntity(@Param("datas") List purPlanDetailEntityList); + } diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index 9a811448b..30235e984 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -100,14 +100,14 @@ public class PurPlanEntity { /** * 申购人 */ - @TableField(value = "applyCreateBy") - private String applyCreateBy; + @TableField(value = "applyCreateUser") + private String applyCreateUser; /** * 申购审核人 */ - @TableField(value = "applyAuditBy") - private String applyAuditBy; + @TableField(value = "applyAuditUser") + private String applyAuditUser; /** * 申购说明 @@ -157,9 +157,9 @@ public class PurPlanEntity { public static final String COL_UPDATEUSER = "updateUser"; - public static final String COL_APPLYCREATEBY = "applyCreateBy"; + public static final String COL_APPLYCREATEUser = "applyCreateUser"; - public static final String COL_APPLYAUDITBY = "applyAuditBy"; + public static final String COL_APPLYAUDITUser = "applyAuditUser"; public static final String COL_APPLYREMARK = "applyRemark"; diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java index ac6b386fc..d0fa139d4 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java @@ -90,5 +90,7 @@ public class PurPlanRequest extends ListPageRequest { private String startDate; private String endDate; + private String rId; + } diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java index 57b005158..0d24693c6 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java @@ -25,4 +25,6 @@ public interface PurApplyDetailService { Boolean deleteByOrderId(String orderIdfK); + List selectPurApplyDetailList(PurApplyDetailRequest purApplyRequest); + } diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyService.java index 762abdcb1..39e47983c 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurApplyService.java @@ -17,4 +17,6 @@ public interface PurApplyService { Boolean update(PurApplyEntity purApplyRequest); Boolean deleteByIds(List ids); + + Boolean deleteById(long id); } diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java index e374ee96d..ec799c68c 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java @@ -23,4 +23,6 @@ public interface PurPlanDetailService { Boolean deleteByIds(List ids); Boolean deleteByOrderId(String orderIdfK); + + boolean insertPurPlanDetailEntity(List purPlanDetailEntityList); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index ad7b9ab02..aa1a103e2 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -76,4 +76,11 @@ public class PurApplyDetailImplService implements PurApplyDetailService { public Boolean deleteByOrderId(String orderIdfK) { return purApplyDetailDao.deleteByOrderId(orderIdfK); } + + @Override + public List selectPurApplyDetailList(PurApplyDetailRequest purApplyRequest) { + return purApplyDetailDao.queryPageList(purApplyRequest); + } + + } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java index 6dacfd265..48bfff77b 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java @@ -45,4 +45,9 @@ public class PurApplyServiceImpl implements PurApplyService { public Boolean deleteByIds(List ids) { return purApplyDao.deleteByIds(ids); } + + @Override + public Boolean deleteById(long id) { + return purApplyDao.deleteById(id); + } } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java index 0194b836e..e47cc7dec 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -71,4 +71,9 @@ public class PurPlanDetailServiceImpl implements PurPlanDetailService { return purPlanDetailDao.deleteByOrderId(orderIdfK); } + + @Override + public boolean insertPurPlanDetailEntity(List purPlanDetailEntityList) { + return purPlanDetailDao.insertPurPlanDetailEntity(purPlanDetailEntityList); + } } diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 2a9850722..cb1d65cfa 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -93,6 +93,11 @@ + + DELETE FROM pur_apply + WHERE id = #{id} + + diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index 227215284..2d15cc6e1 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -6,13 +6,18 @@