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

Compare commits

base: dianliang:f4b57db74428d7d476be5c50df8f3a8c8f390c07
Branches Tags
dianliang:master
dianliang:driver
dianliang:insp
dianliang:repair
dianliang:dev
..
compare: dianliang:fc918ff41c10a52dd1b3ed5f411529c1f919935c
Branches Tags
dianliang:driver
dianliang:insp
dianliang:master
dianliang:repair
dianliang:dev

No commits in common. "f4b57db74428d7d476be5c50df8f3a8c8f390c07" and "fc918ff41c10a52dd1b3ed5f411529c1f919935c" have entirely different histories.
f4b57db744 ... fc918ff41c

8 changed files with 0 additions and 142 deletions
Show Stats Expand all files Collapse all files

2
dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairConstants.java
View File

@ -16,6 +16,4 @@ public class RepairConstants {
public static final String REPAIR_STAFF = "维修工";
public static final String REPAIR_WAREHOUSE = "维修仓库管理员";
}

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

@ -87,33 +87,5 @@ public class DlTicketWaresController {
dlTicketWaresService.auditTicketWares(respVO);
return CommonResult.ok();
}
/**
* 仓库通知领料
*
* @author 小李
* @date 20:45 2024/10/16
* @param respVO 请求对象
**/
@PostMapping("/pass")
@Operation(summary = "仓库通知领料")
public CommonResult<?> passTicketWares(@RequestBody DlTicketWaresRespVO respVO){
dlTicketWaresService.passTicketWares(respVO);
return CommonResult.ok();
}
/**
* 员工确认领料
*
* @author 小李
* @date 22:07 2024/10/16
* @param respVO 请求对象
**/
@PostMapping("/repairPass")
@Operation(summary = "员工确认领料")
public CommonResult<?> repairPassTicketWares(@RequestBody DlTicketWaresRespVO respVO){
dlTicketWaresService.repairPassTicketWares(respVO);
return CommonResult.ok();
}
}

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

@ -50,22 +50,4 @@ public interface DlTicketWaresService extends IService<DlTicketWares> {
* @param respVO 请求对象
**/
void auditTicketWares(DlTicketWaresRespVO respVO);
/**
* 仓库通知领料
*
* @author 小李
* @date 20:45 2024/10/16
* @param respVO 请求对象
**/
void passTicketWares(DlTicketWaresRespVO respVO);
/**
* 员工确认领料
*
* @author 小李
* @date 22:07 2024/10/16
* @param respVO 请求对象
**/
void repairPassTicketWares(DlTicketWaresRespVO respVO);
}

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

@ -452,10 +452,6 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
if (names.contains(RepairConstants.REPAIR_STAFF)){
return 4;
}
// 维修仓库管理员
if(names.contains(RepairConstants.REPAIR_WAREHOUSE)){
return 5;
}
// 啥也不是
return -1;
}

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

@ -7,9 +7,6 @@ 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.stockOperate.entity.DlRepairSoi;
import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoService;
import cn.iocoder.yudao.module.stockOperate.service.DlRepairSoiService;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.entity.DlTicketWares;
@ -64,14 +61,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
@Lazy
private DlRepairTitemService repairTitemService;
@Resource
@Lazy
private DlRepairSoService repairSoService;
@Resource
@Lazy
private DlRepairSoiService repairSoiService;
/**
* 分页查询
*
@ -106,11 +95,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
case 4:
reqVO.setUserIds(Collections.singletonList(SecurityFrameworkUtils.getLoginUserId()));
break;
// 维修仓库管理员
case 5:
reqVO.setStatus(null);
reqVO.setUserRole(5);
break;
}
return baseMapper.getPage(reqVO, page);
}
@ -202,60 +186,6 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
repairTitemService.saveBatch(respVO.getWares());
}
}
/**
* 仓库通知领料
*
* @author 小李
* @date 20:45 2024/10/16
* @param respVO 请求对象
**/
@Override
@DSTransactional
public void passTicketWares(DlTicketWaresRespVO respVO){
// 查工单子表中的配件信息
List<DlRepairTitem> list = repairTitemService.list(new LambdaQueryWrapper<DlRepairTitem>()
.eq(DlRepairTitem::getTicketId, respVO.getTicketId())
.in(DlRepairTitem::getPartId, respVO.getRepairSois()
.stream()
.map(DlRepairSoi::getGoodsId)
.collect(Collectors.toList())));
// 计算总价
BigDecimal reduce = list.stream().map(DlRepairTitem::getItemMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
respVO.getRepairSo().setItemCount(list.size());
respVO.getRepairSo().setTotalPrice(reduce);
// 生成领料单
repairSoService.save(respVO.getRepairSo());
// 生成领料单子表
respVO.getRepairSois().forEach(item -> {
item.setSoId(respVO.getRepairSo().getId());
DlRepairTitem titem = list.stream().filter(i -> i.getPartId().equals(item.getGoodsId())).collect(Collectors.toList()).get(0);
item.setGoodsPrice(titem.getItemPrice());
});
repairSoiService.saveBatch(respVO.getRepairSois());
// 更新领料申请子表
twItemService.updateBatchById(respVO.getItems());
}
/**
* 员工确认领料
*
* @author 小李
* @date 22:07 2024/10/16
* @param respVO 请求对象
**/
@Override
@DSTransactional
public void repairPassTicketWares(DlTicketWaresRespVO respVO){
// 更新领料申请子表
twItemService.updateBatchById(respVO.getItems());
// 更新领料申请表
// 判断是全部完成完成部分完成
List<DlTwItem> list = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, respVO.getId()));
List<DlTwItem> list1 = list.stream().filter(item -> item.getWaresStatus().equals("01")).collect(Collectors.toList());
respVO.setStatus(list1.size() == list.size() ? "03" : "04");
baseMapper.updateById(respVO);
}
}

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

@ -19,7 +19,4 @@ public class DlTicketWaresReqVO extends DlTicketWares {
/** 查询的时候用，班组长和维修工 */
private List<Long> userIds;
/** 角色 */
private Integer userRole;
}

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

@ -1,7 +1,5 @@
package cn.iocoder.yudao.module.tickets.vo;
import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSo;
import cn.iocoder.yudao.module.stockOperate.entity.DlRepairSoi;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.entity.DlTicketWares;
import cn.iocoder.yudao.module.tickets.entity.DlTwItem;
@ -23,10 +21,4 @@ public class DlTicketWaresRespVO extends DlTicketWares {
/** 工单子表需要的记录 */
private List<DlRepairTitem> wares;
/** 领料、采购单 */
private DlRepairSo repairSo;
/** 领料、采购单子表 */
private List<DlRepairSoi> repairSois;
}

9
dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml
View File

@ -56,15 +56,6 @@
</foreach>
)
</if>
<if test="map.userRole != null">
and (
<choose>
<when test="map.userRole == 5">
dtw.status not in ('01', '05', '03')
</when>
</choose>
)
</if>
<if test="map.adviserId != null and map.adviserId != ''">
and (dtw.adviser_id = #{map.adviserId})
</if>