From d9e76de03903c3624f9848c23277cdcbfd0d05ae Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 22 Jul 2026 14:27:30 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=BD=BD=E5=85=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/CodeGenController.java | 8 +- .../dal/mysql/codegen/CodeSequenceMapper.java | 2 + nl-module-wms/nl-module-wms-server/pom.xml | 5 + .../vo/StorageVehicleInfoSaveReqVO.java | 5 - .../StorageVehicleInfoDO.java | 174 +++++++++--------- .../StorageVehicleInfoMapper.java | 1 - .../rpc/config/RpcConfiguration.java | 15 ++ .../StorageVehicleInfoServiceImpl.java | 12 +- .../src/api/wms/storagevehicleinfo/index.ts | 2 +- .../src/views/wms/storagevehicleinfo/data.ts | 22 --- 10 files changed, 124 insertions(+), 122 deletions(-) rename nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/{controller => }/api/CodeGenController.java (90%) create mode 100644 nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/framework/rpc/config/RpcConfiguration.java diff --git a/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/controller/api/CodeGenController.java b/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/api/CodeGenController.java similarity index 90% rename from nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/controller/api/CodeGenController.java rename to nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/api/CodeGenController.java index 8cb27cb1..5da28e09 100644 --- a/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/controller/api/CodeGenController.java +++ b/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/api/CodeGenController.java @@ -1,6 +1,7 @@ -package cn.code.nl.module.base.controller.api; +package cn.code.nl.module.base.api; import cn.code.nl.framework.common.pojo.CommonResult; +import cn.code.nl.module.base.api.codegen.CodeGenApi; import cn.code.nl.module.base.api.codegen.dto.CodeGenerateReqDTO; import cn.code.nl.module.base.service.codegen.CodeGenService; import io.swagger.v3.oas.annotations.Operation; @@ -26,7 +27,7 @@ import static cn.code.nl.framework.common.pojo.CommonResult.success; @RestController @RequestMapping("/rpc-api/base/code-gen") @Validated -public class CodeGenController { +public class CodeGenController implements CodeGenApi { @Resource private CodeGenService codeGenService; @@ -36,6 +37,7 @@ public class CodeGenController { */ @PostMapping("/generate") @Operation(summary = "生成编码") + @Override public CommonResult generate(@Valid @RequestBody CodeGenerateReqDTO reqDTO) { String code = codeGenService.generate(reqDTO.getRuleCode()); return success(code); @@ -43,9 +45,9 @@ public class CodeGenController { @GetMapping("/preview") @Operation(summary = "预览下一个编码（不消耗序号）") + @Override public CommonResult preview(@RequestParam("ruleCode") String ruleCode) { String code = codeGenService.preview(ruleCode); return success(code); } - } diff --git a/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/mysql/codegen/CodeSequenceMapper.java b/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/mysql/codegen/CodeSequenceMapper.java index 9a8a82b3..4682cd9d 100644 --- a/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/mysql/codegen/CodeSequenceMapper.java +++ b/nl-module-base/nl-module-base-server/src/main/java/cn/code/nl/module/base/dal/mysql/codegen/CodeSequenceMapper.java @@ -2,6 +2,7 @@ package cn.code.nl.module.base.dal.mysql.codegen; import cn.code.nl.framework.mybatis.core.mapper.BaseMapperX; import cn.code.nl.module.base.dal.dataobject.codegen.CodeSequenceDO; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,6 +36,7 @@ public interface CodeSequenceMapper extends BaseMapperX { * @param maxValue 最大值上限 * @return 更新行数 */ + @InterceptorIgnore(dataPermission = "true") int updateCurrentValueBySegment(@Param("ruleId") Long ruleId, @Param("resetKey") String resetKey, @Param("step") int step, diff --git a/nl-module-wms/nl-module-wms-server/pom.xml b/nl-module-wms/nl-module-wms-server/pom.xml index ef12b750..be10ce4c 100644 --- a/nl-module-wms/nl-module-wms-server/pom.xml +++ b/nl-module-wms/nl-module-wms-server/pom.xml @@ -42,6 +42,11 @@ nl-module-task-api ${revision} + + cn.nl.cloud + nl-module-base-api + ${revision} + diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/storagevehicleinfo/vo/StorageVehicleInfoSaveReqVO.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/storagevehicleinfo/vo/StorageVehicleInfoSaveReqVO.java index 3a18f05f..bcdc1f0b 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/storagevehicleinfo/vo/StorageVehicleInfoSaveReqVO.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/storagevehicleinfo/vo/StorageVehicleInfoSaveReqVO.java @@ -13,7 +13,6 @@ public class StorageVehicleInfoSaveReqVO { private Long storageVehicleId; @Schema(description = "载具编码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "载具编码不能为空") private String storageVehicleCode; @Schema(description = "载具名称") @@ -53,8 +52,4 @@ public class StorageVehicleInfoSaveReqVO { @NotNull(message = "占仓位数不能为空") private Integer occupyStructQty; - @Schema(description = "木箱号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "木箱号不能为空") - private String boxNo; - } \ No newline at end of file diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/dataobject/storagevehicleinfo/StorageVehicleInfoDO.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/dataobject/storagevehicleinfo/StorageVehicleInfoDO.java index db7f6606..267d7d63 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/dataobject/storagevehicleinfo/StorageVehicleInfoDO.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/dataobject/storagevehicleinfo/StorageVehicleInfoDO.java @@ -1,89 +1,85 @@ -package cn.code.nl.module.wms.dal.dataobject.storagevehicleinfo; - -import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; - -/** - * 载具信息 DO - * - * @author 诺力管理员 - */ -@TableName("wms_storage_vehicle_info") -@KeySequence("wms_storage_vehicle_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class StorageVehicleInfoDO extends BaseDO { - - /** - * 载具标识 - */ - @TableId - private Long storageVehicleId; - /** - * 载具编码 - */ - private String storageVehicleCode; - /** - * 载具名称 - */ - private String storageVehicleName; - /** - * 一维码 - */ - private String oneCode; - /** - * 二维码 - */ - private String twoCode; - /** - * 是否启用 - */ - private Boolean isUsed; - /** - * 载具类型 - */ - private String storageVehicleType; - /** - * 载具宽度 - */ - private Integer vehicleWidth; - /** - * 载具长度 - */ - private Integer vehicleLong; - /** - * 载具高度 - */ - private Integer vehicleHeight; - /** - * 托盘重量 - */ - private BigDecimal weigth; - /** - * 载具是否超仓位 - */ - private String overStructType; - /** - * 占仓位数 - */ - private Integer occupyStructQty; - /** - * 木箱号 - */ - private String boxNo; - /** - * 外部标识 - */ - private String extId; - - -} \ No newline at end of file +package cn.code.nl.module.wms.dal.dataobject.storagevehicleinfo; + +import lombok.*; +import java.util.*; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; + +/** + * 载具信息 DO + * + * @author 诺力管理员 + */ +@TableName("wms_storage_vehicle_info") +@KeySequence("wms_storage_vehicle_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StorageVehicleInfoDO extends BaseDO { + + /** + * 载具标识 + */ + @TableId + private Long storageVehicleId; + /** + * 载具编码 + */ + private String storageVehicleCode; + /** + * 载具名称 + */ + private String storageVehicleName; + /** + * 一维码 + */ + private String oneCode; + /** + * 二维码 + */ + private String twoCode; + /** + * 是否启用 + */ + private Boolean isUsed; + /** + * 载具类型 + */ + private String storageVehicleType; + /** + * 载具宽度 + */ + private Integer vehicleWidth; + /** + * 载具长度 + */ + private Integer vehicleLong; + /** + * 载具高度 + */ + private Integer vehicleHeight; + /** + * 托盘重量 + */ + private BigDecimal weigth; + /** + * 载具是否超仓位 + */ + private String overStructType; + /** + * 占仓位数 + */ + private Integer occupyStructQty; + /** + * 外部标识 + */ + private String extId; + + +} diff --git a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/mysql/storagevehicleinfo/StorageVehicleInfoMapper.java b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/mysql/storagevehicleinfo/StorageVehicleInfoMapper.java index 4a29fa40..c9621c15 100644 --- a/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/mysql/storagevehicleinfo/StorageVehicleInfoMapper.java +++ b/nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/mysql/storagevehicleinfo/StorageVehicleInfoMapper.java @@ -31,7 +31,6 @@ public interface StorageVehicleInfoMapper extends BaseMapperX generate = codeGenApi.generate(codeGenerateReqDTO); + storageVehicleInfo.setStorageVehicleCode(generate.getData()); storageVehicleInfoMapper.insert(storageVehicleInfo); - // 返回 return storageVehicleInfo.getStorageVehicleId(); } diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/storagevehicleinfo/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/storagevehicleinfo/index.ts index 4ca45508..86e0db08 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/storagevehicleinfo/index.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/wms/storagevehicleinfo/index.ts @@ -18,7 +18,7 @@ export namespace WmsStorageVehicleInfoApi { weigth: number; // 托盘重量 overStructType?: string; // 载具是否超仓位 occupyStructQty?: number; // 占仓位数 - boxNo?: string; // 木箱号 + } } diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/data.ts index 8af8fd65..062790e5 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/data.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/storagevehicleinfo/data.ts @@ -134,14 +134,6 @@ export function useFormSchema(): VbenFormSchema[] { placeholder: '请输入占仓位数', }, }, - { - fieldName: 'boxNo', - label: '木箱号', - component: 'Input', - componentProps: { - placeholder: '请输入木箱号', - }, - }, ]; } @@ -251,15 +243,6 @@ export function useGridFormSchema(): VbenFormSchema[] { placeholder: '请输入占仓位数', }, }, - { - fieldName: 'boxNo', - label: '木箱号', - component: 'Input', - componentProps: { - allowClear: true, - placeholder: '请输入木箱号', - }, - }, { fieldName: 'createTime', label: '创建时间', @@ -348,11 +331,6 @@ export function useGridColumns(): VxeTableGridOptions