From a793904a4cb3b9e00c18e957d32e9f25632674d8 Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Fri, 28 Apr 2023 12:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E8=BD=AC?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PoundlistController.java | 52 +++++-------------- .../poundlist/mapper/PoundlistMapper.java | 2 + .../model/poundlist/PoundlistPagination.java | 2 +- .../poundlist/service/PoundlistService.java | 2 + .../service/impl/PoundlistServiceImpl.java | 5 ++ .../mapper/poundlist/PoundlistMapper.xml | 14 +++++ 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 4414440f..98b01ec1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -100,51 +100,27 @@ public class PoundlistController { /** * 生成销售 * - * @param ids + * @param poundlistPagination * @return */ - @PostMapping("/createsale/{ids}") - public ActionResult createSale(@PathVariable("ids") String ids) throws DataException { - String[] idList = ids.split(","); - List list = new ArrayList<>(); - for (String allId : idList){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PoundlistEntity::getId,allId); - queryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1"); - queryWrapper.lambda().eq(PoundlistEntity::getSalesStatus,"99"); - PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper); - if (ObjectUtils.isNotEmpty(poundlistEntity)) { - ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId()); - if (ObjectUtils.isNotEmpty(entity) && StringUtils.isNotEmpty(entity.getContractNo())) { - poundlistEntity.setContractNo(entity.getContractNo()); - poundlistEntity.setContractName(entity.getContractName()); - } - CustomerEntity customerEntity = customerService.getInfo(poundlistEntity.getCustomerId()); - if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ - poundlistEntity.setCustomerName(customerEntity.getSupplierNm()); - } - VehicleEntity vehicleEntity = vehicleService.getInfo(poundlistEntity.getVehicleId()); - if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ - poundlistEntity.setVehicleName(vehicleEntity.getTicketno()); - } - MaterialEntity materialEntity = materialService.getInfo(poundlistEntity.getMaterialId()); - if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ - poundlistEntity.setMaterialName(materialEntity.getItemName()); - } - poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); - poundlistEntity.setRate("0"); - if (poundlistEntity.getSalesPrice()!=null) { - poundlistEntity.setUnitPrice(poundlistEntity.getSalesPrice()); - } - list.add(poundlistEntity); + @PostMapping("/createsale") + public ActionResult createSale(@RequestBody PoundlistPagination poundlistPagination) throws DataException { + List idList = Arrays.asList(poundlistPagination.getIds().split(",")); + //List list = new ArrayList<>(); + List list = poundlistService.queryCreateSale(idList); + for (PoundlistEntity poundlistEntity : list){ + poundlistEntity.setRate("0"); + if (poundlistEntity.getSalesPrice()!=null) { + poundlistEntity.setUnitPrice(poundlistEntity.getSalesPrice()); } - } - for (PoundlistEntity list1: list){ - String sts = list1.getPurchaseStatus(); + String sts = poundlistEntity.getPurchaseStatus(); if (sts.equals("0")||sts.equals("1")||sts.equals("99")){ return ActionResult.fail("当前状态不能生成销售订单"); } } + if(list != null && list.size() > 0){ + list.get(0).setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); + } if (list.size() > 0) { long count = list.stream().map(PoundlistEntity::getSalesId).distinct().count(); if (count != 1) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java index af4adf91..3aca7e9f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java @@ -38,4 +38,6 @@ public interface PoundlistMapper extends BaseMapper { List queryPoundListByIdsRenkuan(@Param("poundlistIdList") List poundlistIdList, @Param("paymentdocId") String paymentdocId); List queryByKeywordNotPage(@Param("poundlistPagination") PoundlistPagination poundlistPagination, @Param("ew") Wrapper queryWrapper); + + List queryCreateSale(@Param("idList") List idList); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java index 6e52fefb..5121edfe 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java @@ -45,7 +45,7 @@ public class PoundlistPagination extends Pagination { private String purchaseStatus; private String salesStatus; - + private String ids; /** * 添加权限 */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java index f0abbae8..ad03563f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java @@ -61,4 +61,6 @@ public interface PoundlistService extends IService { Map importPreview(List personList); PoundlistImportVo importData(List dataList) throws ParseException, DataException; + + List queryCreateSale(List idList); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 94190066..9fb49639 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -474,6 +474,11 @@ public class PoundlistServiceImpl extends ServiceImpl queryCreateSale(List idList) { + return poundlistMapper.queryCreateSale(idList); + } + @Override public void delete(PoundlistEntity entity) { diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index d68f0ccc..59b7fcf1 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -287,4 +287,18 @@ WHERE a.delete_mark = 0 and ORDER BY ${poundlistPagination.sidx} ${poundlistPagination.sort} + + +