dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:95c8fb94916f792cacc1537883a17cd732522711
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:b1ed2476028191c2930a1910afbac51e17d9a2f4
Branches Tags
dianliang:repair
dianliang:master
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "95c8fb94916f792cacc1537883a17cd732522711" and "b1ed2476028191c2930a1910afbac51e17d9a2f4" have entirely different histories.
95c8fb9491 ... b1ed247602

5 changed files with 1 additions and 87 deletions
Show Stats Expand all files Collapse all files

14
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlTicketWaresController.java
View File

@ -73,19 +73,5 @@ public class DlTicketWaresController {
dlTicketWaresService.removeTicketWares(id);
return CommonResult.ok();
}
/**
* 审核
*
* @author 小李
* @date 21:15 2024/10/15
* @param respVO 请求对象
**/
@PostMapping("/audit")
@Operation(summary = "审核")
public CommonResult<?> auditTicketWares(@RequestBody DlTicketWaresRespVO respVO){
dlTicketWaresService.auditTicketWares(respVO);
return CommonResult.ok();
}
}

1
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlTwItemController.java
View File

@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.tickets.vo.DlTwItemReqVO;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;

9
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlTicketWaresService.java
View File

@ -41,13 +41,4 @@ public interface DlTicketWaresService extends IService<DlTicketWares> {
* @param id id
**/
void removeTicketWares(String id);
/**
* 审核
*
* @author 小李
* @date 21:15 2024/10/15
* @param respVO 请求对象
**/
void auditTicketWares(DlTicketWaresRespVO respVO);
}

60
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
View File

@ -1,26 +1,19 @@
package cn.iocoder.yudao.module.tickets.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.base.entity.RepairWorker;
import cn.iocoder.yudao.module.base.service.RepairWorkerService;
import cn.iocoder.yudao.module.project.entity.RepairWares;
import cn.iocoder.yudao.module.project.service.RepairWaresService;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.entity.DlTicketWares;
import cn.iocoder.yudao.module.tickets.entity.DlTwItem;
import cn.iocoder.yudao.module.tickets.mapper.DlTicketWaresMapper;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService;
import cn.iocoder.yudao.module.tickets.service.DlTicketWaresService;
import cn.iocoder.yudao.module.tickets.service.DlTwItemService;
import cn.iocoder.yudao.module.tickets.vo.DlTicketWaresReqVO;
import cn.iocoder.yudao.module.tickets.vo.DlTicketWaresRespVO;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -28,7 +21,6 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@ -57,10 +49,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
@Lazy
private RepairWorkerService repairWorkerService;
@Resource
@Lazy
private DlRepairTitemService repairTitemService;
/**
* 分页查询
*
@ -138,54 +126,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
// 删除子表
twItemService.remove(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, id));
}
/**
* 审核
*
* @author 小李
* @date 21:15 2024/10/15
* @param respVO 请求对象
**/
@Override
@DSTransactional
public void auditTicketWares(DlTicketWaresRespVO respVO){
// 设置单据状态
baseMapper.update(new LambdaUpdateWrapper<DlTicketWares>()
.set(DlTicketWares::getStatus, respVO.getStatus())
.eq(DlTicketWares::getId, respVO.getId())
);
// 如果是通过就还需要把配件信息加入到工单中
if (ObjectUtil.isNotEmpty(respVO.getStatus()) && respVO.getStatus().equals("02")){
// 更新维修工单
// 计算配件的总价
BigDecimal reduce = respVO.getWares().stream().map(DlRepairTitem::getItemMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
repairTicketsService.update(new LambdaUpdateWrapper<DlRepairTickets>()
// 工单子项总数量增加上配件的数量
.setSql("count = count" + respVO.getWares().size())
// 工单配件总价
.setSql("part_price = part_price" + reduce)
// 工单总价
.setSql("total_price = total_price" + reduce)
// 参考成本
.setSql("cost = cost" + reduce)
// 参考毛利
.setSql("profit = profit" + reduce)
// 领料状态
.set(DlRepairTickets::getPartStatus, "02")
.eq(DlRepairTickets::getId, respVO.getTicketId())
);
// 更新维修工单子表
respVO.getWares().forEach(item -> {
// 主表id
item.setTicketId(respVO.getTicketId());
// 类型为配件
item.setItemType("02");
// 状态为未领料
item.setItemStatus("08");
});
repairTitemService.saveBatch(respVO.getWares());
}
}
}

4
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresRespVO.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.tickets.vo;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.entity.DlTicketWares;
import cn.iocoder.yudao.module.tickets.entity.DlTwItem;
import lombok.Data;
@ -18,7 +17,4 @@ public class DlTicketWaresRespVO extends DlTicketWares {
/** 子表list */
private List<DlTwItem> items;
/** 工单子表需要的记录 */
private List<DlRepairTitem> wares;
}