diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 0d520605a..ba1431c84 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -85,6 +85,53 @@ public class UdiRlSupController extends BaseController { } } + companyProductRelevanceRequest.setIsDisable(false); + if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode()); + if (udiEntity != null) { + companyProductRelevanceRequest.setNameCode(udiEntity.getUdi()); + companyProductRelevanceRequest.setUnionCode(udiEntity.getUdi()); + } + } + //如果输入DI标识，精确找到不同层级对应的产品信息 + if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) { + FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest(); + filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode()); + List temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (temps != null && temps.size() > 0) { + companyProductRelevanceRequest.setOriginUuid(temps.get(0).getOriginUuid()); + companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode()); + companyProductRelevanceRequest.setUnionCode(null); + } + } else { + //只查找主标识产品信息 + companyProductRelevanceRequest.setDiType(1); + } + List basicInstrumentMaintainRelevanceResponses = null; + basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses); + + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("/sale/info/company/product/plan/relevance/filter") + public BaseResponse filterCompanyProductPlanRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getCustomerId())) { + String customerId = getCustomerId(); + if (customerId.equals("110")) { + companyProductRelevanceRequest.setCustomerId(null); + } + } + companyProductRelevanceRequest.setIsDisable(false); if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) { UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode()); diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index b060784a8..c7dc6c2cb 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -170,10 +170,10 @@ public class IoPurChangeService { purApplyEntity1.setGeneratePlan(true); purApplyService.update(purApplyEntity1); } - if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { - purApplyGen(purApplyEntity); - System.out.println("6666666666666666666999999999999999"); - } +// if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) { +// purApplyGen(purApplyEntity); +// System.out.println("6666666666666666666999999999999999"); +// } } } 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 38ad56e2b..2e30da22a 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -1,6 +1,8 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.RepeatSubmit; @@ -8,10 +10,9 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.entity.basic.BasicCorpEntity; -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.entity.inv.InvProductDetailEntity; +import com.glxp.api.entity.purchase.*; +import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.req.purchase.PostPurOrderRequest; import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.req.purchase.PurOrderRequest; @@ -34,10 +35,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @@ -82,7 +80,7 @@ public class PurOrderController { Long userId = customerService.getUserId(); PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity(); - + Long id=purOrderEntity.getId(); purOrderEntity.setCreateUser(userId + ""); purOrderEntity.setCreateTime(new Date()); purOrderEntity.setUpdateTime(new Date()); @@ -97,7 +95,29 @@ public class PurOrderController { if (purOrderEntity.getId() == null) { purOrderService.insert(purOrderEntity); } else { - purOrderService.update(purOrderEntity); + List purOrderDetailEntityList = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); + //判断是不是存在同一个供应商产品 + Map> purOrderDetailMap = purOrderDetailEntityList.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); + if (purOrderDetailMap.size() > 1) { + for (String key : purOrderDetailMap.keySet()) { + List purOrderDetailEntities = purOrderDetailMap.get(key); + PurOrderEntity purOrderEntity1 = new PurOrderEntity(); + purOrderEntity1 = purOrderEntity; + purOrderEntity1.setId(null); + purOrderEntity1.setSupId(key); + purOrderEntity1.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"))); + purOrderService.insert(purOrderEntity1); + for (PurOrderDetailEntity purOrderDetailEntity : purOrderDetailEntities) { + purOrderDetailEntity.setId(null); + purOrderDetailEntity.setOrderIdFk(purOrderEntity1.getId() + ""); + } + purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailMap.get(key)); + } + purOrderService.deleteById(id); + purOrderDetailService.deleteByOrderId(id + ""); + } else { + purOrderService.update(purOrderEntity); + } } return ResultVOUtils.success("提交成功！"); @@ -368,6 +388,11 @@ public class PurOrderController { @RepeatSubmit() @PostMapping("/purchase/order/updateDetail") public BaseResponse detailEdit(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { + + if (StrUtil.isBlank(purOrderDetailEntity.getSupId())) { + purOrderDetailEntity.setSupId(purOrderDetailEntity.getSupName()); + } + purOrderDetailService.update(purOrderDetailEntity); return ResultVOUtils.success("修改成功"); } @@ -387,13 +412,14 @@ public class PurOrderController { /** * 查询产品供应商 + * * @param purOrderDetailEntity * @return */ @PostMapping("/purchase/order/filterSupList") - public BaseResponse filterSupList(@RequestBody PurOrderDetailEntity purOrderDetailEntity){ + public BaseResponse filterSupList(@RequestBody PurOrderDetailEntity purOrderDetailEntity) { - List selectsupList=purOrderDetailService.selectsupList(purOrderDetailEntity); + List selectsupList = purOrderDetailService.selectsupList(purOrderDetailEntity); return ResultVOUtils.success(selectsupList); } diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java index 1628f411c..68ce2d74c 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java @@ -53,6 +53,9 @@ public class PurOrderDetailEntity { @TableField(value = "zczbhhzbapzbh") private String zczbhhzbapzbh; + @TableField(exist = false) + private String supName; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk";