src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -67,7 +67,7 @@ LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ApproveProcess::getApproveId, id); queryWrapper.eq(ApproveProcess::getApproveDelete, 0); queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()); // queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()); queryWrapper.last("limit 1"); ApproveProcess one = approveProcessMapper.selectOne(queryWrapper); return one; @@ -104,14 +104,14 @@ LambdaQueryWrapper<ApproveNode> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ApproveNode::getApproveProcessId, id); queryWrapper.eq(ApproveNode::getDeleteFlag, 0); queryWrapper.eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()); // queryWrapper.eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()); List<ApproveNode> list = list(queryWrapper); // 按照 approveNodeOrder 字段升序排序 list.sort(Comparator.comparingInt(ApproveNode::getApproveNodeOrder)); LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>(); approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, id) .eq(ApproveProcess::getApproveDelete, 0) .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()) // .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()) .last("limit 1"); ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper); if(approveProcess != null && approveProcess.getApproveStatus() == 3){ @@ -137,7 +137,7 @@ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>(); approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId()) .eq(ApproveProcess::getApproveDelete, 0) .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()) // .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()) .last("limit 1"); ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper); if(approveProcess == null) throw new RuntimeException("审批不存在"); @@ -145,7 +145,7 @@ approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId()) .eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1) .eq(ApproveNode::getDeleteFlag, 0) .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()) // .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()) .last("limit 1"); ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper); approveProcess.setApproveStatus(status); src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -192,7 +192,7 @@ LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ApproveProcess::getApproveId, id); queryWrapper.eq(ApproveProcess::getApproveDelete, 0); queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()); // queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId()); queryWrapper.last("limit 1"); ApproveProcess one = getOne(queryWrapper); one.setCommonFileList(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>() @@ -232,7 +232,7 @@ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>(); approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveProcess.getApproveId()) .eq(ApproveNode::getDeleteFlag, 0) .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()) // .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()) .orderByAsc(ApproveNode::getApproveNodeOrder); approveNodeMapper.delete(approveNodeLambdaQueryWrapper); approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(), approveProcess.getApproveId(), approveProcess.getTenantId()); @@ -273,7 +273,7 @@ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>(); approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approve.getApproveId()) .eq(ApproveNode::getDeleteFlag, 0) .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()) // .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId()) .orderByAsc(ApproveNode::getApproveNodeOrder); approveNodeMapper.delete(approveNodeLambdaQueryWrapper); approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(), approve.getApproveId(), approve.getTenantId()); src/main/java/com/ruoyi/common/enums/FileNameType.java
@@ -11,7 +11,8 @@ MEASURING(5), //计量器具台账 MEASURINGRecord(6),//计量器具台账记录 ApproveNode(7), //协同审批节点审核 ApproveProcess(8); //协同审批主数据 ApproveProcess(8),//协同审批主数据 SHIP(9);//发货台账 private final int value;
@@ -402,8 +402,8 @@ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>(); approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveDelete, 0) .eq(ApproveProcess::getApproveUserCurrentId, loginUser.getUserId()) .ne(ApproveProcess::getApproveStatus, 2) .eq(ApproveProcess::getTenantId, loginUser.getTenantId()); .ne(ApproveProcess::getApproveStatus, 2); // .eq(ApproveProcess::getTenantId, loginUser.getTenantId()) List<ApproveProcess> approveProcesses = approveProcessMapper.selectList(approveProcessLambdaQueryWrapper); if(CollectionUtils.isEmpty(approveProcesses)){ approveProcesses = new ArrayList<>(); src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -237,6 +237,9 @@ .in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList()))); } for (SalesLedger salesLedger : iPage.getRecords()) { if(salesLedger.getShippingDate() != null){ salesLedger.setShippingStatus("已发货"); } boolean existFlag = false; BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO; BigDecimal invoiceTotal = BigDecimal.ZERO; @@ -277,8 +280,9 @@ } if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) { if (salesLedgerDto.getStatus()) { long count = iPage.getRecords().stream().filter(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00"))).count(); iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00"))); iPage.setTotal(iPage.getRecords().size()); iPage.setTotal(iPage.getTotal() - count); } }
@@ -3,11 +3,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.enums.FileNameType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.other.service.impl.TempFileServiceImpl; import com.ruoyi.sales.mapper.ShipmentApprovalMapper; import com.ruoyi.sales.mapper.ShippingInfoMapper; import com.ruoyi.sales.pojo.SalesLedger; @@ -17,6 +19,7 @@ import com.ruoyi.sales.service.ISalesLedgerProductService; import com.ruoyi.sales.service.ISalesLedgerService; import com.ruoyi.sales.service.ShippingInfoService; import com.ruoyi.sales.service.impl.CommonFileServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; @@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; /** @@ -43,6 +47,12 @@ @Autowired private ISalesLedgerProductService salesLedgerProductService; @Autowired private TempFileServiceImpl tempFileService; @Autowired private CommonFileServiceImpl commonFileService; @GetMapping("/listPage") @ApiOperation("发货信息列表") @@ -54,64 +64,38 @@ @PostMapping("/add") @ApiOperation("添加发货信息") @Transactional(rollbackFor = Exception.class) public AjaxResult add(@RequestBody ShippingInfo req) { LambdaQueryWrapper<ShippingInfo> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ShippingInfo::getSalesLedgerId, req.getSalesLedgerId()); wrapper.eq(ShippingInfo::getSalesLedgerProductId, req.getSalesLedgerProductId()); List<ShippingInfo> list = shippingInfoService.list(wrapper); if(!CollectionUtils.isEmpty(list)){ return AjaxResult.error("发货信息已存在"); } public AjaxResult add(@RequestBody ShippingInfo req) throws IOException { boolean save = shippingInfoService.save(req); if(save){ ShippingInfo shippingInfo = shippingInfoService.getOne(wrapper); ShipmentApproval shipmentApproval = new ShipmentApproval(); shipmentApproval.setSalesLedgerId(req.getSalesLedgerId()); shipmentApproval.setSalesLedgerProductId(req.getSalesLedgerProductId()); shipmentApproval.setApproveUserId(req.getApproverId()); shipmentApproval.setApproveStatus(2); shipmentApproval.setShippingInfoId(shippingInfo.getId()); shipmentApprovalMapper.insert(shipmentApproval); SalesLedgerProduct salesLedgerProduct = salesLedgerProductService.getById(req.getSalesLedgerProductId()); if(salesLedgerProduct != null){ salesLedgerProduct.setApproveStatus(2); salesLedgerProductService.updateById(salesLedgerProduct); } // 迁移文件 if(CollectionUtils.isNotEmpty(req.getTempFileIds())){ tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue()); } return save ? AjaxResult.success() : AjaxResult.error(); } @PostMapping("/update") @ApiOperation("修改发货信息") public AjaxResult update(@RequestBody ShippingInfo req) { @Transactional(rollbackFor = Exception.class) public AjaxResult update(@RequestBody ShippingInfo req) throws IOException { ShippingInfo byId = shippingInfoService.getById(req.getId()); if (byId == null) { return AjaxResult.error("发货信息不存在"); } Long userId = getLoginUser().getUserId(); if(!userId.equals(Long.parseLong(byId.getCreateUser().toString()))){ return AjaxResult.error("您没有权限修改此发货信息"); } boolean update = shippingInfoService.updateById(req); if(CollectionUtils.isNotEmpty(req.getTempFileIds())){ tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue()); } return update ? AjaxResult.success() : AjaxResult.error(); } @DeleteMapping("/delete") @ApiOperation("删除发货信息") @Transactional(rollbackFor = Exception.class) public AjaxResult delete(@RequestBody List<Long> ids) { Long userId = getLoginUser().getUserId(); ids.forEach(id -> { ShippingInfo byId = shippingInfoService.getById(id); if (byId == null) { throw new RuntimeException("发货信息不存在"); } if(!userId.equals(Long.parseLong(byId.getCreateUser().toString()))){ throw new RuntimeException("您没有权限删除此发货信息"); } }); if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请选择要删除的记录"); boolean delete = shippingInfoService.removeBatchByIds(ids); // 删除附件 commonFileService.deleteByBusinessIds(ids, FileNameType.SHIP.getValue()); return delete ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败"); }
@@ -48,6 +48,12 @@ private String shippingCarNumber; /** * 发货状态 */ @TableField(exist = false) private String shippingStatus = "未发货"; /** * 发货日期 */ @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -9,6 +9,7 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; /** * @author :yys @@ -20,6 +21,9 @@ @TableId(value = "id", type = IdType.AUTO) private Long id; @ApiModelProperty(value = "发货类型") private String type; @ApiModelProperty(value = "销售台账id") private Long salesLedgerId; @@ -45,6 +49,14 @@ @Excel(name = "发货车牌号") private String shippingCarNumber; @ApiModelProperty(value = "快递单号") @Excel(name = "快递单号") private String expressNumber; @ApiModelProperty(value = "快递公司") @Excel(name = "快递公司") private String expressCompany; @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; @@ -69,4 +81,9 @@ @TableField(exist = false) private Integer approverId; @TableField(exist = false) private List<String> tempFileIds; @TableField(exist = false) private List<CommonFile> commonFileList; } src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
@@ -1,7 +1,10 @@ package com.ruoyi.sales.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.enums.FileNameType; import com.ruoyi.other.mapper.TempFileMapper; import com.ruoyi.other.pojo.TempFile; import com.ruoyi.sales.mapper.CommonFileMapper; @@ -50,6 +53,16 @@ return commonFileMapper.deleteBatchIds(Arrays.asList(ids)); } public void deleteByBusinessId(Long businessId,Integer type) { commonFileMapper.delete(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, businessId) .eq(CommonFile::getType, type)); } public void deleteByBusinessIds(List<Long> businessId,Integer type) { commonFileMapper.delete(new LambdaQueryWrapper<CommonFile>().in(CommonFile::getCommonId, businessId) .eq(CommonFile::getType, type)); } @Override public CommonFile uploadFile(MultipartFile file, Long id, Integer type) throws IOException { // 1. 生成正式文件ID和路径 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -1,9 +1,13 @@ package com.ruoyi.sales.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.enums.FileNameType; import com.ruoyi.sales.mapper.CommonFileMapper; import com.ruoyi.sales.mapper.ShippingInfoMapper; import com.ruoyi.sales.pojo.CommonFile; import com.ruoyi.sales.pojo.ShippingInfo; import com.ruoyi.sales.service.ShippingInfoService; import lombok.extern.slf4j.Slf4j; @@ -20,11 +24,17 @@ @Autowired private ShippingInfoMapper shippingInfoMapper; @Autowired private CommonFileMapper commonFileMapper; @Override public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) { IPage<ShippingInfo> listPage = shippingInfoMapper.listPage(page, req); listPage.getRecords().forEach(item ->{ item.setCommonFileList(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>() .eq(CommonFile::getCommonId, item.getId()) .eq(CommonFile::getType, FileNameType.SHIP.getValue()))); }); return listPage; } } src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -58,10 +58,12 @@ T1.contract_amount, T1.execution_date, T2.nick_name AS entry_person_name, T1.payment_method T1.payment_method, T3.shipping_date FROM sales_ledger T1 LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id left join shipping_info T3 on T1.id = T3.sales_ledger_id <where> <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' "> AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%') src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -4,15 +4,7 @@ <select id="listPage" resultType="com.ruoyi.sales.pojo.ShippingInfo"> SELECT s.id, s.sales_ledger_id, s.shipping_date, s.shipping_car_number, s.create_time, s.update_time, s.create_user, s.update_user, s.tenant_id, s.*, sl.sales_contract_no, sl.customer_name FROM shipping_info s @@ -24,6 +16,9 @@ <if test="req.shippingCarNumber != null and req.shippingCarNumber != ''"> AND s.shipping_car_number LIKE CONCAT('%',#{req.shippingCarNumber},'%') </if> <if test="req.expressNumber != null and req.expressNumber != ''"> AND s.express_number LIKE CONCAT('%',#{req.expressNumber},'%') </if> </select> <select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo"> SELECT
