From b7c4fa8ba528fb9edff5e9b280f6d15d08ed2d82 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Mon, 17 Apr 2023 18:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=88=A4=E6=96=AD=E5=AE=A2?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ContractFileEntity.java | 4 + .../model/contractfile/ContractFileModel.java | 3 + .../service/impl/ContractFileServiceImpl.java | 150 +++++++++++++----- .../contractfile/ImportForm.vue | 1 + 4 files changed, 120 insertions(+), 38 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java index 810fb151..6378411e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/entity/ContractFileEntity.java @@ -144,6 +144,10 @@ public class ContractFileEntity { @TableField(exist = false) private String customerId; + //客户ID + @TableField(exist = false) + private String causeError; + @TableField(exist = false) private List saleorderitemList; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java index badb4cf7..68c6c2bc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java @@ -48,4 +48,7 @@ public class ContractFileModel { private String code; private String orgnizeId; private String departmentId; + + @Excel(name = "错误原因") + private String causeError; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java index 20513191..dea3c0ac 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java @@ -1,5 +1,7 @@ package jnpf.contractfile.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import jnpf.base.ActionResult; import jnpf.contractfile.entity.*; import jnpf.contractfile.mapper.ContractFileMapper; import jnpf.contractfile.model.contractfile.ContractFileModel; @@ -22,12 +24,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import jnpf.supplier.entity.SupplierEntity; import jnpf.supplier.mapper.SupplierMapper; +import jnpf.supplyProcessAnalysis.entity.ContractMEntity; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jnpf.util.*; +import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -412,8 +416,10 @@ public class ContractFileServiceImpl extends ServiceImpl dt) { + ContractfileImportVO vo = new ContractfileImportVO(); String userId = userProvider.get().getUserId(); String orgnize = null; if (!userProvider.get().getIsAdministrator()) { @@ -424,6 +430,7 @@ public class ContractFileServiceImpl extends ServiceImpl queryuser = new QueryWrapper(); queryuser.eq("F_Id",userId); List listuser = userMapper.selectList(queryuser); @@ -432,51 +439,118 @@ public class ContractFileServiceImpl extends ServiceImpl queryWrappers = new QueryWrapper(); - queryWrappers.eq("supplier_name", model.getName()) - .eq("department_id",detpartment); - List list = supplierMapper.selectList(queryWrappers); - if (list.size() > 0) { - model.setCode(list.get(0).getId()); + if (model.getName() != null) { + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(CustomerEntity::getSupplierNm, model.getName()) + .eq(CustomerEntity::getOrgId,orgnize); + List CustomerEntitys = customerMapper.selectList(wrapper1); + + LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(SupplierEntity::getSupplierName, model.getName()) + .eq(SupplierEntity::getDepartmentId,detpartment); + List SupplierEntitys = supplierMapper.selectList(wrapper2); + + if (CustomerEntitys != null && CustomerEntitys.size() > 0 ) { + if (model.getContractType() != null) { + if (model.getContractType().equals("采购合同")) { + model.setContractType("0"); + if (model.getName() != null) { + QueryWrapper queryWrappers = new QueryWrapper(); + queryWrappers.eq("supplier_name", model.getName()) + .eq("department_id",detpartment); + List list = supplierMapper.selectList(queryWrappers); + if (list.size() > 0) { + model.setCode(list.get(0).getId()); + } } - } - } else if (model.getContractType().equals("销售合同")) { - model.setContractType("1"); - if (model.getName() != null) { - QueryWrapper queryWrappers = new QueryWrapper(); - queryWrappers.eq("supplier_nm", model.getName()) - .eq("orgnize_id",orgnize); - List list = customerMapper.selectList(queryWrappers); - if (list.size() > 0) { - model.setCode(list.get(0).getId()); + } else if (model.getContractType().equals("销售合同")) { + model.setContractType("1"); + + if (model.getName() != null) { + QueryWrapper queryWrappers = new QueryWrapper(); + queryWrappers.eq("supplier_nm", model.getName()) + .eq("orgnize_id",orgnize); + List list = customerMapper.selectList(queryWrappers); + if (list.size() > 0) { + model.setCode(list.get(0).getId()); + } } } } - } - if (model.getClassification() != null) { - if (model.getClassification().equals("采购类")) { - model.setClassification("0"); - } else if (model.getClassification().equals("销售类")) { - model.setClassification("1"); + if (model.getClassification() != null) { + if (model.getClassification().equals("采购类")) { + model.setClassification("0"); + } else if (model.getClassification().equals("销售类")) { + model.setClassification("1"); + } } + if (model.getStatus() != null) { + if (model.getStatus().equals("合同进行中")) { + model.setStatus("1"); + } else if (model.getStatus().equals("合同审批中")) { + model.setStatus("1"); + } else if (model.getStatus().equals("合同审批结束")) { + model.setStatus("1"); + }else if (model.getStatus().equals("合同待审批")) { + model.setStatus("1"); + } + } + model.setApproval("否"); } - if (model.getStatus() != null) { - if (model.getStatus().equals("合同进行中")) { - model.setStatus("1"); - } else if (model.getStatus().equals("合同审批中")) { - model.setStatus("1"); - } else if (model.getStatus().equals("合同审批结束")) { - model.setStatus("1"); - }else if (model.getStatus().equals("合同待审批")) { - model.setStatus("1"); + else if (SupplierEntitys != null && SupplierEntitys.size() > 0) { + if (model.getContractType() != null) { + if (model.getContractType().equals("采购合同")) { + model.setContractType("0"); + if (model.getName() != null) { + QueryWrapper queryWrappers = new QueryWrapper(); + queryWrappers.eq("supplier_name", model.getName()) + .eq("department_id",detpartment); + List list = supplierMapper.selectList(queryWrappers); + if (list.size() > 0) { + model.setCode(list.get(0).getId()); + } + } + } else if (model.getContractType().equals("销售合同")) { + model.setContractType("1"); + + if (model.getName() != null) { + QueryWrapper queryWrappers = new QueryWrapper(); + queryWrappers.eq("supplier_nm", model.getName()) + .eq("orgnize_id",orgnize); + List list = customerMapper.selectList(queryWrappers); + if (list.size() > 0) { + model.setCode(list.get(0).getId()); + } + } + } } + if (model.getClassification() != null) { + if (model.getClassification().equals("采购类")) { + model.setClassification("0"); + } else if (model.getClassification().equals("销售类")) { + model.setClassification("1"); + } + } + if (model.getStatus() != null) { + if (model.getStatus().equals("合同进行中")) { + model.setStatus("1"); + } else if (model.getStatus().equals("合同审批中")) { + model.setStatus("1"); + } else if (model.getStatus().equals("合同审批结束")) { + model.setStatus("1"); + }else if (model.getStatus().equals("合同待审批")) { + model.setStatus("1"); + } + } + model.setApproval("否"); + }else { + dt.get(0).setCauseError("客户或者供应商不存在！请添加客户或供应商信息再尝试添加！"); + model.setCauseError("客户或者供应商不存在！请添加客户或供应商信息再尝试添加！"); + log.error("客户或者供应商不存在！请添加客户或供应商信息再尝试添加！"); + } - model.setApproval("否"); + } + } List entitys = JsonUtil.getJsonToList(dt, ContractFileEntity.class); @@ -499,7 +573,7 @@ public class ContractFileServiceImpl extends ServiceImpl 0) { diff --git a/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue b/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue index 3785354b..c3bf23d5 100644 --- a/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue +++ b/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue @@ -141,6 +141,7 @@

以下文件数据为导入异常数据

+