From baff72c8ef5193514f0b23354977e417c81bfa7d Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 16 Apr 2024 16:05:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=AF=E5=BC=8F=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/constant/Constant.java | 2 +- .../purchase/PurApplyController.java | 14 +++- .../purchase/PurOrderController.java | 17 ++-- .../purchase/PurOrderReceiveController.java | 77 ++++++++++++++++++- .../purchase/PurPlanController.java | 16 ++-- .../req/inout/AddReceiveDetailRequest.java | 1 + .../AddDetailByWarlockBagRequest.java | 15 ++++ .../api/res/basic/UdiRelevanceResponse.java | 2 + .../impl/IoOrderDetailBizServiceImpl.java | 4 +- .../purchase/impl/PurApplyDetailService.java | 31 +++++++- .../purchase/impl/PurOrderDetailService.java | 34 +++++++- .../purchase/impl/PurPlanDetailService.java | 31 +++++++- .../mapper/basic/BasicDestinyRelMapper.xml | 1 + src/main/resources/schemas/schema_v2.4.sql | 2 +- 14 files changed, 221 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/purchase/AddDetailByWarlockBagRequest.java diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index e7cc521aa..902d7c91d 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -324,5 +324,5 @@ public class Constant { */ public static final Integer SK_PRO_DSB_TYPE = 1;//1：定数包，内部使用 public static final Integer SK_PRO_THR_TYPE = 2;//2：项目、组套外部关联 - public static final Integer SK_PRO_SS_TYPE = 3;//3：术士组套 + public static final Integer SK_PRO_SS_TYPE = 3;//3：术式组套 } 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 e8909a5a7..5bd4c002c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -1,12 +1,12 @@ package com.glxp.api.controller.purchase; +import com.glxp.api.req.purchase.AddDetailByWarlockBagRequest; import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.purchase.impl.PurApplyDetailService; import com.glxp.api.service.purchase.impl.PurApplyService; import com.glxp.api.service.purchase.impl.PurOrderDetailService; import com.glxp.api.service.purchase.impl.PurPlanDetailService; import com.glxp.api.service.system.SystemParamConfigService; -import com.glxp.api.util.IntUtil; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -39,7 +39,6 @@ import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -571,4 +570,15 @@ public class PurApplyController { } + /** + * 新增申购单 + */ + @RepeatSubmit() + @PostMapping("/purchase/apply/addDetailByWarlockBag") + public BaseResponse addDetailByWarlockBag(@RequestBody AddDetailByWarlockBagRequest addDetailByWarlockBagRequest) { + purApplyDetailService.addDetailByWarlockBag(addDetailByWarlockBagRequest); + return ResultVOUtils.success(addDetailByWarlockBagRequest.getOrderIdFk()); + } + + } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 9de8c1ced..eeb4e4b8a 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import com.glxp.api.req.purchase.*; import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.purchase.impl.PurOrderDetailService; import com.glxp.api.service.purchase.impl.PurPlanDetailService; @@ -19,10 +20,6 @@ import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.req.purchase.PostPurOrderRequest; -import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurOrderResponse; @@ -390,7 +387,7 @@ public class PurOrderController { /** - * 新增计划单 + * 新增采购订单 */ @AuthRuleAnnotation("") @PostMapping("/purchase/order/add") @@ -407,6 +404,16 @@ public class PurOrderController { return ResultVOUtils.success(id); } + /** + * 新增采购订单 + */ + @AuthRuleAnnotation("") + @PostMapping("/purchase/order/addDetailByWarlockBag") + public BaseResponse addDetailByWarlockBag(@RequestBody AddDetailByWarlockBagRequest addDetailByWarlockBagRequest) { + purOrderDetailService.addDetailByWarlockBag(addDetailByWarlockBagRequest); + return ResultVOUtils.success(addDetailByWarlockBagRequest.getOrderIdFk()); + } + /** * 删除申购单和详情 */ diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 815d20fe1..7fe280507 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -17,6 +17,7 @@ import com.glxp.api.controller.inv.InvPreProductController; import com.glxp.api.controller.inv.InvPreinProductController; import com.glxp.api.controller.inv.InvProductController; import com.glxp.api.dao.auth.InvWarehouseDao; +import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; @@ -27,15 +28,15 @@ import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.*; -import com.glxp.api.req.inout.AddReceiveDetailRequest; -import com.glxp.api.req.inout.FilterReceiveDetailRequest; -import com.glxp.api.req.inout.FilterReceiveRequest; -import com.glxp.api.req.inout.UpdateReceiveDetailRequest; +import com.glxp.api.exception.JsonException; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.inout.*; import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.req.purchase.purReceiveRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.res.inout.ReceiveResponse; import com.glxp.api.res.inv.InvPreProductResponse; @@ -119,6 +120,8 @@ public class PurOrderReceiveController extends BaseController { SysApprovalFlowService sysApprovalFlowService; @Resource SystemParamConfigService systemParamConfigService; + @Resource + BasicDestinyRelMapper basicDestinyRelMapper; final String type = "ly"; @@ -711,6 +714,72 @@ public class PurOrderReceiveController extends BaseController { } } + @AuthRuleAnnotation("") + @PostMapping("/udiwms/receive/detail/addWarlockBag") + public BaseResponse updateReceiveByWarlockBag(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + AuthAdmin authAdmin = getUser(); + String orderNo = addReceiveDetailRequest.getPurReceiveEntity().getBillNo(); + if (addReceiveDetailRequest.getPurReceiveEntity() == null) + return ResultVOUtils.error(500, "未指定订单"); + if (StringUtils.isEmpty(addReceiveDetailRequest.getBagId())) { + return ResultVOUtils.error(500, "未选择术式套包信息"); + }else { + String bagId = addReceiveDetailRequest.getBagId(); + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setDestinyId(bagId + ""); + filterUdiRelRequest.setDiType(1); + List list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); + if (CollUtil.isEmpty(list)) throw new JsonException("术式套包数据为空！"); + List datas = new ArrayList<>(); + list.forEach( x -> { + AddReceiveDetailRequest.DetaiData detaiData = new AddReceiveDetailRequest.DetaiData(); + detaiData.setRelId(x.getRelIdFk()); + detaiData.setSupId(x.getSupId()); + detaiData.setNameCode(x.getNameCode()); + detaiData.setPrice(x.getPrice()); + detaiData.setCount(x.getCount()); + datas.add(detaiData); + }); + addReceiveDetailRequest.setDatas(datas); + } + + if (CollUtil.isEmpty(addReceiveDetailRequest.getDatas())) { + return ResultVOUtils.error(500, "未选择产品信息"); + } + PurReceiveEntity purReceiveEntity = addReceiveDetailRequest.getPurReceiveEntity(); + if (StrUtil.isEmpty(purReceiveEntity.getBillNo())) { + InvWarehouseEntity curWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getInvCode()); + InvWarehouseEntity targetWarehouseEntity = invWarehouseService.findByInvSubByCode(purReceiveEntity.getTargetInvCode()); + orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); + purReceiveEntity.setBillNo(orderNo); + purReceiveEntity.setCreateUser(authAdmin.getId() + ""); + purReceiveEntity.setCreateTime(new Date()); + purReceiveEntity.setStatus(1); + purReceiveEntity.setDeptCode(curWarehouseEntity.getParentId()); + purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId()); + receiveService.insertOrder(purReceiveEntity); + } + for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) { + + PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity(); + purReceiveDetailEntity.setOrderIdFk(purReceiveEntity.getBillNo()); + purReceiveDetailEntity.setNameCode(detaiData.getNameCode()); + purReceiveDetailEntity.setExpireDate(detaiData.getExpireDate()); + purReceiveDetailEntity.setProductDate(detaiData.getProductDate()); + purReceiveDetailEntity.setRelIdFk(detaiData.getRelId()); + purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo()); + purReceiveDetailEntity.setPrice(detaiData.getPrice()); + purReceiveDetailEntity.setSupId(detaiData.getSupId()); + receivedetailService.insert(purReceiveDetailEntity); + } + purReceiveEntity.setUpdateTime(new Date()); + receiveService.updateOrder(purReceiveEntity); + return ResultVOUtils.success(orderNo); + } + public Date timeProcess(Date date, Integer timeCount) { Calendar rightNow = Calendar.getInstance(); 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 9227c1261..e55905d59 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import com.glxp.api.req.purchase.*; import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.purchase.impl.PurApplyDetailService; import com.glxp.api.service.purchase.impl.PurApplyService; @@ -21,10 +22,6 @@ import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.purchase.*; -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; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurPlanResponse; @@ -37,7 +34,6 @@ import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -521,6 +517,16 @@ public class PurPlanController { return ResultVOUtils.success(id); } + /** + * 新增计划单 + */ + @AuthRuleAnnotation("") + @PostMapping("/purchase/plan/addDetailByWarlockBag") + public BaseResponse addDetailByWarlockBag(@RequestBody AddDetailByWarlockBagRequest addDetailByWarlockBagRequest) { + purPlanDetailService.addDetailByWarlockBag(addDetailByWarlockBagRequest); + return ResultVOUtils.success(addDetailByWarlockBagRequest.getOrderIdFk()); + } + /** * 删除申购单和详情 */ diff --git a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java index 153000785..2e434d0da 100644 --- a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java @@ -12,6 +12,7 @@ public class AddReceiveDetailRequest { PurReceiveEntity purReceiveEntity; List datas; + String bagId; @Data public static class DetaiData { diff --git a/src/main/java/com/glxp/api/req/purchase/AddDetailByWarlockBagRequest.java b/src/main/java/com/glxp/api/req/purchase/AddDetailByWarlockBagRequest.java new file mode 100644 index 000000000..4f0436da1 --- /dev/null +++ b/src/main/java/com/glxp/api/req/purchase/AddDetailByWarlockBagRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.req.purchase; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +@Data +public class AddDetailByWarlockBagRequest { + + @NotEmpty(message = "orderIdFk不可以为空！") + private String orderIdFk; + + @NotEmpty(message = "术式套包id不可以为空！") + private String bagId; +} diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 5f7394cc5..22ab57751 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -163,6 +163,8 @@ public class UdiRelevanceResponse { private String supId; + private Long relIdFk; + /** * 一级分类名称(学科，品名） diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 3724ab58d..11ac5c721 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -205,7 +205,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { // boolean isVailCert = systemParamConfigEntity.getParamValue().equals("1") ? true : false; AuthAdmin authAdmin = customerService.getUserBean(); if (addWarlockBagProductReqeust.getId() == null ) - throw new JsonException("未选择术士组套信息"); + throw new JsonException("未选择术式组套信息"); if (addWarlockBagProductReqeust.getOrderEntity() == null) throw new JsonException(500, "未指定订单"); IoOrderEntity orderEntity = addWarlockBagProductReqeust.getOrderEntity(); @@ -240,7 +240,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { filterUdiRelRequest.setDestinyId(pId + ""); filterUdiRelRequest.setDiType(1); List list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); - if (CollUtil.isEmpty(list)) throw new JsonException("术士套包数据为空！"); + if (CollUtil.isEmpty(list)) throw new JsonException("术式套包数据为空！"); List datas = new ArrayList<>(); list.forEach( x -> { AddBizProductReqeust addBizProductReqeust = new AddBizProductReqeust(); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java index d9913e848..8b1ba5065 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java @@ -2,11 +2,13 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.inv.InvProductRationMapper; +import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.dao.purchase.PurApplyDetailDao; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.purchase.PurApplyDetailEntity; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.purchase.AddDetailByWarlockBagRequest; import com.glxp.api.req.purchase.PurApplyDetailRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +24,8 @@ public class PurApplyDetailService extends ServiceImpl queryPageList(PurApplyDetailRequest purApplyRequest) { @@ -104,4 +108,27 @@ public class PurApplyDetailService extends ServiceImpl list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); + + if (list.size() != 0) { + for (UdiRelevanceResponse item : list) { + PurApplyDetailEntity purApplyDetailEntity = new PurApplyDetailEntity(); + purApplyDetailEntity.setOrderIdFk(orderIdFk); + purApplyDetailEntity.setProductId(item.getRelIdFk()); + purApplyDetailEntity.setProductName(item.getCpmctymc()); + purApplyDetailEntity.setCount(item.getCount()); + purApplyDetailEntity.setSupId(item.getSupId()); + purApplyDetailEntity.setZczbhhzbapzbh(item.getZczbhhzbapzbh()); + purApplyDetailDao.insert(purApplyDetailEntity); + } + } + + } } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java index bf152441c..859298305 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java @@ -2,13 +2,15 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.inv.InvProductRationMapper; +import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.dao.purchase.PurOrderDetailDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.purchase.AddDetailByWarlockBagRequest; import com.glxp.api.req.purchase.PurOrderDetailRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,6 +25,8 @@ public class PurOrderDetailService extends ServiceImpl joinQueryList(PurOrderDetailRequest purOrderDetailRequest) { @@ -109,4 +113,30 @@ public class PurOrderDetailService extends ServiceImpl selectsupList(PurOrderDetailEntity purOrderDetailEntity) { return purOrderDetailDao.selectsupList(purOrderDetailEntity); } + + public void addDetailByWarlockBag(AddDetailByWarlockBagRequest addDetailByWarlockBagRequest) { + String bagId = addDetailByWarlockBagRequest.getBagId(); + String orderIdFk = addDetailByWarlockBagRequest.getOrderIdFk(); + + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setDestinyId(bagId + ""); + filterUdiRelRequest.setDiType(1); + List list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); + + if (list.size() != 0) { + for (UdiRelevanceResponse item : list) { + PurOrderDetailEntity purOrderDetailEntity = new PurOrderDetailEntity(); + purOrderDetailEntity.setOrderIdFk(orderIdFk); + purOrderDetailEntity.setProductId(item.getRelIdFk()); + purOrderDetailEntity.setProductName(item.getCpmctymc()); + purOrderDetailEntity.setCount(item.getCount()); + purOrderDetailEntity.setSupId(item.getSupId()); + purOrderDetailEntity.setPrice(item.getPrice()); + purOrderDetailEntity.setSupName(item.getSupName()); + purOrderDetailEntity.setZczbhhzbapzbh(item.getZczbhhzbapzbh()); + purOrderDetailDao.insert(purOrderDetailEntity); + } + } + + } } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java index e654fa199..3c73067a6 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java @@ -2,12 +2,14 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.inv.InvProductRationMapper; +import com.glxp.api.dao.basic.BasicDestinyRelMapper; import com.glxp.api.dao.purchase.PurPlanDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inv.InvProductRationEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.purchase.AddDetailByWarlockBagRequest; import com.glxp.api.req.purchase.PurPlanDetailRequest; +import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,6 +24,8 @@ public class PurPlanDetailService extends ServiceImpl joinQueryList(PurPlanDetailRequest purApplyRequest) { @@ -104,4 +108,27 @@ public class PurPlanDetailService extends ServiceImpl list = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest); + + if (list.size() != 0) { + for (UdiRelevanceResponse item : list) { + PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity(); + purPlanDetailEntity.setOrderIdFk(orderIdFk); + purPlanDetailEntity.setProductId(item.getRelIdFk()); + purPlanDetailEntity.setProductName(item.getCpmctymc()); + purPlanDetailEntity.setCount(item.getCount()); + purPlanDetailEntity.setSupId(item.getSupId()); + purPlanDetailEntity.setZczbhhzbapzbh(item.getZczbhhzbapzbh()); + purPlanDetailDao.insert(purPlanDetailEntity); + } + } + + } } diff --git a/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml index 7cd097547..95f52c166 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml @@ -210,6 +210,7 @@ resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> SELECT company_product_relevance.price, basic_udirel.*, + basic_udirel.id AS relIdFk, basic_products.id AS PRId, basic_products.originUuid, basic_products.nameCode, diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 6285ac724..66e036a7b 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2024,4 +2024,4 @@ CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'deptCode', INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) - VALUES (2093, '术士套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL); + VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL);