From e984a060be4d8025bb9f08f320d887d131b9f29e Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Wed, 12 Apr 2023 16:41:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B4=B8=E6=98=93=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PoundlistController.java | 104 +++++--- .../poundlist/mapper/PoundlistMapper.java | 3 + .../service/impl/PoundlistServiceImpl.java | 70 +---- .../controller/TradeuploadController.java | 106 +++++--- .../tradeupload/mapper/TradeuploadMapper.java | 3 + .../model/tradeupload/TradeuploadInfoVO.java | 21 ++ .../service/impl/TradeuploadServiceImpl.java | 218 +++------------- .../mapper/poundlist/PoundlistMapper.xml | 85 ++++++ .../mapper/tradeupload/TradeuploadMapper.xml | 41 +++ .../scm/basicInformation/poundlist/Detail.vue | 14 +- .../basicInformation/purchaseorder/Detail.vue | 4 +- .../tradeupload/ContractBox.vue | 156 +++++++++++ .../tradeupload/CustomerBox.vue | 150 +++++++++++ .../basicInformation/tradeupload/Detail.vue | 92 +++---- .../scm/basicInformation/tradeupload/Form.vue | 218 ++++++++++------ .../basicInformation/tradeupload/Form2.vue | 244 ++++++++++++------ .../basicInformation/tradeupload/Form3.vue | 150 ++++++++--- .../basicInformation/tradeupload/Form4.vue | 152 ++++++++--- .../tradeupload/MaterialBox.vue | 155 +++++++++++ .../tradeupload/NaturalBox.vue | 148 +++++++++++ .../tradeupload/VehicleBox.vue | 149 +++++++++++ .../basicInformation/tradeupload/index.vue | 22 +- 22 files changed, 1704 insertions(+), 601 deletions(-) create mode 100644 SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue create mode 100644 SC-web/src/views/scm/basicInformation/tradeupload/CustomerBox.vue create mode 100644 SC-web/src/views/scm/basicInformation/tradeupload/MaterialBox.vue create mode 100644 SC-web/src/views/scm/basicInformation/tradeupload/NaturalBox.vue create mode 100644 SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue 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 f94be9b7..4414440f 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 @@ -285,21 +285,42 @@ public class PoundlistController { //处理id字段转名称，若无需转或者为空可删除 for(PoundlistEntity entity:list){ entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); - Map materialIdMap = new HashMap<>(); - entity.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",entity.getMaterialId(),materialIdMap)); - Map customerIdMap = new HashMap<>(); - entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); - Map salesIdMap = new HashMap<>(); - entity.setSalesId(generaterSwapUtil.getPopupSelectValue("381038993740949317","id","contract_name",entity.getSalesId(),salesIdMap)); - Map vehicleIdMap = new HashMap<>(); - entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap)); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); - Map businessIdMap = new HashMap<>(); - entity.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",entity.getBusinessId(),businessIdMap)); - Map naturalIdMap = new HashMap<>(); - entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap)); - Map purchaseIdMap = new HashMap<>(); - entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("397408984857931205","id","contract_name",entity.getPurchaseId(),purchaseIdMap)); + entity.setAdvance("0".equals(entity.getAdvance()) ? "否" : "是"); + entity.setIsInvoicing("0".equals(entity.getIsInvoicing()) ? "否" : "是"); + entity.setIsPay("0".equals(entity.getIsPay()) ? "否" : "是"); + entity.setIsCollection("0".equals(entity.getIsCollection()) ? "否" : "是"); + entity.setIsExpense("0".equals(entity.getIsExpense()) ? "否" : "是"); + entity.setUnit("0".equals(entity.getAdvance()) ? "吨" : "千克"); + if("0".equals(entity.getTransportType())){ + entity.setTransportType("汽运"); + }else if("1".equals(entity.getTransportType())){ + entity.setTransportType("船运"); + }else if("2".equals(entity.getTransportType())){ + entity.setTransportType("火车"); + } + if("0".equals(entity.getPurchaseStatus())){ + entity.setPurchaseStatus("待开票"); + }else if("1".equals(entity.getPurchaseStatus())){ + entity.setPurchaseStatus("开票中"); + }else if("2".equals(entity.getPurchaseStatus())){ + entity.setPurchaseStatus("已入库"); + }else if("3".equals(entity.getPurchaseStatus())){ + entity.setPurchaseStatus("归档"); + }else if("99".equals(entity.getPurchaseStatus())){ + entity.setPurchaseStatus("已保存"); + } + if("0".equals(entity.getSalesStatus())){ + entity.setSalesStatus("待发货"); + }else if("1".equals(entity.getSalesStatus())){ + entity.setSalesStatus("待开票"); + }else if("2".equals(entity.getSalesStatus())){ + entity.setSalesStatus("待回款"); + }else if("3".equals(entity.getSalesStatus())){ + entity.setSalesStatus("归档"); + }else if("99".equals(entity.getSalesStatus())){ + entity.setSalesStatus("已保存"); + } } List listVO=JsonUtil.getJsonToList(list,PoundlistListVO.class); for(PoundlistListVO poundlistVO:listVO){ @@ -320,19 +341,19 @@ public class PoundlistController { for(String key:keys){ switch(key){ case "poundPictures" : - entitys.add(new ExcelExportEntity("磅单上传" ,"poundPictures")); + entitys.add(new ExcelExportEntity("磅单图片" ,"poundPictures")); break; - case "materialId" : - entitys.add(new ExcelExportEntity("物料名称" ,"materialId")); + case "materialName" : + entitys.add(new ExcelExportEntity("物料名称" ,"materialName")); break; - case "customerId" : - entitys.add(new ExcelExportEntity("客户名称" ,"customerId")); + case "customerName" : + entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); break; - case "salesId" : - entitys.add(new ExcelExportEntity("销售合同" ,"salesId")); + case "salesName" : + entitys.add(new ExcelExportEntity("销售合同" ,"salesName")); break; - case "vehicleId" : - entitys.add(new ExcelExportEntity("车牌号" ,"vehicleId")); + case "vehicleName" : + entitys.add(new ExcelExportEntity("车牌号" ,"vehicleName")); break; case "vehiclePictures" : entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures")); @@ -364,20 +385,20 @@ public class PoundlistController { case "advance" : entitys.add(new ExcelExportEntity("是否垫资" ,"advance")); break; - case "transportPrice" : - entitys.add(new ExcelExportEntity("运费" ,"transportPrice")); + case "collectPrice" : + entitys.add(new ExcelExportEntity("收货价格" ,"collectPrice")); break; case "salesPrice" : entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice")); break; - case "businessId" : - entitys.add(new ExcelExportEntity("业务员" ,"businessId")); + case "businessName" : + entitys.add(new ExcelExportEntity("业务员" ,"businessName")); break; case "naturalId" : entitys.add(new ExcelExportEntity("自然人" ,"naturalId")); break; - case "purchaseId" : - entitys.add(new ExcelExportEntity("采购合同" ,"purchaseId")); + case "purchaseName" : + entitys.add(new ExcelExportEntity("采购合同" ,"purchaseName")); break; case "supplierName" : entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName")); @@ -403,10 +424,27 @@ public class PoundlistController { case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark")); break; - case "collectPrice" : - entitys.add(new ExcelExportEntity("收货单价" ,"collectPrice")); - break; - + case "purchaseStatus" : + entitys.add(new ExcelExportEntity("采购状态" ,"purchaseStatus")); + break; + case "salesStatus" : + entitys.add(new ExcelExportEntity("销售状态" ,"salesStatus")); + break; + case "creatorTime" : + entitys.add(new ExcelExportEntity("创建日期" ,"creatorTime")); + break; + case "isInvoicing" : + entitys.add(new ExcelExportEntity("是否开进项票" ,"isInvoicing")); + break; + case "isPay" : + entitys.add(new ExcelExportEntity("是否付款" ,"isPay")); + break; + case "isCollection" : + entitys.add(new ExcelExportEntity("是否回款" ,"isCollection")); + break; + case "isExpense" : + entitys.add(new ExcelExportEntity("是否开销项票" ,"isExpense")); + break; default: break; } 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 58a5eec7..af4adf91 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 @@ -2,6 +2,7 @@ package jnpf.poundlist.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.poundlist.entity.PoundlistEntity; @@ -35,4 +36,6 @@ public interface PoundlistMapper extends BaseMapper { List queryPoundListByIds(@Param("poundlistIdList") List poundlistIdList); List queryPoundListByIdsRenkuan(@Param("poundlistIdList") List poundlistIdList, @Param("paymentdocId") String paymentdocId); + + List queryByKeywordNotPage(@Param("poundlistPagination") PoundlistPagination poundlistPagination, @Param("ew") Wrapper queryWrapper); } 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 24a2f017..2299d649 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 @@ -1,13 +1,6 @@ package jnpf.poundlist.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; -import jnpf.Jg_natural.entity.Jg_naturalEntity; -import jnpf.arinvoices.entity.Arinvoices_item0Entity; -import jnpf.base.ActionResult; -import jnpf.base.UserInfo; -import jnpf.base.controller.BillRuleController; -import jnpf.base.entity.ProvinceEntity; import jnpf.contractfile.entity.ContractFileEntity; import jnpf.contractfile.service.ContractFileService; import jnpf.customer.entity.CustomerEntity; @@ -22,13 +15,8 @@ import jnpf.poundlist.model.poundlist.PoundlistDTO; import jnpf.poundlist.model.poundlist.PoundlistListVO; import jnpf.poundlist.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jnpf.purchaseorder.entity.PurchaseOrderImportVo; -import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import jnpf.purchaseorder.entity.PurchaseorderitemEntity; -import jnpf.purchaseorder.model.purchaseorder.PurchaseorderDTO; import jnpf.supplier.entity.SupplierEntity; import jnpf.supplier.service.SupplierService; -import jnpf.supplyProcessAnalysis.entity.ContractMEntity; import jnpf.util.RandomUtil; import java.math.BigDecimal; @@ -45,12 +33,10 @@ import java.lang.reflect.Field; import com.baomidou.mybatisplus.annotation.TableField; -import java.math.RoundingMode; import java.text.ParseException; import java.util.stream.Collectors; -import jnpf.util.context.SpringContext; import jnpf.vehicle.entity.VehicleEntity; import jnpf.vehicle.service.VehicleService; import org.apache.commons.lang3.ObjectUtils; @@ -96,10 +82,8 @@ public class PoundlistServiceImpl extends ServiceImpl getList(PoundlistPagination poundlistPagination) { String userId = userProvider.get().getUserId(); @@ -162,29 +146,6 @@ public class PoundlistServiceImpl extends ServiceImpl page = new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize()); - - - /*************************************************************************/ -// IPage userIPage = this.page(page, poundlistQueryWrapper); -// List list = userIPage.getRecords(); -// Optional firstElement = list.stream().findFirst(); -// String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull)) -// .map(PoundlistEntity::getDepartmentId) -// .orElse(null); -// -// if (department_id==null){ -// poundlistPagination.setDepartmentId(detpartment); -// }else { -// poundlistPagination.setDepartmentId(department_id); -// } - String detpartment=null; - if (!userProvider.get().getIsAdministrator()) { - detpartment = userProvider.getDepartmentId(userId); - } - if (StringUtil.isNotNull(detpartment)) { - poundlistPagination.setDepartmentId(detpartment); - } - /*************************************************************************/ IPage iPage = poundlistMapper.queryByKeyword(page, poundlistPagination, poundlistQueryWrapper); return poundlistPagination.setData(iPage.getRecords(), iPage.getTotal()); @@ -197,12 +158,13 @@ public class PoundlistServiceImpl extends ServiceImpl poundlistQueryWrapper = new QueryWrapper<>(); + poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine, "1"); boolean pcPermission = true; boolean appPermission = true; boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); if (isPc && pcPermission) { if (!userProvider.get().getIsAdministrator()) { - Object poundlistObj = authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist")); + Object poundlistObj = authorizeService.getCondition2(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist")); if (ObjectUtil.isEmpty(poundlistObj)) { return new ArrayList<>(); } else { @@ -213,7 +175,7 @@ public class PoundlistServiceImpl extends ServiceImpl(); } else { @@ -225,27 +187,15 @@ public class PoundlistServiceImpl extends ServiceImpl PoundDateList = poundlistPagination.getPoundDate(); Long fir = Long.valueOf(PoundDateList.get(0)); Long sec = Long.valueOf(PoundDateList.get(1)); - - poundlistQueryWrapper.lambda().ge(PoundlistEntity::getPoundDate, new Date(fir)) - .le(PoundlistEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - - } - - if (StringUtil.isNotEmpty(poundlistPagination.getPoundlistNo())) { - poundlistNum++; - poundlistQueryWrapper.lambda().like(PoundlistEntity::getPoundlistNo, poundlistPagination.getPoundlistNo()); - } - - if (AllIdList.size() > 0) { - poundlistQueryWrapper.lambda().in(PoundlistEntity::getId, AllIdList); + poundlistPagination.setStartDate(new Date(fir)); + poundlistPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); } - //排序 if (StringUtil.isEmpty(poundlistPagination.getSidx())) { - poundlistQueryWrapper.lambda().orderByDesc(PoundlistEntity::getId); + poundlistPagination.setSidx("CREATOR_TIME"); + poundlistPagination.setSort("ASC"); } else { try { String sidx = poundlistPagination.getSidx(); @@ -253,7 +203,7 @@ public class PoundlistServiceImpl extends ServiceImpl 0 && AllIdList.size() > 0) || total == 0) { Page page = new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize()); - IPage userIPage = this.page(page, poundlistQueryWrapper); + IPage userIPage = poundlistMapper.queryByKeyword(page, poundlistPagination, poundlistQueryWrapper); return poundlistPagination.setData(userIPage.getRecords(), userIPage.getTotal()); } else { List list = new ArrayList(); return poundlistPagination.setData(list, list.size()); } } else { - return this.list(poundlistQueryWrapper); + return poundlistMapper.queryByKeywordNotPage(poundlistPagination, poundlistQueryWrapper); } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index 87653e32..27b0777a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -13,6 +13,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jnpf.Jg_natural.entity.Jg_naturalEntity; +import jnpf.Jg_natural.service.Jg_naturalService; import jnpf.base.ActionResult; import jnpf.base.NoDataSourceBind; import jnpf.base.UserInfo; @@ -27,9 +29,13 @@ import jnpf.contractfile.service.ContractFileService; import jnpf.customer.entity.CustomerEntity; import jnpf.customer.service.CustomerService; import jnpf.exception.DataException; +import jnpf.materialvo.entity.MaterialEntity; +import jnpf.materialvo.service.MaterialService; import jnpf.model.UploaderVO; import jnpf.ocr_sdk.baiduUtils.VatInvoice; import jnpf.ocr_sdk.controller.BaiduOcrController; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.service.SupplierService; import jnpf.tradeupload.entity.TradeuploadEntity; import jnpf.tradeupload.model.tradeupload.*; import jnpf.tradeupload.service.TradeuploadService; @@ -98,6 +104,12 @@ public class TradeuploadController { @Autowired private VehicleService vehicleService; @Autowired + private MaterialService materialService; + @Autowired + private SupplierService supplierService; + @Autowired + private Jg_naturalService naturalService; + @Autowired private YozoUtils yozoUtils; @@ -581,22 +593,15 @@ public class TradeuploadController { //处理id字段转名称，若无需转或者为空可删除 for(TradeuploadEntity entity:list){ entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); - Map materialIdMap = new HashMap<>(); - entity.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",entity.getMaterialId(),materialIdMap)); - Map customerIdMap = new HashMap<>(); - entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); - Map salesIdMap = new HashMap<>(); - entity.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",entity.getSalesId(),salesIdMap)); - Map vehicleIdMap = new HashMap<>(); - entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap)); entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures())); - Map businessIdMap = new HashMap<>(); - entity.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",entity.getBusinessId(),businessIdMap)); - Map naturalIdMap = new HashMap<>(); - entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap)); - Map purchaseIdMap = new HashMap<>(); - entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("397408984857931205","id","document_no",entity.getPurchaseId(),purchaseIdMap)); - entity.setOriginPlace(generaterSwapUtil.provinceData(entity.getOriginPlace())); + entity.setAdvance("0".equals(entity.getAdvance()) ? "否" : "是"); + if("0".equals(entity.getTransportType())){ + entity.setTransportType("汽运"); + }else if("1".equals(entity.getTransportType())){ + entity.setTransportType("船运"); + }else if("2".equals(entity.getTransportType())){ + entity.setTransportType("火车"); + } } List listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class); for(TradeuploadListVO tradeuploadVO:listVO){ @@ -617,25 +622,25 @@ public class TradeuploadController { for(String key:keys){ switch(key){ case "poundPictures" : - entitys.add(new ExcelExportEntity("磅单上传" ,"poundPictures")); + entitys.add(new ExcelExportEntity("磅单图片" ,"poundPictures")); break; - case "materialId" : - entitys.add(new ExcelExportEntity("物料名称" ,"materialId")); + case "materialName" : + entitys.add(new ExcelExportEntity("物料名称" ,"materialName")); break; - case "customerId" : - entitys.add(new ExcelExportEntity("客户名称" ,"customerId")); + case "customerName" : + entitys.add(new ExcelExportEntity("客户名称" ,"customerName")); break; - case "salesId" : - entitys.add(new ExcelExportEntity("销售合同" ,"salesId")); + case "salesName" : + entitys.add(new ExcelExportEntity("销售合同" ,"salesName")); break; - case "vehicleId" : - entitys.add(new ExcelExportEntity("车牌号" ,"vehicleId")); + case "vehicleName" : + entitys.add(new ExcelExportEntity("车牌号" ,"vehicleName")); break; case "vehiclePictures" : entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures")); break; case "poundDate" : - entitys.add(new ExcelExportEntity("磅单时间" ,"poundDate")); + entitys.add(new ExcelExportEntity("磅单日期" ,"poundDate")); break; case "poundlistNo" : entitys.add(new ExcelExportEntity("磅单号" ,"poundlistNo")); @@ -670,11 +675,11 @@ public class TradeuploadController { case "salesPrice" : entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice")); break; - case "businessId" : - entitys.add(new ExcelExportEntity("业务员" ,"businessId")); + case "businessName" : + entitys.add(new ExcelExportEntity("业务员" ,"businessName")); break; - case "naturalId" : - entitys.add(new ExcelExportEntity("自然人" ,"naturalId")); + case "naturalName" : + entitys.add(new ExcelExportEntity("自然人" ,"naturalName")); break; case "remark" : entitys.add(new ExcelExportEntity("备注" ,"remark")); @@ -744,10 +749,53 @@ public class TradeuploadController { @GetMapping("/{id}") public ActionResult info(@PathVariable("id") String id){ TradeuploadEntity entity= tradeuploadService.getInfo(id); + TradeuploadInfoVO vo=JsonUtil.getJsonToBean(entity, TradeuploadInfoVO.class); if(vo.getCreatorTime()!=null){ vo.setCreatorTime(vo.getCreatorTime()); } + if(StringUtils.isNotBlank(vo.getMaterialId())){ + MaterialEntity materialEntity = materialService.getById(vo.getMaterialId()); + if(materialEntity != null){ + vo.setMaterialName(materialEntity.getItemName()); + } + } + if(StringUtils.isNotBlank(vo.getCustomerId())){ + CustomerEntity customerEntity = customerService.getById(vo.getCustomerId()); + if(customerEntity != null){ + vo.setCustomerName(customerEntity.getSupplierNm()); + } + } + if(StringUtils.isNotBlank(vo.getCustomerId())){ + ContractFileEntity contractFileEntity = contractFileService.getById(vo.getSalesId()); + if(contractFileEntity != null){ + vo.setSalesName(contractFileEntity.getContractName()); + } + } + if(StringUtils.isNotBlank(vo.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(vo.getVehicleId()); + if(vehicleEntity != null){ + vo.setVehicleName(vehicleEntity.getTicketno()); + } + } + if(StringUtils.isNotBlank(vo.getNaturalId())){ + Jg_naturalEntity naturalEntity = naturalService.getById(vo.getNaturalId()); + if(naturalEntity != null){ + vo.setNaturalName(naturalEntity.getName()); + } + } + if(StringUtils.isNotBlank(vo.getPurchaseId())){ + ContractFileEntity contractFileEntity = contractFileService.getById(vo.getPurchaseId()); + if(contractFileEntity != null){ + vo.setPurchaseName(contractFileEntity.getContractName()); + } + } + if(StringUtils.isNotBlank(vo.getSupplierId())){ + SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId()); + if(supplierEntity != null){ + vo.setSupplierName(supplierEntity.getSupplierName()); + } + } // vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace())); //子表 //副表 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java index 7946928c..7f917b8d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java @@ -2,6 +2,7 @@ package jnpf.tradeupload.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.saleorder.entity.SaleorderitemEntity; @@ -25,4 +26,6 @@ public interface TradeuploadMapper extends BaseMapper { List queryVehicle(TradeuploadEntity tradeuploadEntity); IPage queryByKeyword(@Param("page") Page page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination, @Param("ew") Wrapper queryWrapper); + + List queryByKeywordNotPage(@Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination, @Param("ew") Wrapper queryWrapper); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java index bcd0e0ba..e233c68c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java @@ -132,4 +132,25 @@ public class TradeuploadInfoVO{ /** 收货单价 **/ @JsonProperty("collectPrice") private String collectPrice; + + @JsonProperty("materialName") + private String materialName; + + @JsonProperty("customerName") + private String customerName; + + @JsonProperty("salesName") + private String salesName; + + @JsonProperty("vehicleName") + private String vehicleName; + + @JsonProperty("businessName") + private String businessName; + + @JsonProperty("naturalName") + private String naturalName; + + @JsonProperty("purchaseName") + private String purchaseName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java index 400b3429..2676bc81 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java @@ -142,138 +142,8 @@ public class TradeuploadServiceImpl extends ServiceImpl page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize()); - //加权限 -// IPage IPage = this.page(page, tradeuploadQueryWrapper); -// List list = IPage.getRecords(); -// Optional firstElement = list.stream().findFirst(); -// String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull)) -// .map(TradeuploadEntity::getDepartmentId) -// .orElse(null); -// if (!userProvider.get().getIsAdministrator()) { -// if (department_id==null){ -// tradeuploadPagination.setDepartmentId(detpartment); -// }else { -// tradeuploadPagination.setDepartmentId(department_id); -// } -// } - String detpartment=null; - if (!userProvider.get().getIsAdministrator()) { - detpartment = userProvider.getDepartmentId(userId); - } - if (StringUtil.isNotNull(detpartment)) { - tradeuploadPagination.setDepartmentId(detpartment); - } - -// tradeuploadPagination.setDepartmentId(detpartment); IPage userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination, tradeuploadQueryWrapper); return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - /* - - - - - if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){ - tradeuploadNum++; - List PoundDateList = tradeuploadPagination.getPoundDate(); - Long fir = Long.valueOf(PoundDateList.get(0)); - Long sec = Long.valueOf(PoundDateList.get(1)); - - tradeuploadQueryWrapper.lambda().ge(TradeuploadEntity::getPoundDate, new Date(fir)) - .le(TradeuploadEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - - } - - if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundlistNo())){ - tradeuploadNum++; - tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getPoundlistNo,tradeuploadPagination.getPoundlistNo()); - } - - if(StringUtil.isNotEmpty(tradeuploadPagination.getMaterialName())){ - QueryWrapper materialQueryWrapper =new QueryWrapper<>(); - materialQueryWrapper.lambda().like(MaterialEntity::getItemName, tradeuploadPagination.getMaterialName()); - materialQueryWrapper.lambda().select(MaterialEntity::getId); - List materialIdList = materialService.listObjs(materialQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - tradeuploadNum++; - if(materialIdList.size() > 0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getMaterialId,materialIdList); - }else{ - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getMaterialId, tradeuploadPagination.getMaterialName()); - } - } - if(StringUtil.isNotEmpty(tradeuploadPagination.getCustomerName())){ - QueryWrapper customerQueryWrapper =new QueryWrapper<>(); - customerQueryWrapper.lambda().like(CustomerEntity::getSupplierNm, tradeuploadPagination.getCustomerName()); - customerQueryWrapper.lambda().select(CustomerEntity::getId); - List customerIdList = customerService.listObjs(customerQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - tradeuploadNum++; - if(customerIdList.size() > 0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getCustomerId,customerIdList); - }else{ - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getCustomerId, tradeuploadPagination.getCustomerName()); - } - } - if(StringUtil.isNotEmpty(tradeuploadPagination.getSalesName())){ - QueryWrapper contractFileQueryWrapper =new QueryWrapper<>(); - contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractName, tradeuploadPagination.getSalesName()); - contractFileQueryWrapper.lambda().select(ContractFileEntity::getId); - List customerIdList = contractFileService.listObjs(contractFileQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - tradeuploadNum++; - if(customerIdList.size() > 0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getSalesId,customerIdList); - }else{ - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getSalesId, tradeuploadPagination.getSalesName()); - } - } - if(StringUtil.isNotEmpty(tradeuploadPagination.getBusinessName())){ - QueryWrapper userQueryWrapper =new QueryWrapper<>(); - userQueryWrapper.lambda().like(UserEntity::getRealName, tradeuploadPagination.getBusinessName()); - userQueryWrapper.lambda().select(UserEntity::getId); - List userIdList = userService.listObjs(userQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - tradeuploadNum++; - if(userIdList.size() > 0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getBusinessId,userIdList); - }else{ - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getBusinessId, tradeuploadPagination.getBusinessName()); - } - } - if(StringUtil.isNotEmpty(tradeuploadPagination.getVehicleName())){ - QueryWrapper vehicleQueryWrapper =new QueryWrapper<>(); - vehicleQueryWrapper.lambda().like(VehicleEntity::getTicketno, tradeuploadPagination.getVehicleName()); - vehicleQueryWrapper.lambda().select(VehicleEntity::getId); - List customerIdList = vehicleService.listObjs(vehicleQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); - tradeuploadNum++; - if(customerIdList.size() > 0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getVehicleId,customerIdList); - }else{ - tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getVehicleId, tradeuploadPagination.getVehicleName()); - } - } - if(AllIdList.size()>0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getId, AllIdList); - } - //排序 - if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){ - tradeuploadQueryWrapper.lambda().orderByDesc(TradeuploadEntity::getId); - }else{ - try { - String sidx = tradeuploadPagination.getSidx(); - TradeuploadEntity tradeuploadEntity = new TradeuploadEntity(); - Field declaredField = tradeuploadEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - tradeuploadQueryWrapper="asc".equals(tradeuploadPagination.getSort().toLowerCase())?tradeuploadQueryWrapper.orderByAsc(value):tradeuploadQueryWrapper.orderByDesc(value); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - } - if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize()); - IPage userIPage=this.page(page, tradeuploadQueryWrapper); - return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return tradeuploadPagination.setData(list, list.size()); - }*/ } @Override public List getTypeList(TradeuploadPagination tradeuploadPagination,String dataType){ @@ -282,63 +152,57 @@ public class TradeuploadServiceImpl extends ServiceImpl tradeuploadQueryWrapper=new QueryWrapper<>(); - boolean pcPermission = true; - boolean appPermission = true; - boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); - if(isPc && pcPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist")); - if (ObjectUtil.isEmpty(tradeuploadObj)){ - return new ArrayList<>(); - } else { - tradeuploadQueryWrapper = (QueryWrapper)tradeuploadObj; - tradeuploadNum++; + tradeuploadQueryWrapper.eq("a.is_examine","0"); + tradeuploadQueryWrapper.eq("a.delete_mark","0"); + boolean pcPermission = true; + boolean appPermission = true; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist")); + if (ObjectUtil.isEmpty(tradeuploadObj)){ + return new ArrayList<>(); + } else { + tradeuploadQueryWrapper = (QueryWrapper)tradeuploadObj; + tradeuploadNum++; + } } } - } - if(!isPc && appPermission){ - if (!userProvider.get().getIsAdministrator()){ - Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist")); - if (ObjectUtil.isEmpty(tradeuploadObj)){ - return new ArrayList<>(); - } else { - tradeuploadQueryWrapper = (QueryWrapper)tradeuploadObj; - tradeuploadNum++; - } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist")); + if (ObjectUtil.isEmpty(tradeuploadObj)){ + return new ArrayList<>(); + } else { + tradeuploadQueryWrapper = (QueryWrapper)tradeuploadObj; + tradeuploadNum++; + } - } - } - if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){ - tradeuploadNum++; + } + } + if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){ List PoundDateList = tradeuploadPagination.getPoundDate(); Long fir = Long.valueOf(PoundDateList.get(0)); Long sec = Long.valueOf(PoundDateList.get(1)); - - tradeuploadQueryWrapper.lambda().ge(TradeuploadEntity::getPoundDate, new Date(fir)) - .le(TradeuploadEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); - - } - - if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundlistNo())){ - tradeuploadNum++; - tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getPoundlistNo,tradeuploadPagination.getPoundlistNo()); - } - - if(AllIdList.size()>0){ - tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getId, AllIdList); - } + tradeuploadPagination.setStartDate(new Date(fir)); + tradeuploadPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if(AllIdList.size()>0){ + tradeuploadQueryWrapper.lambda().in(TradeuploadEntity::getId, AllIdList); + } //排序 if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){ - tradeuploadQueryWrapper.lambda().orderByDesc(TradeuploadEntity::getId); + tradeuploadPagination.setSidx("CREATOR_TIME"); + tradeuploadPagination.setSort("ASC"); }else{ try { - String sidx = tradeuploadPagination.getSidx(); + String sidx = tradeuploadPagination.getSidx(); TradeuploadEntity tradeuploadEntity = new TradeuploadEntity(); - Field declaredField = tradeuploadEntity.getClass().getDeclaredField(sidx); - declaredField.setAccessible(true); - String value = declaredField.getAnnotation(TableField.class).value(); - tradeuploadQueryWrapper="asc".equals(tradeuploadPagination.getSort().toLowerCase())?tradeuploadQueryWrapper.orderByAsc(value):tradeuploadQueryWrapper.orderByDesc(value); + Field declaredField = tradeuploadEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + tradeuploadQueryWrapper="asc".equals(tradeuploadPagination.getSort().toLowerCase())?tradeuploadQueryWrapper.orderByAsc(value):tradeuploadQueryWrapper.orderByDesc(value); } catch (NoSuchFieldException e) { e.printStackTrace(); } @@ -346,14 +210,14 @@ public class TradeuploadServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ Page page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize()); - IPage userIPage=this.page(page, tradeuploadQueryWrapper); + IPage userIPage=tradeuploadMapper.queryByKeyword(page, tradeuploadPagination, tradeuploadQueryWrapper); return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ List list = new ArrayList(); return tradeuploadPagination.setData(list, list.size()); } }else{ - return this.list(tradeuploadQueryWrapper); + return tradeuploadMapper.queryByKeywordNotPage(tradeuploadPagination, tradeuploadQueryWrapper); } } 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 a9228db5..06a94012 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 @@ -200,5 +200,90 @@ WHERE a.delete_mark = 0 and ORDER BY l.is_firstpay DESC,l.is_pay ASC,a.advance DESC,a.pound_date ASC + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml index f1e6b70b..7aeec649 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml @@ -55,4 +55,45 @@ creator_time = DATE_SUB(NOW(),interval 15 day) ORDER BY ${tradeuploadPagination.sidx} ${tradeuploadPagination.sort} + + diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue b/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue index d00b82df..2c091449 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue @@ -23,7 +23,7 @@ + :pageSize="20" :disabled="true"> @@ -33,7 +33,7 @@ + :pageSize="20" @change="customerSelect" :disabled="true"> @@ -43,7 +43,7 @@ + hasPage :pageSize="20" :disabled="true"> @@ -53,7 +53,7 @@ + :pageSize="20" :disabled="true"> @@ -63,7 +63,7 @@ + hasPage :pageSize="20" @change="customerSelect2" :disabled="true"> @@ -78,7 +78,7 @@ + hasPage :pageSize="20" :disabled="true"> @@ -181,7 +181,7 @@ + relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20" :disabled="true"> diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue index 8313146b..e8886804 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue @@ -16,7 +16,7 @@ + :pageSize="20" @change="changeContract" :disabled="true"> @@ -26,7 +26,7 @@ + :pageSize="20" :disabled="true"> diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue new file mode 100644 index 00000000..024ee164 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/tradeupload/ContractBox.vue @@ -0,0 +1,156 @@ + + + + diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/CustomerBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/CustomerBox.vue new file mode 100644 index 00000000..12b2eb3b --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/tradeupload/CustomerBox.vue @@ -0,0 +1,150 @@ + + + + diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue index 9633a4ff..f3d39421 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue @@ -19,44 +19,28 @@ - - - - - + + + + - - - - - + + + + - - - - - + + + + - - - - - + + + + @@ -145,13 +129,10 @@ - - - - - + + + + @@ -450,21 +431,24 @@ advanceChange(e){ this.dataForm.advance = e; }, - customerSelect(e, d) { - const query = { - code: d.id - } - request({ - url: '/api/example/ContractFile/getListByCustomer', - method: 'post', - data: query - }).then((res) => { - if(res.data.length > 0){ - //确定后 根据type 进行保存 不需要组件通讯 - this.dataForm.salesId = res.data[0].id - this.dataForm.salesName = res.data[0].contractName - } - }) + customerSelect() { + const query = { + code: this.dataForm.customerId + } + request({ + url: '/api/example/ContractFile/getListByCustomer', + method: 'post', + data: query + }).then((res) => { + if (res.data.length > 0) { + //确定后 根据type 进行保存 不需要组件通讯 + this.dataForm.salesId = res.data[0].id + this.dataForm.salesName = res.data[0].contractName + }else{ + this.dataForm.salesId = '' + this.dataForm.salesName = '' + } + }) }, changePicture(a, b) { this.dataForm.vehiclePictures = JSON.parse(b.vehiclephotos); diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index 0f2d65c1..48a1121c 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -15,54 +15,44 @@ - + - - - + + - - - - + + + - - - + + - - - + + - + @@ -86,7 +76,8 @@ - + @@ -136,7 +127,8 @@ - + @@ -161,18 +153,15 @@ - - - + + - - + @@ -190,9 +179,15 @@ 取 消 - 确 定 + 确 定 + 继续上传 + + + + + + diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/NaturalBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/NaturalBox.vue new file mode 100644 index 00000000..f4f4c906 --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/tradeupload/NaturalBox.vue @@ -0,0 +1,148 @@ + + + + diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue new file mode 100644 index 00000000..fe9874ee --- /dev/null +++ b/SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue @@ -0,0 +1,149 @@ + + + + diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue index 47812cae..57680426 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue @@ -226,25 +226,25 @@ formVisible4: false, exportBoxVisible: false, columnList: [ - { prop: 'creatorTime', label: '磅单日期' }, - { prop: 'vehicleId', label: '车牌号' }, - { prop: 'materialId', label: '物料名称' }, + { prop: 'poundDate', label: '磅单日期' }, + { prop: 'poundlistNo', label: '磅单号' }, + { prop: 'vehicleName', label: '车牌号' }, + { prop: 'materialName', label: '物料名称' }, { prop: 'grossWeight', label: '毛重' }, { prop: 'tareWeight', label: '皮重' }, { prop: 'buckleWeight', label: '扣重' }, { prop: 'netWeight', label: '净重' }, - { prop: 'customerId', label: '客户名称' }, - { prop: 'salesId', label: '销售合同' }, + { prop: 'customerName', label: '客户名称' }, + { prop: 'salesName', label: '销售合同' }, { prop: 'advance', label: '是否垫资' }, { prop: 'transportType', label: '运输类型' }, { prop: 'transportPrice', label: '运费' }, { prop: 'salesPrice', label: '销售价格' }, - { - prop: 'collectPrice', - label: '收货价格' - }, - { prop: 'creatorUserName', label: '业务员' }, - { prop: 'remark', label: '备注' } + {prop: 'collectPrice', label: '收货价格'}, + { prop: 'businessName', label: '业务员' }, + { prop: 'remark', label: '备注' }, + { prop: 'poundPictures', label: '磅单图片' }, + { prop: 'vehiclePictures', label: '车辆图片' } ], unitOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }], unitProps: { 'label': 'fullName', 'value': 'id' }, From d6583ec2a814b884b496cff65e77a24d2250ac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Wed, 12 Apr 2023 17:20:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../poundlist/entity/PoundlistEntity.java | 6 +++ .../controller/PurchasebackController.java | 28 ++++++++++++-- .../entity/Purchaseback_item0Entity.java | 3 ++ .../purchaseback/PurchasebackInfoVO.java | 4 ++ .../purchaseback/Purchaseback_item0Model.java | 3 ++ .../controller/PurchaseorderController.java | 10 +++++ .../entity/Purchaseorder_item0Entity.java | 2 + .../PurchaseorderPagination.java | 1 + .../controller/ReceiptinController.java | 37 +++++++++++++++++++ .../model/receiptin/ReceiptinInfoVO.java | 4 ++ .../impl/SaleorderitemServiceImpl.java | 2 +- .../mapper/receiptin/ReceiptinMapper.xml | 6 +-- .../scm/basicInformation/arinvoices/index.vue | 22 +++++------ .../poundlist/PurchaseOrderForm.vue | 27 ++++++++++---- .../basicInformation/purchaseback/Detail.vue | 21 ++++++++--- .../basicInformation/purchaseback/Form.vue | 21 ++++++++--- .../basicInformation/purchaseorder/Detail.vue | 32 +++++++++++----- .../basicInformation/purchaseorder/Form.vue | 28 ++++++++++---- .../scm/basicInformation/receiptin/Detail.vue | 30 ++++++++++----- .../scm/basicInformation/receiptin/Form.vue | 28 ++++++++++---- .../scm/basicInformation/saleorder/index.vue | 28 +++++++------- 22 files changed, 257 insertions(+), 88 deletions(-) diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index b3705b04..2dbd479c 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -44,7 +44,7 @@ spring: # 生产环境 # host: 222.71.165.188 # 测试环境 - host: 150.158.169.212 + host: 222.71.165.187 port: 6379 password: qweasd,.123 timeout: 8000 #超时时间(单位：秒) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index aa624774..9e240516 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -194,6 +194,12 @@ public class PoundlistEntity { @TableField("IS_EXPENSE") private String isExpense; + @TableField("IS_PAYMENT") + private String isPayment; + + @TableField("IS_TRANSFER") + private String isTransfer; + @TableField(exist = false) private String materialName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java index fae27f6f..680e61de 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java @@ -20,6 +20,10 @@ import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; import jnpf.purchaseorder.service.Purchaseorder_item0Service; import jnpf.purchaseorder.service.PurchaseorderitemService; +import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.service.VehicleService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.purchaseback.model.purchaseback.*; @@ -90,6 +94,8 @@ public class PurchasebackController { private Purchaseorder_item0Service purchaseorder_item0Service; @Autowired private PoundlistService poundlistService; + @Autowired + private VehicleService vehicleService; /** * 列表 @@ -330,6 +336,12 @@ public class PurchasebackController { public ActionResult info(@PathVariable("id") String id){ PurchasebackEntity entity= purchasebackService.getInfo(id); PurchasebackInfoVO vo=JsonUtil.getJsonToBean(entity, PurchasebackInfoVO.class); + if (StringUtils.isNotEmpty(vo.getPurchaseOrderId())){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(vo.getPurchaseOrderId()); + if (ObjectUtils.isNotEmpty(purchaseorderEntity) && StringUtils.isNotEmpty(purchaseorderEntity.getDocumentNo())){ + vo.setPurchaseOrderName(purchaseorderEntity.getDocumentNo()); + } + } if(vo.getCreatorTime()!=null){ vo.setCreatorTime(vo.getCreatorTime()); } @@ -339,9 +351,19 @@ public class PurchasebackController { List Purchaseback_item0List = purchasebackService.GetPurchaseback_item0List(id); for(Purchaseback_item0Entity purchaseback_item0Entity : Purchaseback_item0List){ Purchaseorder_item0Entity purchaseorder_item0Entity = purchaseorder_item0Service.getById(purchaseback_item0Entity.getPurchaseorderItem0Id()); - PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId()); - purchaseback_item0Entity.setMaterialId(poundlistEntity.getMaterialId()); - purchaseback_item0Entity.setVehicleId(poundlistEntity.getVehicleId()); + if (ObjectUtils.isNotEmpty(purchaseorder_item0Entity)) { + PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId()); + if (ObjectUtils.isNotEmpty(poundlistEntity)) { + purchaseback_item0Entity.setMaterialId(poundlistEntity.getMaterialId()); + purchaseback_item0Entity.setVehicleId(poundlistEntity.getVehicleId()); + if (StringUtils.isNotEmpty(poundlistEntity.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId()); + if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ + purchaseback_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } + } + } + } } vo.setPurchaseback_item0List(JsonUtil.getJsonToList(Purchaseback_item0List,Purchaseback_item0Model.class )); //副表 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java index c882a750..42b62f81 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java @@ -112,4 +112,7 @@ public class Purchaseback_item0Entity { @TableField(exist = false) private PoundlistEntity poundlistEntity; + + @TableField(exist = false) + private String vehicleName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java index a8df30f3..3abd3783 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java @@ -71,4 +71,8 @@ public class PurchasebackInfoVO{ /** 列表子表数据 **/ @JsonProperty("jg_purchaseorder") private PurchaseorderModel jg_purchaseorder; + + /** 采购订单 **/ + @JsonProperty("purchaseOrderName") + private String purchaseOrderName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java index 16233c26..ce45d3d0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java @@ -71,4 +71,7 @@ public class Purchaseback_item0Model { @JsonProperty("materialId") private String materialId; + + @JsonProperty("vehicleName") + private String vehicleName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 9f087e57..3901a42a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -49,6 +49,8 @@ import jnpf.supplier.service.SupplierService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; +import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.service.VehicleService; import jnpf.warehouse.entity.WareHouseEntity; import jnpf.warehouse.service.WareHouseService; import lombok.Cleanup; @@ -137,6 +139,8 @@ public class PurchaseorderController { private Purchaseback_item0Service purchaseback_item0Service; @Autowired private Receiptin_item0Service receiptin_item0Service; + @Autowired + private VehicleService vehicleService; /** * 归档 @@ -622,6 +626,12 @@ public class PurchaseorderController { //子表 List Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id); for (Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List) { + if (StringUtils.isNotEmpty(purchaseorder_item0Entity.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(purchaseorder_item0Entity.getVehicleId()); + if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ + purchaseorder_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } + } if (StringUtils.isNotEmpty(purchaseorder_item0Entity.getMaterialId())) { MaterialEntity materialEntity = materialService.getById(purchaseorder_item0Entity.getMaterialId()); if (materialEntity != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java index 493c4a1d..a06f2865 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java @@ -144,4 +144,6 @@ public class Purchaseorder_item0Entity { private String warehouseName; @TableField(exist = false) private String reservoirareaName; + @TableField(exist = false) + private String vehicleName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java index 43620f05..24d86c25 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java @@ -27,6 +27,7 @@ public class PurchaseorderPagination extends Pagination { private Date startDate; private Date endDate; + /** * 添加权限 */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java index 50972499..283b8c20 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java @@ -15,6 +15,8 @@ import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.materialvo.entity.MaterialEntity; +import jnpf.materialvo.service.MaterialService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseback.entity.PurchaseorderEntity; @@ -24,8 +26,13 @@ import jnpf.purchaseorder.entity.PurchaseorderitemEntity; import jnpf.purchaseorder.service.PurchaseorderitemService; import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.service.ReservoirareaService; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.service.SupplierService; +import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.service.VehicleService; import jnpf.warehouse.entity.WareHouseEntity; import jnpf.warehouse.service.WareHouseService; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; @@ -104,6 +111,12 @@ public class ReceiptinController { private ReservoirareaService reservoirareaService; @Autowired private WareHouseService wareHouseService; + @Autowired + private SupplierService supplierService; + @Autowired + private VehicleService vehicleService; + @Autowired + private MaterialService materialService; /** * 列表 @@ -334,6 +347,18 @@ public class ReceiptinController { public ActionResult info(@PathVariable("id") String id){ ReceiptinEntity entity= receiptinService.getInfo(id); ReceiptinInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptinInfoVO.class); + if (vo.getSouceno() != null){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(vo.getSouceno()); + if (ObjectUtils.isNotEmpty(purchaseorderEntity) && StringUtils.isNotEmpty(purchaseorderEntity.getDocumentNo())){ + vo.setSoucenoName(purchaseorderEntity.getDocumentNo()); + } + } + if (vo.getSupplierId() != null){ + SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId()); + if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())){ + vo.setSuppliername(supplierEntity.getSupplierName()); + } + } if(vo.getCreatorTime()!=null){ vo.setCreatorTime(vo.getCreatorTime()); } @@ -342,6 +367,18 @@ public class ReceiptinController { //子表 List Receiptin_item0List = receiptinService.GetReceiptin_item0List(id); for(Receiptin_item0Entity receiptin_item0Entity : Receiptin_item0List) { + if (StringUtils.isNotEmpty(receiptin_item0Entity.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(receiptin_item0Entity.getVehicleId()); + if (vehicleEntity != null){ + receiptin_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } + } + if (StringUtils.isNotEmpty(receiptin_item0Entity.getMaterialId())){ + MaterialEntity materialEntity = materialService.getById(receiptin_item0Entity.getMaterialId()); + if (materialEntity != null){ + receiptin_item0Entity.setMaterialname(materialEntity.getItemName()); + } + } if (StringUtils.isNotEmpty(receiptin_item0Entity.getReservoirareaId())) { ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptin_item0Entity.getReservoirareaId()); if (reservoirareaEntity != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java index bd4b8f6e..a4e77701 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java @@ -79,4 +79,8 @@ public class ReceiptinInfoVO{ /** 子表数据 **/ @JsonProperty("receiptin_item0List") private List receiptin_item0List; + + @JsonProperty("soucenoName") + private String soucenoName; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java index d2f66fc5..4f36a1dd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java @@ -244,7 +244,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl SELECT a.*,b.document_no purchaseorderSouceno,d.supplier_name supplier from jg_receiptin a - LEFT JOIN jg_purchaseorder b on a.souceno = b.id - LEFT JOIN jg_supplier d on a.supplier_id = d.id - ${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0 + LEFT JOIN jg_purchaseorder b on a.souceno = b.id and b.delete_mark = 0 + LEFT JOIN jg_supplier d on a.supplier_id = d.id and d.delete_mark = 0 + ${ew.customSqlSegment} and a.delete_mark = 0 AND a.creator_time > #{receiptinPagination.startDate} AND a.creator_time <= #{receiptinPagination.endDate} diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue index 20c34907..664b23b9 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue @@ -65,29 +65,29 @@ - - - - - - - - - - @@ -102,7 +102,7 @@ 已审批 - - From 5d3432870b06757552d886305ab500c681097470 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Wed, 12 Apr 2023 18:54:03 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ContractFileServiceImpl.java | 26 ++++++++++++++++--- .../Invoices_item0itemModel.java | 7 +++-- .../basicInformation/purchaseorder/Detail.vue | 6 ++--- 3 files changed, 30 insertions(+), 9 deletions(-) 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 47ea355e..20513191 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 @@ -321,6 +321,15 @@ public class ContractFileServiceImpl extends ServiceImpl importPreview(List personList) { List> dataRow = new ArrayList<>(); List> columns = new ArrayList<>(); + String userId = userProvider.get().getUserId(); + String orgnize = null; + if (!userProvider.get().getIsAdministrator()) { + orgnize = userProvider.getOrganizeId(userId); + } + String detpartment = null; + if (!userProvider.get().getIsAdministrator()) { + detpartment = userProvider.getDepartmentId(userId); + } if (personList != null) { for (int i = 0; i < personList.size(); i++) { Map dataRowMap = new HashMap<>(); @@ -330,7 +339,10 @@ public class ContractFileServiceImpl extends ServiceImpl list = contractFileMapper.selectList(queryWrapper); if (list.size() > 0) { System.out.println(list); @@ -403,17 +415,21 @@ public class ContractFileServiceImpl extends ServiceImpl dt) { String userId = userProvider.get().getUserId(); + String orgnize = null; + if (!userProvider.get().getIsAdministrator()) { + orgnize = userProvider.getOrganizeId(userId); + } String detpartment = null; if (!userProvider.get().getIsAdministrator()) { detpartment = userProvider.getDepartmentId(userId); } - for (ContractFileModel model : dt) { QueryWrapper queryuser = new QueryWrapper(); queryuser.eq("F_Id",userId); List listuser = userMapper.selectList(queryuser); if (listuser.size() > 0) { model.setOrgnizeId(listuser.get(0).getOrganizeId()); + model.setDepartmentId(listuser.get(0).getDepartmentId()); } model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime())); // model.setNum(DateUtil.cstFormat(model.getNum())); @@ -422,7 +438,8 @@ public class ContractFileServiceImpl extends ServiceImpl queryWrappers = new QueryWrapper(); - queryWrappers.eq("supplier_name", model.getName()); + 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()); @@ -432,7 +449,8 @@ public class ContractFileServiceImpl extends ServiceImpl queryWrappers = new QueryWrapper(); - queryWrappers.eq("supplier_nm", model.getName()); + 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()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java index 33c9229c..39ea6c5d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java @@ -26,9 +26,12 @@ public class Invoices_item0itemModel { @JsonProperty("invoiceCode") private String invoiceCode; +// /** 数量 **/ +// @JsonProperty("invoiceNum") +// private String invoiceNum; /** 数量 **/ - @JsonProperty("invoiceNum") - private String invoiceNum; + @JsonProperty("invoiceQuantity") + private String invoiceQuantity; /** 金额 **/ @JsonProperty("invoiceAmount") diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue index f0bbca57..c09b00bd 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue @@ -310,9 +310,9 @@ - + @@ -712,7 +712,7 @@ amount: 0, notAmount: 0, payPrice: 0, - invoiceNum: 0, + invoiceQuantity: 0, invoiceAmount: 0, erpNo: '', creatorUserName: "", From 04428ced43c3aa0d19c6408f4841572a360340fa Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Wed, 12 Apr 2023 19:43:40 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=94=B9=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2299d649..435c736e 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 @@ -132,7 +132,7 @@ public class PoundlistServiceImpl extends ServiceImpl Date: Wed, 12 Apr 2023 23:07:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=94=B9=E6=88=90false?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/jnpf/poundlist/entity/PoundlistEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index 9e240516..c1395175 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -194,10 +194,10 @@ public class PoundlistEntity { @TableField("IS_EXPENSE") private String isExpense; - @TableField("IS_PAYMENT") + @TableField(exist = false) private String isPayment; - @TableField("IS_TRANSFER") + @TableField(exist = false) private String isTransfer; @TableField(exist = false) From f3574a0347f91c79a670cfa45c39d292292f1ff9 Mon Sep 17 00:00:00 2001 From: Vayne Date: Wed, 12 Apr 2023 23:23:24 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/jnpf/poundlist/entity/PoundlistEntity.java | 6 ------ .../purchaseorder/entity/PurchaseorderitemEntity.java | 3 ++- .../saleorder/controller/SaleorderitemController.java | 8 ++++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index c1395175..aa624774 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -194,12 +194,6 @@ public class PoundlistEntity { @TableField("IS_EXPENSE") private String isExpense; - @TableField(exist = false) - private String isPayment; - - @TableField(exist = false) - private String isTransfer; - @TableField(exist = false) private String materialName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java index 51c587ee..0781422a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java @@ -151,7 +151,8 @@ public class PurchaseorderitemEntity { @TableField("SUPPLIER_ID") private String supplierId; - @TableField("is_payment") + + @TableField("IS_PAYMENT") private String isPayment; @TableField(exist = false) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 3ba5e4d0..d2567303 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -248,10 +248,10 @@ public class SaleorderitemController { if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ entity.setMaterialName(materialEntity.getItemName()); } - QueryWrapper queryWrapper3 = new QueryWrapper<>(); - queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId()); - PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3); - entity.setPoundEntity(poundlistEntity); + if (StringUtils.isNotEmpty(entity.getPoundlistId())) { + PoundlistEntity poundlistEntity = poundlistService.getById(entity.getPoundlistId()); + entity.setPoundEntity(poundlistEntity); + } entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false)); } if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){ From d66864d09c3453123e2168eb999d8fb703fcd108 Mon Sep 17 00:00:00 2001 From: Vayne Date: Wed, 12 Apr 2023 23:34:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SC-web/src/views/scm/basicInformation/tradeupload/Form.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index 48a1121c..4ef5f49c 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -526,6 +526,7 @@ this.dataForm.salesId = res.data.salesId; this.dataForm.salesName = res.data.salesName; } + this.dataForm.vehicleName = res.data.vehicleName; this.dataForm.vehicleId = res.data.vehicleId; this.dataForm.poundDate = res.data.poundDate; this.dataForm.poundlistNo = res.data.poundlistNo; From c74e56912ef5a46b22cd409d07cde511d31a5140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Thu, 13 Apr 2023 09:32:03 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArinvoicesController.java | 2 +- .../entity/Arinvoices_item0Entity.java | 6 ++-- .../impl/Arinvoices_item0ServiceImpl.java | 6 ++-- .../basicInformation/poundlist/ImportForm.vue | 2 ++ .../basicInformation/poundlist/salesForm.vue | 1 - .../basicInformation/purchaseorder/index.vue | 4 +-- .../scm/basicInformation/saleorder/Form.vue | 28 ++++++++++++++++++- .../basicInformation/saleorder/ImportForm.vue | 6 ++-- .../scm/basicInformation/saleorder/index.vue | 2 +- 9 files changed, 43 insertions(+), 14 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java index f8a0e446..5e0fa5af 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java @@ -580,7 +580,7 @@ public class ArinvoicesController { String filePath = configValueUtil.getTemporaryFilePath(); File temporary = new File(XSSEscape.escapePath(filePath + fileName)); //得到数据 - List personList = ExcelUtil.importExcel(temporary, 3, 1, Arinvoices_item0Entity.class); + List personList = ExcelUtil.importExcel(temporary, 0, 1, Arinvoices_item0Entity.class); //预览数据 Map map = arinvoices_item0Service.importPreview(personList); return ActionResult.success(map); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java index 43040f16..1fde4c18 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java @@ -77,7 +77,7 @@ public class Arinvoices_item0Entity { @TableField("INVOICE_QUANTITY") private BigDecimal invoiceQuantity; - @Excel(name = "金额") + @Excel(name = "含税金额") @TableField("INVOLCE_AMOUNT") private BigDecimal involceAmount; @@ -89,9 +89,11 @@ public class Arinvoices_item0Entity { @TableField("TAX_AMOUNT") private BigDecimal taxAmount; + @Excel(name = "不含税金额") @TableField("AMOUNT_NOT_TAX") private BigDecimal amountNotTax; + @Excel(name = "发票状态") @TableField("INVOICE_STATUS") private String invoiceStatus; @@ -111,7 +113,7 @@ public class Arinvoices_item0Entity { @TableField("SALES_ORDER_NO") private String salesOrderNo; - @Excel(name = "商品名称") + @Excel(name = "货物名称") @TableField("MATERIAL_NAME") private String materialName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java index b8e42655..49b1b487 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java @@ -51,11 +51,11 @@ public class Arinvoices_item0ServiceImpl extends ServiceImpl { this.$refs.JNPFForm.init2(res.data.poundlistEntityList) }) + this.active++ + this.visible = false }else if (res.data.resultType == 1) { this.result = res.data this.resultList = res.data.failResult diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index 34e758a3..c4f34b54 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -861,7 +861,6 @@ debugger if (row.vehicleId == item.vehicleId) { item.unitPrice = this.jnpf.floatDiv(item.price,item.settlement).toFixed(6) //子表单价 - // item.price = this.jnpf.floatMul(item.settlement, item.unitPrice).toFixed(2)//子表金额 item.noPrice = this.jnpf.floatDiv(item.price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate, 100))).toFixed(2)//子表不含税金额 } if (item.advance == '1') {//垫资 diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index eeb7d526..6a4cf328 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -103,12 +103,12 @@ {{ scope.row.currency | dynamicText(currencyOptions) }} - + - + diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue index 8bc78fe0..8711faf1 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue @@ -235,7 +235,7 @@ @@ -802,6 +802,32 @@ mounted() { }, methods: { + updataPrice(row){ + var advanceAmount = 0 + var price = 0 + var notPrice = 0 + var rate = 13 + this.taxRateOptions.forEach((item, index) => { + if (item.id == row.rate) { + rate = parseInt(item.fullName) + } + }) + this.dataForm.salesorder_item0List.forEach((item, index) => { + debugger + if (row.vehicleId == item.vehicleId) { + item.unitPrice = this.jnpf.floatDiv(item.price,item.settlement).toFixed(6) //子表单价 + item.noPrice = this.jnpf.floatDiv(item.price, this.jnpf.floatAdd(1, this.jnpf.floatDiv(rate, 100))).toFixed(2)//子表不含税金额 + } + if (item.advance == '1') {//垫资 + advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price)//垫资金额 + } + price = this.jnpf.floatAdd(price, item.price)//主表金额 + notPrice = this.jnpf.floatAdd(notPrice, item.noPrice)//主表不含税金额 + }) + this.dataForm.advanceAmount = advanceAmount + this.dataForm.price = price + this.dataForm.notPrice = notPrice + }, editUnitPrice(row) { debugger var advanceAmount = 0; diff --git a/SC-web/src/views/scm/basicInformation/saleorder/ImportForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/ImportForm.vue index 3c7800e8..522bcbe4 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/ImportForm.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/ImportForm.vue @@ -76,11 +76,11 @@ - +