From 7894ec4aafc42f90932aca9215405ed03a54edd9 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 14:09:02 +0800
Subject: [PATCH] 工具管理-DNC刀具写入刀具准备单接口
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java
index 0fb2bcc..f696caf 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/PreparationOrderServiceImpl.java
@@ -54,6 +54,8 @@
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
private IBaseToolsService baseToolsService;
+ @Autowired
+ private PreparationOrderConvert preparationOrderConvert;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -77,7 +79,7 @@
//鍏堝垹闄ゆ墍鏈夋槑缁�
preparationOrderDetailMapper.delete(new LambdaQueryWrapper<PreparationOrderDetail>()
.eq(PreparationOrderDetail::getPreparationOrderId, preparationOrderAndDetailDto.getId()));
- PreparationOrder preparationOrder = PreparationOrderConvert.INSTANCE.convert(preparationOrderAndDetailDto);
+ PreparationOrder preparationOrder = preparationOrderConvert.convert(preparationOrderAndDetailDto);
updateById(preparationOrder);
List<PreparationOrderDetail> detailUpdateList = CollectionUtil.newArrayList();
preparationOrderAndDetailDto.getPreparationOrderDetailList().forEach(item->{
@@ -218,7 +220,23 @@
return this.baseMapper.queryPageList(page, queryWrapper);
}
- private LoginUser getCurrentUser() {
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void addPreparationOrderFromDnc(PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
+ PreparationOrder preparationOrder = preparationOrderConvert.convert(preparationOrderAndDetailDto);
+ preparationOrder
+ .setId(null)
+ .setPreparationOrderNum(businessCodeRuleService.generateBusinessCodeSeq("ToolPreparationOrder"))
+ .setOrderStatus(PreparationOrderStatus.PENDING_AUDIT.getValue());
+ save(preparationOrder);
+ List<PreparationOrderDetail> preparationOrderDetailList = preparationOrderAndDetailDto.getPreparationOrderDetailList();
+ preparationOrderDetailList.forEach(item -> {
+ item.setId(null).setPreparationOrderId(preparationOrder.getId());
+ });
+ preparationOrderDetailService.saveBatch(preparationOrderDetailList);
+ }
+
+ private LoginUser getCurrentUser() {
// 鑾峰彇褰撳墠璁よ瘉鐨勭櫥褰曠敤鎴蜂俊鎭�
Subject currentUser = SecurityUtils.getSubject();
if (currentUser != null && currentUser.isAuthenticated()) {
--
Gitblit v1.9.3