zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：载具信息批量新增

Browse Source
This commit is contained in:
liyongde
2026-07-22 16:36:46 +08:00
parent d9e76de039
commit 586ce7ed40
10 changed files with 213 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nl-module-system/nl-module-system-api/src/main/java/cn/code/nl/module/system/enums/LogRecordConstants.java
View File

@@ -30,4 +30,8 @@ public interface LogRecordConstants {
String SYSTEM_ROLE_DELETE_SUB_TYPE = "删除角色";
String SYSTEM_ROLE_DELETE_SUCCESS = "删除了角色【{{#role.name}}】";
// ======================= WMS_GROUP 组盘信息 =======================
String WMS_GROUP_PLATE = "组盘信息";
String WMS_GROUP_PLATE_UPDATE = "修改组盘信息";
String WMS_GROUP_PLATE_SUCCESS = "{{#loginUserNickname}} 更新了组盘信息: {{#group.vehicleCode}}";
}

7
nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/storagevehicleinfo/StorageVehicleInfoController.java
View File

@@ -45,6 +45,13 @@ public class StorageVehicleInfoController {
return success(storageVehicleInfoService.createStorageVehicleInfo(createReqVO));
}
@PostMapping("/batch-create")
@Operation(summary = "批量生成载具信息")
@PreAuthorize("@ss.hasPermission('wms:storage-vehicle-info:create')")
public CommonResult<List<Long>> batchCreateStorageVehicleInfo(@Valid @RequestBody StorageVehicleInfoBatchCreateReqVO reqVO) {
return success(storageVehicleInfoService.batchCreateStorageVehicleInfo(reqVO));
}
@PutMapping("/update")
@Operation(summary = "更新载具信息")
@PreAuthorize("@ss.hasPermission('wms:storage-vehicle-info:update')")

26
nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/storagevehicleinfo/vo/StorageVehicleInfoBatchCreateReqVO.java Normal file
View File

@@ -0,0 +1,26 @@
package cn.code.nl.module.wms.controller.admin.storagevehicleinfo.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import lombok.Data;
@Schema(description = "管理后台 - 载具信息批量生成 Request VO")
@Data
public class StorageVehicleInfoBatchCreateReqVO {
@Schema(description = "载具类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "MTP")
@NotEmpty(message = "载具类型不能为空")
private String storageVehicleType;
@Schema(description = "载具类型中文名", requiredMode = Schema.RequiredMode.REQUIRED, example = "木托盘")
@NotEmpty(message = "载具类型中文名不能为空")
private String storageVehicleTypeLabel;
@Schema(description = "生成数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "5")
@NotNull(message = "生成数量不能为空")
@Min(value = 1, message = "生成数量至少为1")
private Integer count;
}

8
nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/groupplate/GroupPlateServiceImpl.java
View File

@@ -2,10 +2,13 @@ package cn.code.nl.module.wms.service.groupplate;
import cn.code.nl.framework.common.pojo.PageResult;
import cn.code.nl.framework.common.util.object.BeanUtils;
import cn.code.nl.framework.security.core.util.SecurityFrameworkUtils;
import cn.code.nl.module.wms.controller.admin.groupplate.vo.GroupPlatePageReqVO;
import cn.code.nl.module.wms.controller.admin.groupplate.vo.GroupPlateSaveReqVO;
import cn.code.nl.module.wms.dal.dataobject.groupplate.GroupPlateDO;
import cn.code.nl.module.wms.dal.mysql.groupplate.GroupPlateMapper;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.starter.annotation.LogRecord;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -13,6 +16,7 @@ import org.springframework.validation.annotation.Validated;
import java.util.List;
import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.code.nl.module.system.enums.LogRecordConstants.*;
import static cn.code.nl.module.wms.enums.ErrorCodeConstants.GROUP_PLATE_NOT_EXISTS;
/**
@@ -38,12 +42,16 @@ public class GroupPlateServiceImpl implements GroupPlateService {
}
@Override
@LogRecord(type = WMS_GROUP_PLATE, subType = WMS_GROUP_PLATE_UPDATE, bizNo = "{{#updateReqVO.groupId}}",
success = WMS_GROUP_PLATE_SUCCESS)
public void updateGroupPlate(GroupPlateSaveReqVO updateReqVO) {
// 校验存在
validateGroupPlateExists(updateReqVO.getGroupId());
// 更新
GroupPlateDO updateObj = BeanUtils.toBean(updateReqVO, GroupPlateDO.class);
groupPlateMapper.updateById(updateObj);
LogRecordContext.putVariable("loginUserNickname", SecurityFrameworkUtils.getLoginUserNickname());
LogRecordContext.putVariable("group", updateObj);
}
@Override

9
nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/storagevehicleinfo/StorageVehicleInfoService.java
View File

@@ -6,6 +6,7 @@ import cn.code.nl.module.wms.controller.admin.storagevehicleinfo.vo.*;
import cn.code.nl.module.wms.dal.dataobject.storagevehicleinfo.StorageVehicleInfoDO;
import cn.code.nl.framework.common.pojo.PageResult;
import cn.code.nl.framework.common.pojo.PageParam;
import cn.code.nl.framework.common.pojo.CommonResult;
/**
* 载具信息 Service 接口
@@ -59,4 +60,12 @@ public interface StorageVehicleInfoService {
*/
PageResult<StorageVehicleInfoDO> getStorageVehicleInfoPage(StorageVehicleInfoPageReqVO pageReqVO);
/**
* 批量生成载具信息
*
* @param reqVO 批量生成请求
* @return 生成的载具ID列表
*/
List<Long> batchCreateStorageVehicleInfo(StorageVehicleInfoBatchCreateReqVO reqVO);
}

28
nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/storagevehicleinfo/StorageVehicleInfoServiceImpl.java
View File

@@ -10,6 +10,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.regex.*;
import cn.code.nl.module.wms.controller.admin.storagevehicleinfo.vo.*;
import cn.code.nl.module.wms.dal.dataobject.storagevehicleinfo.StorageVehicleInfoDO;
import cn.code.nl.framework.common.pojo.PageResult;
@@ -52,6 +53,33 @@ public class StorageVehicleInfoServiceImpl implements StorageVehicleInfoService
return storageVehicleInfo.getStorageVehicleId();
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<Long> batchCreateStorageVehicleInfo(StorageVehicleInfoBatchCreateReqVO reqVO) {
List<Long> ids = new ArrayList<>();
// 提取编码中数字部分的正则
Pattern numPattern = Pattern.compile("\\d+");
for (int i = 0; i < reqVO.getCount(); i++) {
CodeGenerateReqDTO genReq = new CodeGenerateReqDTO();
genReq.setRuleCode(reqVO.getStorageVehicleType() + "_CODE");
CommonResult<String> result = codeGenApi.generate(genReq);
String code = result.getData();
// 提取编码中的数字部分
String numSuffix = "";
Matcher matcher = numPattern.matcher(code);
if (matcher.find()) {
numSuffix = matcher.group();
}
StorageVehicleInfoDO info = new StorageVehicleInfoDO();
info.setStorageVehicleCode(code);
info.setStorageVehicleName(reqVO.getStorageVehicleTypeLabel() + numSuffix);
info.setStorageVehicleType(reqVO.getStorageVehicleType());
storageVehicleInfoMapper.insert(info);
ids.add(info.getStorageVehicleId());
}
return ids;
}
@Override
public void updateStorageVehicleInfo(StorageVehicleInfoSaveReqVO updateReqVO) {
// 校验存在

12
nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/storagevehicleinfo/index.ts
View File

@@ -59,6 +59,18 @@ export function deleteStorageVehicleInfoList(ids: number[]) {
);
}
/** 批量生成载具信息 */
export interface BatchCreateStorageVehicleInfoReqVO {
storageVehicleType: string;
storageVehicleTypeLabel: string;
count: number;
}
/** 批量生成载具信息 */
export function batchCreateStorageVehicleInfo(data: BatchCreateStorageVehicleInfoReqVO) {
return requestClient.post<number[]>('/wms/storage-vehicle-info/batch-create', data);
}
/** 导出载具信息 */
export function exportStorageVehicleInfo(params: any) {
return requestClient.download('/wms/storage-vehicle-info/export-excel', { params });

30
nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/data.ts
View File

@@ -269,16 +269,16 @@ export function useGridColumns(): VxeTableGridOptions<WmsStorageVehicleInfoApi.S
title: '载具名称',
minWidth: 120,
},
{
field: 'oneCode',
title: '一维码',
minWidth: 120,
},
{
field: 'twoCode',
title: '二维码',
minWidth: 120,
},
// {
// field: 'oneCode',
// title: '一维码',
// minWidth: 120,
// },
// {
// field: 'twoCode',
// title: '二维码',
// minWidth: 120,
// },
{
field: 'isUsed',
title: '是否启用',
@@ -336,22 +336,12 @@ export function useGridColumns(): VxeTableGridOptions<WmsStorageVehicleInfoApi.S
title: '外部标识',
minWidth: 120,
},
{
field: 'creator',
title: '创建者',
minWidth: 120,
},
{
field: 'createTime',
title: '创建时间',
minWidth: 120,
formatter: 'formatDateTime',
},
{
field: 'updater',
title: '更新者',
minWidth: 120,
},
{
field: 'updateTime',
title: '更新时间',

19
nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/index.vue
View File

@@ -19,6 +19,7 @@ import {
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
import BatchForm from './modules/batch-form.vue';
import Form from './modules/form.vue';
const [FormModal, formModalApi] = useVbenModal({
@@ -26,6 +27,11 @@ const [FormModal, formModalApi] = useVbenModal({
destroyOnClose: true,
});
const [BatchFormModal, batchFormModalApi] = useVbenModal({
connectedComponent: BatchForm,
destroyOnClose: true,
});
/** 刷新表格 */
function handleRefresh() {
gridApi.query();
@@ -36,6 +42,11 @@ function handleCreate() {
formModalApi.setData(null).open();
}
/** 批量生成载具信息 */
function handleBatchCreate() {
batchFormModalApi.open();
}
/** 编辑载具信息 */
function handleEdit(row: WmsStorageVehicleInfoApi.StorageVehicleInfo) {
formModalApi.setData(row).open();
@@ -127,6 +138,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
<BatchFormModal @success="handleRefresh" />
<Grid table-title="载具信息列表">
<template #toolbar-tools>
<TableAction
@@ -138,6 +150,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
auth: ['wms:storage-vehicle-info:create'],
onClick: handleCreate,
},
{
label: '批量生成',
type: 'primary',
icon: ACTION_ICON.ADD,
auth: ['wms:storage-vehicle-info:create'],
onClick: handleBatchCreate,
},
{
label: $t('ui.actionTitle.export'),
type: 'primary',

90
nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/modules/batch-form.vue Normal file
View File

@@ -0,0 +1,90 @@
<script lang="ts" setup>
import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { message } from 'antdv-next';
import { useVbenForm } from '#/adapter/form';
import { batchCreateStorageVehicleInfo } from '#/api/wms/storagevehicleinfo';
import type { BatchCreateStorageVehicleInfoReqVO } from '#/api/wms/storagevehicleinfo';
import { $t } from '#/locales';
import {getDictOptions} from "@vben/hooks";
import {DICT_TYPE} from "@vben/constants";
const emit = defineEmits(['success']);
const [Form, formApi] = useVbenForm({
commonConfig: {
componentProps: {
class: 'w-full',
},
formItemClass: 'col-span-2',
labelWidth: 100,
},
layout: 'horizontal',
schema: [
{
fieldName: 'storageVehicleType',
label: '载具类型',
rules: 'required',
component: 'Select',
componentProps: {
options: getDictOptions(DICT_TYPE.WMS_VEHICLE_TYPE),
placeholder: '请选择载具类型',
},
},
{
fieldName: 'count',
label: '生成数量',
rules: 'required',
component: 'InputNumber',
componentProps: {
class: '!w-full',
min: 1,
placeholder: '请输入生成数量',
},
defaultValue: 1,
},
],
showDefaultActions: false,
});
const [Modal, modalApi] = useVbenModal({
async onConfirm() {
const { valid } = await formApi.validate();
if (!valid) {
return;
}
modalApi.lock();
try {
const formValues = await formApi.getValues();
// 找到选中类型的 label
const dictOptions = getDictOptions(DICT_TYPE.WMS_VEHICLE_TYPE);
const selected = dictOptions.find((opt) => opt.value === formValues.storageVehicleType);
const data: BatchCreateStorageVehicleInfoReqVO = {
storageVehicleType: formValues.storageVehicleType,
storageVehicleTypeLabel: selected?.label || formValues.storageVehicleType,
count: formValues.count,
};
await batchCreateStorageVehicleInfo(data);
await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
} finally {
modalApi.unlock();
}
},
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
return;
}
},
});
</script>
<template>
<Modal title="批量生成载具信息">
<Form class="mx-4" />
</Modal>
</template>