From 2099d8d4aa4edf0f664080337bc13b4763e3eb3b Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 9 Aug 2022 18:10:51 +0800 Subject: [PATCH] update --- .../pms/controller/PmsOrderController.java | 24 +++++++++++++++---- .../modules/pms/entity/PmsProductProcess.java | 2 +- .../pms/service/PmsProductProcessService.java | 6 ++++- .../impl/PmsProductProcessServiceImpl.java | 17 +++++++++++++ 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java index 00fe1b2..02c375b 100644 --- a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java +++ b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java @@ -119,24 +119,38 @@ public class PmsOrderController { PmsProduct pmsProduct = pmsProductService.getById(productBo.getProductId()); PmsOrderProduct orderProduct = productBo.getOrderProductSn()==null?new PmsOrderProduct():pmsOrderProductService.getById(productBo.getOrderProductSn()); CopierUtil.copy(productBo, orderProduct); - boolean isUpdateProduct = StringUtils.hasText(orderProduct.getOrderProductSn()); orderProduct.setOrderId(order.getId()); orderProduct.setOrderCode(order.getCode()); - if(isUpdateProduct){ + if(StringUtils.hasText(orderProduct.getOrderProductSn())){ + pmsOrderProductService.updateById(orderProduct); + }else { orderProduct.setOrderProductSn(""+IdUtil.getSnowFlakeId()); pmsOrderProductService.save(orderProduct); - }else { - pmsOrderProductService.updateById(orderProduct); } if(CollectionUtil.isEmpty(productBo.getProcessList())){ for (PmsOrderProcessBo processBo : productBo.getProcessList()) { PmsProcess pmsProcess = pmsProcessService.getById(processBo.getProcessId()); PmsOrderProcess orderProcess = CopierUtil.copy(processBo,new PmsOrderProcess()); + PmsProductProcess pmsProductProcess = pmsProductProcessService.getOne(productBo.getProductId(), processBo.getProcessId()); orderProcess.setOrderId(order.getId()); orderProcess.setProductId(pmsProduct.getId()); orderProcess.setProcessName(pmsProcess.getName()); orderProcess.setProcessCode(pmsProcess.getCode()); - //orderProcess.setProcessPrice(); + orderProcess.setProcessPrice(pmsProductProcess.getPrice()); + boolean isUpdateOrderProcess = false; + if(StringUtils.hasText(orderProcess.getOrderProcessSn())){ + PmsOrderProcess dbProdProcess = pmsOrderProcessService.getById(orderProcess.getOrderProcessSn()); + if(dbProdProcess!=null){ + isUpdateOrderProcess = true; + } + }else { + orderProcess.setOrderProcessSn(""+IdUtil.getSnowFlakeId()); + } + if (isUpdateOrderProcess){ + pmsOrderProcessService.updateById(orderProcess); + }else { + pmsOrderProcessService.save(orderProcess); + } } } } diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsProductProcess.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsProductProcess.java index e5fab85..a725ae4 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/PmsProductProcess.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/PmsProductProcess.java @@ -45,7 +45,7 @@ public class PmsProductProcess implements Serializable { /** 产品默认价格 */ @NotNull(message = "产品默认价格不能为空") - private BigDecimal defaultPrice; + private BigDecimal price; /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") diff --git a/src/main/java/com/qs/serve/modules/pms/service/PmsProductProcessService.java b/src/main/java/com/qs/serve/modules/pms/service/PmsProductProcessService.java index dbdec98..a28154b 100644 --- a/src/main/java/com/qs/serve/modules/pms/service/PmsProductProcessService.java +++ b/src/main/java/com/qs/serve/modules/pms/service/PmsProductProcessService.java @@ -2,7 +2,7 @@ package com.qs.serve.modules.pms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.pms.entity.PmsProductProcess; - +import java.util.List; /** * 产品工序 服务接口 * @author YenHex @@ -10,5 +10,9 @@ import com.qs.serve.modules.pms.entity.PmsProductProcess; */ public interface PmsProductProcessService extends IService { + PmsProductProcess getOne(String productId,String processId); + + List getByProductId(String productId); + } diff --git a/src/main/java/com/qs/serve/modules/pms/service/impl/PmsProductProcessServiceImpl.java b/src/main/java/com/qs/serve/modules/pms/service/impl/PmsProductProcessServiceImpl.java index 472124c..47baf48 100644 --- a/src/main/java/com/qs/serve/modules/pms/service/impl/PmsProductProcessServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/pms/service/impl/PmsProductProcessServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.pms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -8,6 +9,8 @@ import com.qs.serve.modules.pms.entity.PmsProductProcess; import com.qs.serve.modules.pms.service.PmsProductProcessService; import com.qs.serve.modules.pms.mapper.PmsProductProcessMapper; +import java.util.List; + /** * 产品工序 服务实现类 * @author YenHex @@ -18,5 +21,19 @@ import com.qs.serve.modules.pms.mapper.PmsProductProcessMapper; @AllArgsConstructor public class PmsProductProcessServiceImpl extends ServiceImpl implements PmsProductProcessService { + @Override + public PmsProductProcess getOne(String productId, String processId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(PmsProductProcess::getProcessId,processId); + lqw.eq(PmsProductProcess::getProductId,productId); + return getOne(lqw); + } + + @Override + public List getByProductId(String productId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(PmsProductProcess::getProductId,productId); + return list(lqw); + } }