DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-07-19 15:19:05 +08:00
parent 3a0c9a7684 4b41100938
commit f80b0d55a4
4 changed files with 151 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
klp-ui/src/views/wms/stockIo/index.vue
View File

@@ -31,12 +31,9 @@
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option :key="0" label="草稿" :value="0" />
<el-option :key="1" label="待审核" :value="1" />
<el-option :key="2" label="已完成" :value="2" />
</el-select>
</el-form-item>
<el-form-item>
@@ -107,7 +104,9 @@
</el-table-column>
<el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.status"/>
<el-tag :type="scope.row.status === 2 ? 'success' : (scope.row.status === 1 ? 'warning' : 'info')">
{{ scope.row.status === 2 ? '已完成' : (scope.row.status === 0 ? '草稿' : '待审核') }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />

79
klp-ui/src/views/wms/stockIo/panels/detail.vue
View File

@@ -6,8 +6,8 @@
<el-descriptions-item label="类型">{{ stockIo.ioType }}</el-descriptions-item>
<el-descriptions-item label="业务类型">{{ stockIo.bizType }}</el-descriptions-item>
<el-descriptions-item label="状态">
<el-tag :type="stockIo.status === 2 ? 'success' : 'info'">
{{ stockIo.status === 2 ? '已审核' : (stockIo.status === 0 ? '草稿' : '未审核') }}
<el-tag :type="stockIo.status === 2 ? 'success' : (stockIo.status === 1 ? 'warning' : 'info')">
{{ stockIo.status === 2 ? '已完成' : (stockIo.status === 0 ? '草稿' : '待审核') }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="备注">{{ stockIo.remark }}</el-descriptions-item>
@@ -22,6 +22,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
:disabled="stockIo.status >= 2"
v-hasPermi="['klp:stockIoDetail:add']"
>新增</el-button>
</el-col>
@@ -31,7 +32,7 @@
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
:disabled="single || stockIo.status >= 2"
@click="handleUpdate"
v-hasPermi="['klp:stockIoDetail:edit']"
>修改</el-button>
@@ -42,7 +43,7 @@
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
:disabled="multiple || stockIo.status >= 2"
@click="handleDelete"
v-hasPermi="['klp:stockIoDetail:remove']"
>删除</el-button>
@@ -82,6 +83,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
:disabled="stockIo.status >= 2"
v-hasPermi="['klp:stockIoDetail:edit']"
>修改</el-button>
<el-button
@@ -89,6 +91,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
:disabled="stockIo.status >= 2"
v-hasPermi="['klp:stockIoDetail:remove']"
>删除</el-button>
</template>
@@ -117,7 +120,15 @@
type="primary"
:loading="auditLoading"
@click="handleAudit"
>审核</el-button>
>{{ getAuditButtonText() }}</el-button>
<!-- 撤回按钮 -->
<el-button
v-if="stockIo.status === 2"
type="warning"
:loading="cancelLoading"
@click="handleCancel"
>撤回</el-button>
</div>
<!-- 明细编辑弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -171,7 +182,7 @@
<script>
import { listStockIoDetail, getStockIoDetail, delStockIoDetail, addStockIoDetail, updateStockIoDetail } from "@/api/wms/stockIoDetail";
import { auditStockIo, updateStockIoStatus } from "@/api/wms/stockIo";
import { auditStockIo, updateStockIoStatus, cancelStockIo, getStockIo } from "@/api/wms/stockIo";
import WarehouseSelect from '@/components/WarehouseSelect';
export default {
@@ -220,7 +231,8 @@ export default {
ids: [],
single: true,
multiple: true,
statusLoading: false // 新增状态修改按钮加载状态
statusLoading: false, // 新增状态修改按钮加载状态
cancelLoading: false // 撤回按钮加载状态
};
},
watch: {
@@ -327,6 +339,8 @@ export default {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
// 新增明细后刷新主表状态
this.refreshStockIoStatus();
}).finally(() => {
this.buttonLoading = false;
});
@@ -343,6 +357,8 @@ export default {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
// 删除明细后刷新主表状态
this.refreshStockIoStatus();
}).catch(() => {
}).finally(() => {
this.loading = false;
@@ -374,24 +390,24 @@ export default {
},
getAuditButtonText() {
if (this.stockIo.ioType === 'in') {
return '确认入库/审核';
return '审核入库';
} else if (this.stockIo.ioType === 'out') {
return '确认出库/审核';
return '审核出库';
} else if (this.stockIo.ioType === 'transfer') {
return '确认移库/审核';
return '审核移库';
} else {
return '审核';
}
},
getStatusButtonText() {
if (this.stockIo.ioType === 'in') {
return '确认入库';
return '提交入库';
} else if (this.stockIo.ioType === 'out') {
return '确认出库';
return '提交出库';
} else if (this.stockIo.ioType === 'transfer') {
return '确认移库';
return '提交移库';
} else {
return '修改状态';
return '提交';
}
},
handleUpdateStatus() {
@@ -418,6 +434,41 @@ export default {
}).catch(() => {
// 用户取消状态更新
});
},
handleCancel() {
this.$modal.confirm('确认要撤回此出入库单吗？撤回后将回滚库存数据。').then(() => {
this.cancelLoading = true;
cancelStockIo(this.stockIo.stockIoId).then(response => {
this.$modal.msgSuccess('撤回成功');
// 更新主表状态
this.$set(this.stockIo, 'status', 1);
// 刷新明细列表
this.getList();
// 通知父组件状态已更新
this.$emit('status-changed', this.stockIo);
}).catch(error => {
console.error('撤回失败:', error);
this.$modal.msgError('撤回失败：' + (error.message || '未知错误'));
}).finally(() => {
this.cancelLoading = false;
});
}).catch(() => {
// 用户取消撤回
});
},
refreshStockIoStatus() {
// 刷新主表状态
if (this.stockIo && this.stockIo.stockIoId) {
getStockIo(this.stockIo.stockIoId).then(response => {
const updatedStockIo = response.data;
// 更新主表状态
this.$set(this.stockIo, 'status', updatedStockIo.status);
// 通知父组件状态已更新
this.$emit('status-changed', this.stockIo);
}).catch(error => {
console.error('刷新主表状态失败:', error);
});
}
}
}
}

76
klp-wms/src/main/java/com/klp/service/impl/WmsStockIoDetailServiceImpl.java
View File

@@ -9,15 +9,20 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.klp.domain.bo.WmsStockIoDetailBo;
import com.klp.domain.vo.WmsStockIoDetailVo;
import com.klp.domain.WmsStockIoDetail;
import com.klp.domain.WmsStockIo;
import com.klp.mapper.WmsStockIoDetailMapper;
import com.klp.mapper.WmsStockIoMapper;
import com.klp.service.IWmsStockIoDetailService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Date;
import com.klp.common.exception.ServiceException;
/**
* 出入库单明细Service业务层处理
@@ -30,6 +35,7 @@ import java.util.Collection;
public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService {
private final WmsStockIoDetailMapper baseMapper;
private final WmsStockIoMapper stockIoMapper;
/**
* 查询出入库单明细
@@ -75,12 +81,35 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService {
* 新增出入库单明细
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(WmsStockIoDetailBo bo) {
// 检查主表状态，已审核的单据不能添加明细
WmsStockIo stockIo = stockIoMapper.selectById(bo.getStockIoId());
if (stockIo != null && stockIo.getStatus() >= 2) {
throw new ServiceException("已审核的单据不能修改明细");
}
WmsStockIoDetail add = BeanUtil.toBean(bo, WmsStockIoDetail.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setDetailId(add.getDetailId());
// 检查主表状态，如果有明细且状态为草稿，则自动变为待审核
if (stockIo != null && stockIo.getStatus() == 0) {
// 检查是否有明细
Long detailCount = baseMapper.selectCount(
new LambdaQueryWrapper<WmsStockIoDetail>()
.eq(WmsStockIoDetail::getStockIoId, bo.getStockIoId())
);
if (detailCount > 0) {
// 自动更新状态为待审核
stockIo.setStatus(1);
stockIo.setUpdateTime(new Date());
stockIoMapper.updateById(stockIo);
}
}
}
return flag;
}
@@ -90,6 +119,12 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService {
*/
@Override
public Boolean updateByBo(WmsStockIoDetailBo bo) {
// 检查主表状态，已审核的单据不能修改明细
WmsStockIo stockIo = stockIoMapper.selectById(bo.getStockIoId());
if (stockIo != null && stockIo.getStatus() >= 2) {
throw new ServiceException("已审核的单据不能修改明细");
}
WmsStockIoDetail update = BeanUtil.toBean(bo, WmsStockIoDetail.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
@@ -106,10 +141,51 @@ public class WmsStockIoDetailServiceImpl implements IWmsStockIoDetailService {
* 批量删除出入库单明细
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
// 获取要删除的明细对应的主表ID，检查状态
List<WmsStockIoDetail> details = baseMapper.selectBatchIds(ids);
if (details != null && !details.isEmpty()) {
// 检查主表状态，已审核的单据不能删除明细
for (WmsStockIoDetail detail : details) {
WmsStockIo stockIo = stockIoMapper.selectById(detail.getStockIoId());
if (stockIo != null && stockIo.getStatus() >= 2) {
throw new ServiceException("已审核的单据不能修改明细");
}
}
// 按主表ID分组
Map<Long, List<WmsStockIoDetail>> stockIoIdMap = details.stream()
.collect(java.util.stream.Collectors.groupingBy(WmsStockIoDetail::getStockIoId));
boolean flag = baseMapper.deleteBatchIds(ids) > 0;
if (flag) {
// 检查每个主表是否还有其他明细
for (Long stockIoId : stockIoIdMap.keySet()) {
Long remainingCount = baseMapper.selectCount(
new LambdaQueryWrapper<WmsStockIoDetail>()
.eq(WmsStockIoDetail::getStockIoId, stockIoId)
);
// 如果没有明细了，状态回退为草稿
if (remainingCount == 0) {
WmsStockIo stockIo = stockIoMapper.selectById(stockIoId);
if (stockIo != null && stockIo.getStatus() == 1) {
stockIo.setStatus(0);
stockIo.setUpdateTime(new Date());
stockIoMapper.updateById(stockIo);
}
}
}
}
return flag;
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

9
klp-wms/src/main/java/com/klp/service/impl/WmsStockIoServiceImpl.java
View File

@@ -171,7 +171,6 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
* 撤销出入库/移库单，库存回滚
*/
@Override
@RepeatSubmit()
@Transactional(rollbackFor = Exception.class)
public Boolean cancelStockIo(Long stockIoId) {
WmsStockIo stockIo = baseMapper.selectById(stockIoId);
@@ -204,8 +203,8 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
throw new ServiceException("未知的出入库类型");
}
}
// 更新单据状态为已撤销（3）
stockIo.setStatus(3);
// 更新单据状态为待审核（1）
stockIo.setStatus(1);
baseMapper.updateById(stockIo);
return true;
}
@@ -247,7 +246,7 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
if (stockIo == null) {
throw new ServiceException("单据不存在");
}
// 状态流转验证
if (stockIo.getStatus() == 0 && status == 1) {
// 草稿 -> 已提交：需要检查是否有明细
@@ -262,7 +261,7 @@ public class WmsStockIoServiceImpl implements IWmsStockIoService {
} else {
throw new ServiceException("状态流转不允许");
}
stockIo.setStatus(status);
return baseMapper.updateById(stockIo) > 0;
}