From 8c34cdde2217596cba6316c56b085557cf7e64f9 Mon Sep 17 00:00:00 2001 From: liejiu946 Date: Sat, 8 Aug 2026 10:36:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.Cashe=20=E5=8F=98=E6=9B=B4=E6=88=90Cache?= =?UTF-8?q?=E3=80=822.=E6=8B=86=E5=88=86=E7=A7=B0=E9=87=8D=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=92=8C=E7=A7=B0=E9=87=8D=E4=BD=8D=E5=85=A5=E7=94=9F?= =?UTF-8?q?=E7=AE=94=E7=BC=93=E5=AD=98=E4=BD=8D=E4=BB=BB=E5=8A=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/lms/enums/ErrorCodeConstants.java | 10 +- .../lms/enums/RawFoilCachePositionStatus.java | 28 ++++ ...java => RawFoilCachePositionTypeEnum.java} | 7 +- .../controller/acs/AcsToLmsController.java | 8 + .../acs/vo/WeighPointToCachePointReqVO.java | 17 ++ .../RawFoilCachePositionController.java} | 65 ++++---- .../vo/RawFoilCachePositionPageReqVO.java} | 5 +- .../vo/RawFoilCachePositionRespVO.java} | 7 +- .../vo/RawFoilCachePositionSaveReqVO.java} | 7 +- ...ilEmptyRollerCachePositionController.java} | 65 ++++---- ...oilEmptyRollerCachePositionPageReqVO.java} | 6 +- ...awFoilEmptyRollerCachePositionRespVO.java} | 6 +- ...oilEmptyRollerCachePositionSaveReqVO.java} | 5 +- .../RawFoilCachePositionDO.java} | 8 +- .../RawFoilEmptyRollerCachePositionDO.java} | 8 +- .../RawFoilCachePositionMapper.java} | 83 +++++----- ...RawFoilEmptyRollerCachePositionMapper.java | 85 ++++++++++ ...RawFoilEmptyRollerCashePositionMapper.java | 87 ---------- .../lms/service/acs/AcsToLmsService.java | 7 + .../lms/service/acs/AcsToLmsServiceImpl.java | 77 ++++----- .../lms/service/pda/RawFoilServiceImpl.java | 26 +-- .../RawFoilCachePositionService.java} | 25 ++- .../RawFoilCachePositionServiceImpl.java | 149 +++++++++++++++++ .../RawFoilCashePositionServiceImpl.java | 152 ------------------ ...wFoilEmptyRollerCachePositionService.java} | 24 ++- ...ilEmptyRollerCachePositionServiceImpl.java | 97 +++++++++++ ...ilEmptyRollerCashePositionServiceImpl.java | 105 ------------ .../code/nl/module/lms/task/RawFoilTask.java | 20 ++- .../index.ts | 36 ++--- .../rawfoilemptyrollercacheposition/index.ts | 68 ++++++++ .../rawfoilemptyrollercasheposition/index.ts | 68 -------- .../data.ts | 10 +- .../index.vue | 38 ++--- .../modules/form.vue | 14 +- .../data.ts | 6 +- .../index.vue | 38 ++--- .../modules/form.vue | 14 +- .../packages/constants/src/dict-enum.ts | 6 +- 38 files changed, 756 insertions(+), 731 deletions(-) create mode 100644 nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionStatus.java rename nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/{RawFoilCashePositionTypeEnum.java => RawFoilCachePositionTypeEnum.java} (61%) create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/vo/WeighPointToCachePointReqVO.java rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilcasheposition/RawFoilCashePositionController.java => rawfoilcacheposition/RawFoilCachePositionController.java} (50%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilcasheposition/vo/RawFoilCashePositionPageReqVO.java => rawfoilcacheposition/vo/RawFoilCachePositionPageReqVO.java} (86%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilcasheposition/vo/RawFoilCashePositionRespVO.java => rawfoilcacheposition/vo/RawFoilCachePositionRespVO.java} (93%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilcasheposition/vo/RawFoilCashePositionSaveReqVO.java => rawfoilcacheposition/vo/RawFoilCachePositionSaveReqVO.java} (90%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionController.java => rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionController.java} (55%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionPageReqVO.java => rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionPageReqVO.java} (81%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionRespVO.java => rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionRespVO.java} (95%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/{rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionSaveReqVO.java => rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionSaveReqVO.java} (94%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/{rawfoilcasheposition/RawFoilCashePositionDO.java => rawfoilcacheposition/RawFoilCachePositionDO.java} (86%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/{rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionDO.java => rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionDO.java} (87%) rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/{rawfoilcasheposition/RawFoilCashePositionMapper.java => rawfoilcacheposition/RawFoilCachePositionMapper.java} (56%) create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionMapper.java delete mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionMapper.java rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/{rawfoilcasheposition/RawFoilCashePositionService.java => rawfoilcacheposition/RawFoilCachePositionService.java} (73%) create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionServiceImpl.java delete mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionServiceImpl.java rename nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/{rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionService.java => rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionService.java} (56%) create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionServiceImpl.java delete mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionServiceImpl.java rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/{rawfoilcasheposition => rawfoilcacheposition}/index.ts (50%) create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercacheposition/index.ts delete mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercasheposition/index.ts rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/{rawfoilcasheposition => rawfoilcacheposition}/data.ts (94%) rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/{rawfoilcasheposition => rawfoilcacheposition}/index.vue (79%) rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/{rawfoilcasheposition => rawfoilcacheposition}/modules/form.vue (71%) rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/{rawfoilemptyrollercasheposition => rawfoilemptyrollercacheposition}/data.ts (95%) rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/{rawfoilemptyrollercasheposition => rawfoilemptyrollercacheposition}/index.vue (76%) rename nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/{rawfoilemptyrollercasheposition => rawfoilemptyrollercacheposition}/modules/form.vue (72%) diff --git a/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java b/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java index 79b11d7b..9912b4eb 100644 --- a/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java +++ b/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java @@ -24,13 +24,13 @@ public interface ErrorCodeConstants { ErrorCode RAW_FOIL_WORK_ORDER_NOT_SELECT = new ErrorCode(16, "生箔工单存在未完成的任务，请先完成任务"); // ========== 空辊缓存位 ========== - ErrorCode RAW_FOIL_EMPTY_ROLLER_CASHE_POSITION_NOT_EXISTS = new ErrorCode(9, "空辊缓存位不存在"); - ErrorCode EMPTY_ROLLER_CASHE_POSITION_WAIT_POINT_NOT_EXISTS = new ErrorCode(10, "空辊缓存位找不到等待点"); - ErrorCode EMPTY_ROLLER_CASHE_POSITION_NOT_ALLOCATE = new ErrorCode(18, "未查询到有空辊缓存位"); + ErrorCode RAW_FOIL_EMPTY_ROLLER_CACHE_POSITION_NOT_EXISTS = new ErrorCode(9, "空辊缓存位不存在"); + ErrorCode EMPTY_ROLLER_CACHE_POSITION_WAIT_POINT_NOT_EXISTS = new ErrorCode(10, "空辊缓存位找不到等待点"); + ErrorCode EMPTY_ROLLER_CACHE_POSITION_NOT_ALLOCATE = new ErrorCode(18, "未查询到有空辊缓存位"); // ========== 生箔母卷缓存位 ========== - ErrorCode RAW_FOIL_CASHE_POSITION_NOT_EXISTS = new ErrorCode(11, "生箔母卷缓存位不存在"); - ErrorCode RAW_FOIL_CASHE_POSITION_NOT_SELECT = new ErrorCode(13, "未查询到有生箔母卷缓存位"); + ErrorCode RAW_FOIL_CACHE_POSITION_NOT_EXISTS = new ErrorCode(11, "生箔母卷缓存位不存在"); + ErrorCode RAW_FOIL_CACHE_POSITION_NOT_SELECT = new ErrorCode(13, "未查询到有生箔母卷缓存位"); ErrorCode RAW_FOIL_TRANSPORT_TASK_CREATE_FAIL = new ErrorCode(14, "创建搬运任务失败"); // =========== 生箔任务 ========== diff --git a/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionStatus.java b/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionStatus.java new file mode 100644 index 00000000..76ac7ae4 --- /dev/null +++ b/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionStatus.java @@ -0,0 +1,28 @@ +package cn.code.nl.module.lms.enums; + +import lombok.Getter; + +/** + * @author dsh + * 2026/8/8 + */ +@Getter +public enum RawFoilCachePositionStatus { + + EMPTY("00","空"), + UNWRAPPED("01","未裹膜"), + WRAPPED("02","已裹膜"), + QUALITY_TESTING("03","已质检"), + BAKED("04","已烘烤"); + + + private String code; + + private String name; + + RawFoilCachePositionStatus(String code,String name){ + this.code = code; + this.name = name; + } + +} diff --git a/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCashePositionTypeEnum.java b/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionTypeEnum.java similarity index 61% rename from nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCashePositionTypeEnum.java rename to nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionTypeEnum.java index 501326c2..97ef6b22 100644 --- a/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCashePositionTypeEnum.java +++ b/nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/RawFoilCachePositionTypeEnum.java @@ -7,18 +7,19 @@ import lombok.Getter; * 2026/7/28 */ @Getter -public enum RawFoilCashePositionTypeEnum { +public enum RawFoilCachePositionTypeEnum { CONVENTIONAL("1","常规"), WEIGHING_BUFFER_POSITION("2","称重缓存位"), - WEIGHING_POSITION("3","称重位"); + WEIGHING_POSITION("3","称重位"), + QUALITY_TESTING_POSITION("4","质检位"); private String code; private String name; - RawFoilCashePositionTypeEnum(String code,String name){ + RawFoilCachePositionTypeEnum(String code,String name){ this.code = code; this.name = name; } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/AcsToLmsController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/AcsToLmsController.java index 84ebd4ab..b00a4256 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/AcsToLmsController.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/AcsToLmsController.java @@ -1,6 +1,7 @@ package cn.code.nl.module.lms.controller.acs; import cn.code.nl.framework.common.pojo.CommonResult; +import cn.code.nl.module.lms.controller.acs.vo.WeighPointToCachePointReqVO; import cn.code.nl.module.lms.controller.acs.vo.WeighingCompleteReqVO; import cn.code.nl.module.lms.service.acs.AcsToLmsService; import io.swagger.v3.oas.annotations.Operation; @@ -33,4 +34,11 @@ public class AcsToLmsController { acsToLmsService.weighingComplete(weighingCompleteReqVO); return CommonResult.success(null); } + + @PostMapping("/applyWeighPointToCachePoint") + @Operation(summary = "ACS申请母卷称重点入生箔缓存位任务") + public CommonResult applyWeighPointToCachePoint(@Valid @RequestBody WeighPointToCachePointReqVO weighPointToCachePointReqVO) { + acsToLmsService.applyWeighPointToCachePoint(weighPointToCachePointReqVO); + return CommonResult.success(null); + } } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/vo/WeighPointToCachePointReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/vo/WeighPointToCachePointReqVO.java new file mode 100644 index 00000000..3032de55 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/acs/vo/WeighPointToCachePointReqVO.java @@ -0,0 +1,17 @@ +package cn.code.nl.module.lms.controller.acs.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * @author dsh + * 2026/8/7 + */ +@Data +public class WeighPointToCachePointReqVO { + + @Schema(description = "母卷号") + @NotNull(message = "母卷号不能为空") + private String containerName; +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/RawFoilCashePositionController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/RawFoilCachePositionController.java similarity index 50% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/RawFoilCashePositionController.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/RawFoilCachePositionController.java index 413f4474..1d599298 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/RawFoilCashePositionController.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/RawFoilCachePositionController.java @@ -1,5 +1,6 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilcasheposition; +package cn.code.nl.module.lms.controller.admin.rawfoilcacheposition; +import cn.code.nl.module.lms.service.rawfoilcacheposition.RawFoilCachePositionService; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -8,7 +9,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -25,80 +25,79 @@ import cn.code.nl.framework.excel.core.util.ExcelUtils; import cn.code.nl.framework.apilog.core.annotation.ApiAccessLog; import static cn.code.nl.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; -import cn.code.nl.module.lms.service.rawfoilcasheposition.RawFoilCashePositionService; +import cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo.*; +import cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition.RawFoilCachePositionDO; @Tag(name = "管理后台 - 生箔母卷缓存位") @RestController -@RequestMapping("/lms/raw-foil-cashe-position") +@RequestMapping("/lms/raw-foil-cache-position") @Validated -public class RawFoilCashePositionController { +public class RawFoilCachePositionController { @Resource - private RawFoilCashePositionService rawFoilCashePositionService; + private RawFoilCachePositionService rawFoilCachePositionService; @PostMapping("/create") @Operation(summary = "创建生箔母卷缓存位") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:create')") - public CommonResult createRawFoilCashePosition(@Valid @RequestBody RawFoilCashePositionSaveReqVO createReqVO) { - return success(rawFoilCashePositionService.createRawFoilCashePosition(createReqVO)); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:create')") + public CommonResult createRawFoilCachePosition(@Valid @RequestBody RawFoilCachePositionSaveReqVO createReqVO) { + return success(rawFoilCachePositionService.createRawFoilCachePosition(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新生箔母卷缓存位") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:update')") - public CommonResult updateRawFoilCashePosition(@Valid @RequestBody RawFoilCashePositionSaveReqVO updateReqVO) { - rawFoilCashePositionService.updateRawFoilCashePosition(updateReqVO); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:update')") + public CommonResult updateRawFoilCachePosition(@Valid @RequestBody RawFoilCachePositionSaveReqVO updateReqVO) { + rawFoilCachePositionService.updateRawFoilCachePosition(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除生箔母卷缓存位") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:delete')") - public CommonResult deleteRawFoilCashePosition(@RequestParam("id") Long id) { - rawFoilCashePositionService.deleteRawFoilCashePosition(id); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:delete')") + public CommonResult deleteRawFoilCachePosition(@RequestParam("id") Long id) { + rawFoilCachePositionService.deleteRawFoilCachePosition(id); return success(true); } @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除生箔母卷缓存位") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:delete')") - public CommonResult deleteRawFoilCashePositionList(@RequestParam("ids") List ids) { - rawFoilCashePositionService.deleteRawFoilCashePositionListByIds(ids); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:delete')") + public CommonResult deleteRawFoilCachePositionList(@RequestParam("ids") List ids) { + rawFoilCachePositionService.deleteRawFoilCachePositionListByIds(ids); return success(true); } @GetMapping("/get") @Operation(summary = "获得生箔母卷缓存位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:query')") - public CommonResult getRawFoilCashePosition(@RequestParam("id") Long id) { - RawFoilCashePositionDO rawFoilCashePosition = rawFoilCashePositionService.getRawFoilCashePosition(id); - return success(BeanUtils.toBean(rawFoilCashePosition, RawFoilCashePositionRespVO.class)); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:query')") + public CommonResult getRawFoilCachePosition(@RequestParam("id") Long id) { + RawFoilCachePositionDO rawFoilCachePosition = rawFoilCachePositionService.getRawFoilCachePosition(id); + return success(BeanUtils.toBean(rawFoilCachePosition, RawFoilCachePositionRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得生箔母卷缓存位分页") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:query')") - public CommonResult> getRawFoilCashePositionPage(@Valid RawFoilCashePositionPageReqVO pageReqVO) { - PageResult pageResult = rawFoilCashePositionService.getRawFoilCashePositionPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, RawFoilCashePositionRespVO.class)); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:query')") + public CommonResult> getRawFoilCachePositionPage(@Valid RawFoilCachePositionPageReqVO pageReqVO) { + PageResult pageResult = rawFoilCachePositionService.getRawFoilCachePositionPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, RawFoilCachePositionRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出生箔母卷缓存位 Excel") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-cashe-position:export')") + @PreAuthorize("@ss.hasPermission('lms:raw-foil-cache-position:export')") @ApiAccessLog(operateType = EXPORT) - public void exportRawFoilCashePositionExcel(@Valid RawFoilCashePositionPageReqVO pageReqVO, + public void exportRawFoilCachePositionExcel(@Valid RawFoilCachePositionPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = rawFoilCashePositionService.getRawFoilCashePositionPage(pageReqVO).getList(); + List list = rawFoilCachePositionService.getRawFoilCachePositionPage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "生箔母卷缓存位.xls", "数据", RawFoilCashePositionRespVO.class, - BeanUtils.toBean(list, RawFoilCashePositionRespVO.class)); + ExcelUtils.write(response, "生箔母卷缓存位.xls", "数据", RawFoilCachePositionRespVO.class, + BeanUtils.toBean(list, RawFoilCachePositionRespVO.class)); } } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionPageReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionPageReqVO.java similarity index 86% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionPageReqVO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionPageReqVO.java index 524875a6..fbd4b878 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionPageReqVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionPageReqVO.java @@ -1,7 +1,6 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo; +package cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.code.nl.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; @@ -11,7 +10,7 @@ import static cn.code.nl.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_ @Schema(description = "管理后台 - 生箔母卷缓存位分页 Request VO") @Data -public class RawFoilCashePositionPageReqVO extends PageParam { +public class RawFoilCachePositionPageReqVO extends PageParam { @Schema(description = "点位编码") private String pointCode; diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionRespVO.java similarity index 93% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionRespVO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionRespVO.java index ef236200..77dc05c2 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionRespVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionRespVO.java @@ -1,16 +1,15 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo; +package cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @Schema(description = "管理后台 - 生箔母卷缓存位 Response VO") @Data @ExcelIgnoreUnannotated -public class RawFoilCashePositionRespVO { +public class RawFoilCachePositionRespVO { @Schema(description = "库存记录标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "30894") @ExcelProperty("库存记录标识") diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionSaveReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionSaveReqVO.java similarity index 90% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionSaveReqVO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionSaveReqVO.java index 0f9387ce..10f37eca 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcasheposition/vo/RawFoilCashePositionSaveReqVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilcacheposition/vo/RawFoilCachePositionSaveReqVO.java @@ -1,15 +1,14 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo; +package cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; import jakarta.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; @Schema(description = "管理后台 - 生箔母卷缓存位新增/修改 Request VO") @Data -public class RawFoilCashePositionSaveReqVO { +public class RawFoilCachePositionSaveReqVO { @Schema(description = "库存记录标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "30894") private Long ivtId; diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionController.java similarity index 55% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionController.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionController.java index 3889dc60..9ac7fafc 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionController.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionController.java @@ -1,4 +1,4 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition; +package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; @@ -8,7 +8,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -25,80 +24,80 @@ import cn.code.nl.framework.excel.core.util.ExcelUtils; import cn.code.nl.framework.apilog.core.annotation.ApiAccessLog; import static cn.code.nl.framework.apilog.core.enums.OperateTypeEnum.*; -import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionDO; -import cn.code.nl.module.lms.service.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionService; +import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo.*; +import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionDO; +import cn.code.nl.module.lms.service.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionService; @Tag(name = "管理后台 - 空辊缓存位") @RestController -@RequestMapping("/lms/raw-foil-empty-roller-cashe-position") +@RequestMapping("/lms/raw-foil-empty-roller-cache-position") @Validated -public class RawFoilEmptyRollerCashePositionController { +public class RawFoilEmptyRollerCachePositionController { @Resource - private RawFoilEmptyRollerCashePositionService rawFoilEmptyRollerCashePositionService; + private RawFoilEmptyRollerCachePositionService rawFoilEmptyRollerCachePositionService; @PostMapping("/create") @Operation(summary = "创建空辊缓存位") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:create')") - public CommonResult createRawFoilEmptyRollerCashePosition(@Valid @RequestBody RawFoilEmptyRollerCashePositionSaveReqVO createReqVO) { - return success(rawFoilEmptyRollerCashePositionService.createRawFoilEmptyRollerCashePosition(createReqVO)); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:create')") + public CommonResult createRawFoilEmptyRollerCachePosition(@Valid @RequestBody RawFoilEmptyRollerCachePositionSaveReqVO createReqVO) { + return success(rawFoilEmptyRollerCachePositionService.createRawFoilEmptyRollerCachePosition(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新空辊缓存位") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:update')") - public CommonResult updateRawFoilEmptyRollerCashePosition(@Valid @RequestBody RawFoilEmptyRollerCashePositionSaveReqVO updateReqVO) { - rawFoilEmptyRollerCashePositionService.updateRawFoilEmptyRollerCashePosition(updateReqVO); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:update')") + public CommonResult updateRawFoilEmptyRollerCachePosition(@Valid @RequestBody RawFoilEmptyRollerCachePositionSaveReqVO updateReqVO) { + rawFoilEmptyRollerCachePositionService.updateRawFoilEmptyRollerCachePosition(updateReqVO); return success(true); } @DeleteMapping("/delete") @Operation(summary = "删除空辊缓存位") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:delete')") - public CommonResult deleteRawFoilEmptyRollerCashePosition(@RequestParam("id") Long id) { - rawFoilEmptyRollerCashePositionService.deleteRawFoilEmptyRollerCashePosition(id); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:delete')") + public CommonResult deleteRawFoilEmptyRollerCachePosition(@RequestParam("id") Long id) { + rawFoilEmptyRollerCachePositionService.deleteRawFoilEmptyRollerCachePosition(id); return success(true); } @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除空辊缓存位") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:delete')") - public CommonResult deleteRawFoilEmptyRollerCashePositionList(@RequestParam("ids") List ids) { - rawFoilEmptyRollerCashePositionService.deleteRawFoilEmptyRollerCashePositionListByIds(ids); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:delete')") + public CommonResult deleteRawFoilEmptyRollerCachePositionList(@RequestParam("ids") List ids) { + rawFoilEmptyRollerCachePositionService.deleteRawFoilEmptyRollerCachePositionListByIds(ids); return success(true); } @GetMapping("/get") @Operation(summary = "获得空辊缓存位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:query')") - public CommonResult getRawFoilEmptyRollerCashePosition(@RequestParam("id") Long id) { - RawFoilEmptyRollerCashePositionDO rawFoilEmptyRollerCashePosition = rawFoilEmptyRollerCashePositionService.getRawFoilEmptyRollerCashePosition(id); - return success(BeanUtils.toBean(rawFoilEmptyRollerCashePosition, RawFoilEmptyRollerCashePositionRespVO.class)); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:query')") + public CommonResult getRawFoilEmptyRollerCachePosition(@RequestParam("id") Long id) { + RawFoilEmptyRollerCachePositionDO rawFoilEmptyRollerCachePosition = rawFoilEmptyRollerCachePositionService.getRawFoilEmptyRollerCachePosition(id); + return success(BeanUtils.toBean(rawFoilEmptyRollerCachePosition, RawFoilEmptyRollerCachePositionRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得空辊缓存位分页") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:query')") - public CommonResult> getRawFoilEmptyRollerCashePositionPage(@Valid RawFoilEmptyRollerCashePositionPageReqVO pageReqVO) { - PageResult pageResult = rawFoilEmptyRollerCashePositionService.getRawFoilEmptyRollerCashePositionPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, RawFoilEmptyRollerCashePositionRespVO.class)); + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:query')") + public CommonResult> getRawFoilEmptyRollerCachePositionPage(@Valid RawFoilEmptyRollerCachePositionPageReqVO pageReqVO) { + PageResult pageResult = rawFoilEmptyRollerCachePositionService.getRawFoilEmptyRollerCachePositionPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, RawFoilEmptyRollerCachePositionRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出空辊缓存位 Excel") - @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cashe-position:export')") + @PreAuthorize("@ss.hasPermission('lms:raw-foil-empty-roller-cache-position:export')") @ApiAccessLog(operateType = EXPORT) - public void exportRawFoilEmptyRollerCashePositionExcel(@Valid RawFoilEmptyRollerCashePositionPageReqVO pageReqVO, + public void exportRawFoilEmptyRollerCachePositionExcel(@Valid RawFoilEmptyRollerCachePositionPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = rawFoilEmptyRollerCashePositionService.getRawFoilEmptyRollerCashePositionPage(pageReqVO).getList(); + List list = rawFoilEmptyRollerCachePositionService.getRawFoilEmptyRollerCachePositionPage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "空辊缓存位.xls", "数据", RawFoilEmptyRollerCashePositionRespVO.class, - BeanUtils.toBean(list, RawFoilEmptyRollerCashePositionRespVO.class)); + ExcelUtils.write(response, "空辊缓存位.xls", "数据", RawFoilEmptyRollerCachePositionRespVO.class, + BeanUtils.toBean(list, RawFoilEmptyRollerCachePositionRespVO.class)); } } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionPageReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionPageReqVO.java similarity index 81% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionPageReqVO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionPageReqVO.java index ee9c0ede..5c8dd304 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionPageReqVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionPageReqVO.java @@ -1,14 +1,12 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo; +package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.code.nl.framework.common.pojo.PageParam; -import java.math.BigDecimal; @Schema(description = "管理后台 - 空辊缓存位分页 Request VO") @Data -public class RawFoilEmptyRollerCashePositionPageReqVO extends PageParam { +public class RawFoilEmptyRollerCachePositionPageReqVO extends PageParam { @Schema(description = "点位编码") private String pointCode; diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionRespVO.java similarity index 95% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionRespVO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionRespVO.java index 180ec7e8..158f5efc 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionRespVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionRespVO.java @@ -1,15 +1,15 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo; +package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import cn.idev.excel.annotation.*; @Schema(description = "管理后台 - 空辊缓存位 Response VO") @Data @ExcelIgnoreUnannotated -public class RawFoilEmptyRollerCashePositionRespVO { +public class RawFoilEmptyRollerCachePositionRespVO { @Schema(description = "点位标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "1242") @ExcelProperty("点位标识") diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionSaveReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionSaveReqVO.java similarity index 94% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionSaveReqVO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionSaveReqVO.java index 0920357d..54b47f77 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercasheposition/vo/RawFoilEmptyRollerCashePositionSaveReqVO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/rawfoilemptyrollercacheposition/vo/RawFoilEmptyRollerCachePositionSaveReqVO.java @@ -1,14 +1,13 @@ -package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo; +package cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; @Schema(description = "管理后台 - 空辊缓存位新增/修改 Request VO") @Data -public class RawFoilEmptyRollerCashePositionSaveReqVO { +public class RawFoilEmptyRollerCachePositionSaveReqVO { @Schema(description = "点位标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "1242") private Long pointId; diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilcasheposition/RawFoilCashePositionDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilcacheposition/RawFoilCachePositionDO.java similarity index 86% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilcasheposition/RawFoilCashePositionDO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilcacheposition/RawFoilCachePositionDO.java index 28961f60..6d04eea6 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilcasheposition/RawFoilCashePositionDO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilcacheposition/RawFoilCachePositionDO.java @@ -1,4 +1,4 @@ -package cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition; +package cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition; import lombok.*; import java.util.*; @@ -11,15 +11,15 @@ import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; * * @author 诺力管理员 */ -@TableName("lms_rawfoil_casheposition") -@KeySequence("lms_rawfoil_casheposition_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("lms_rawfoil_cacheposition") +@KeySequence("lms_rawfoil_cacheposition_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class RawFoilCashePositionDO extends BaseDO { +public class RawFoilCachePositionDO extends BaseDO { /** * 库存记录标识 diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionDO.java similarity index 87% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionDO.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionDO.java index 19a3490f..56832508 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionDO.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionDO.java @@ -1,4 +1,4 @@ -package cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition; +package cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition; import lombok.*; import java.util.*; @@ -11,15 +11,15 @@ import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; * * @author 诺力管理员 */ -@TableName("lms_rawfoil_emptyroller_casheposition") -@KeySequence("lms_rawfoil_emptyroller_casheposition_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("lms_rawfoil_emptyroller_cacheposition") +@KeySequence("lms_rawfoil_emptyroller_cacheposition_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class RawFoilEmptyRollerCashePositionDO extends BaseDO { +public class RawFoilEmptyRollerCachePositionDO extends BaseDO { /** * 点位标识 diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilcasheposition/RawFoilCashePositionMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilcacheposition/RawFoilCachePositionMapper.java similarity index 56% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilcasheposition/RawFoilCashePositionMapper.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilcacheposition/RawFoilCachePositionMapper.java index cd27b058..29108c8a 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilcasheposition/RawFoilCashePositionMapper.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilcacheposition/RawFoilCachePositionMapper.java @@ -1,4 +1,4 @@ -package cn.code.nl.module.lms.dal.mysql.rawfoilcasheposition; +package cn.code.nl.module.lms.dal.mysql.rawfoilcacheposition; import java.time.LocalDateTime; import java.util.*; @@ -8,11 +8,10 @@ import cn.code.nl.framework.common.pojo.PageResult; import cn.code.nl.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.code.nl.framework.mybatis.core.mapper.BaseMapperX; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; +import cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition.RawFoilCachePositionDO; import cn.code.nl.module.lms.enums.LockStatusEnum; -import cn.code.nl.module.lms.enums.RawFoilCashePositionTypeEnum; import org.apache.ibatis.annotations.Mapper; -import cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo.*; +import cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo.*; /** * 生箔母卷缓存位 Mapper @@ -20,17 +19,17 @@ import cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo.*; * @author 诺力管理员 */ @Mapper -public interface RawFoilCashePositionMapper extends BaseMapperX { +public interface RawFoilCachePositionMapper extends BaseMapperX { - default PageResult selectPage(RawFoilCashePositionPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(RawFoilCashePositionDO::getPointCode, reqVO.getPointCode()) - .likeIfPresent(RawFoilCashePositionDO::getContainerName, reqVO.getContainerName()) - .betweenIfPresent(RawFoilCashePositionDO::getInstorageTime, reqVO.getInstorageTime()) - .eqIfPresent(RawFoilCashePositionDO::getProductionArea, reqVO.getProductionArea()) - .eqIfPresent(RawFoilCashePositionDO::getIsUsed, reqVO.getIsUsed()) - .eqIfPresent(RawFoilCashePositionDO::getCoolIvtStatus, reqVO.getCoolIvtStatus()) - .orderByDesc(RawFoilCashePositionDO::getIvtId)); + default PageResult selectPage(RawFoilCachePositionPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(RawFoilCachePositionDO::getPointCode, reqVO.getPointCode()) + .likeIfPresent(RawFoilCachePositionDO::getContainerName, reqVO.getContainerName()) + .betweenIfPresent(RawFoilCachePositionDO::getInstorageTime, reqVO.getInstorageTime()) + .eqIfPresent(RawFoilCachePositionDO::getProductionArea, reqVO.getProductionArea()) + .eqIfPresent(RawFoilCachePositionDO::getIsUsed, reqVO.getIsUsed()) + .eqIfPresent(RawFoilCachePositionDO::getCoolIvtStatus, reqVO.getCoolIvtStatus()) + .orderByDesc(RawFoilCachePositionDO::getIvtId)); } /** @@ -40,14 +39,14 @@ public interface RawFoilCashePositionMapper extends BaseMapperX selectEmptyPositionList(String pointType) { - return selectList(new LambdaQueryWrapperX() - .eq(RawFoilCashePositionDO::getPointType, pointType) - .eq(RawFoilCashePositionDO::getIsUsed, CommonStatusEnum.DISABLE.getStatus()) - .and(w -> w.isNull(RawFoilCashePositionDO::getContainerName) - .or().eq(RawFoilCashePositionDO::getContainerName, "")) - .eq(RawFoilCashePositionDO::getLockStatus, LockStatusEnum.IDLE.getCode()) - .orderByAsc(RawFoilCashePositionDO::getSortSeq)); + default List selectEmptyPositionList(String pointType) { + return selectList(new LambdaQueryWrapperX() + .eq(RawFoilCachePositionDO::getPointType, pointType) + .eq(RawFoilCachePositionDO::getIsUsed, CommonStatusEnum.DISABLE.getStatus()) + .and(w -> w.isNull(RawFoilCachePositionDO::getContainerName) + .or().eq(RawFoilCachePositionDO::getContainerName, "")) + .eq(RawFoilCachePositionDO::getLockStatus, LockStatusEnum.IDLE.getCode()) + .orderByAsc(RawFoilCachePositionDO::getSortSeq)); } /** @@ -57,11 +56,11 @@ public interface RawFoilCashePositionMapper extends BaseMapperX() - .eq(RawFoilCashePositionDO::getIvtId, ivtId) - .eq(RawFoilCashePositionDO::getLockStatus, LockStatusEnum.IDLE.getCode())); + return update(updateObj, new LambdaUpdateWrapper() + .eq(RawFoilCachePositionDO::getIvtId, ivtId) + .eq(RawFoilCachePositionDO::getLockStatus, LockStatusEnum.IDLE.getCode())); } /** @@ -71,11 +70,11 @@ public interface RawFoilCashePositionMapper extends BaseMapperX() - .eq(RawFoilCashePositionDO::getPointCode, pointCode) - .eq(RawFoilCashePositionDO::getLockStatus, LockStatusEnum.OCCUPIED.getCode())); + return update(updateObj, new LambdaUpdateWrapper() + .eq(RawFoilCachePositionDO::getPointCode, pointCode) + .eq(RawFoilCachePositionDO::getLockStatus, LockStatusEnum.OCCUPIED.getCode())); } /** @@ -89,16 +88,16 @@ public interface RawFoilCashePositionMapper extends BaseMapperX() - .eq(RawFoilCashePositionDO::getPointCode, pointCode) - .eq(RawFoilCashePositionDO::getLockStatus, LockStatusEnum.OCCUPIED.getCode()) - .and(w -> w.isNull(RawFoilCashePositionDO::getContainerName) - .or().eq(RawFoilCashePositionDO::getContainerName, ""))); + return update(updateObj, new LambdaUpdateWrapper() + .eq(RawFoilCachePositionDO::getPointCode, pointCode) + .eq(RawFoilCachePositionDO::getLockStatus, LockStatusEnum.OCCUPIED.getCode()) + .and(w -> w.isNull(RawFoilCachePositionDO::getContainerName) + .or().eq(RawFoilCachePositionDO::getContainerName, ""))); } /** @@ -110,12 +109,12 @@ public interface RawFoilCashePositionMapper extends BaseMapperX() - .set(RawFoilCashePositionDO::getContainerName, null) - .set(RawFoilCashePositionDO::getWorkorderId, null) - .set(RawFoilCashePositionDO::getInstorageTime, null) - .eq(RawFoilCashePositionDO::getPointCode, pointCode) - .eq(RawFoilCashePositionDO::getContainerName, containerName)); + return update(null, new LambdaUpdateWrapper() + .set(RawFoilCachePositionDO::getContainerName, null) + .set(RawFoilCachePositionDO::getWorkorderId, null) + .set(RawFoilCachePositionDO::getInstorageTime, null) + .eq(RawFoilCachePositionDO::getPointCode, pointCode) + .eq(RawFoilCachePositionDO::getContainerName, containerName)); } } \ No newline at end of file diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionMapper.java new file mode 100644 index 00000000..4858a204 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionMapper.java @@ -0,0 +1,85 @@ +package cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercacheposition; + +import java.util.*; + +import cn.code.nl.framework.common.enums.CommonStatusEnum; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.code.nl.framework.mybatis.core.mapper.BaseMapperX; +import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionDO; +import cn.code.nl.module.lms.enums.LockStatusEnum; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.apache.ibatis.annotations.Mapper; +import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo.*; + +/** + * 空辊缓存位 Mapper + * + * @author 诺力管理员 + */ +@Mapper +public interface RawFoilEmptyRollerCachePositionMapper extends BaseMapperX { + + default PageResult selectPage(RawFoilEmptyRollerCachePositionPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(RawFoilEmptyRollerCachePositionDO::getPointCode, reqVO.getPointCode()) + .eqIfPresent(RawFoilEmptyRollerCachePositionDO::getProductionArea, reqVO.getProductionArea()) + .eqIfPresent(RawFoilEmptyRollerCachePositionDO::getIsUsed, reqVO.getIsUsed()) + .eqIfPresent(RawFoilEmptyRollerCachePositionDO::getHasStock, reqVO.getHasStock()) + .orderByDesc(RawFoilEmptyRollerCachePositionDO::getPointId)); + } + + /** + * 根据点位类型获取空辊缓存位等待点 + * @param pointType 点位类型 3:生箔空辊等待点 4:分切空辊等待点 + * @return RawFoilEmptyRollerCachePositionDO + */ + default RawFoilEmptyRollerCachePositionDO selectEmptyRollerWaitPointByPointType(String pointType){ + return selectOne(RawFoilEmptyRollerCachePositionDO::getPointType, pointType, + RawFoilEmptyRollerCachePositionDO::getIsUsed, CommonStatusEnum.DISABLE.getStatus()); + } + + /** + * 根据点位类型查询空闲且未占用的候选点位列表 + * 筛选条件：点位类型、已启用、有货无货、未占用，按顺序号降序 + * + * @param pointType 点位类型, hasStock 是否有货 + * @return 候选点位列表 + */ + default List selectEmptyPositionList(String pointType,String hasStock){ + return selectList(new LambdaQueryWrapperX() + .eq(RawFoilEmptyRollerCachePositionDO::getHasStock,hasStock) + .eq(RawFoilEmptyRollerCachePositionDO::getPointType,pointType) + .eq(RawFoilEmptyRollerCachePositionDO::getIsUsed,CommonStatusEnum.DISABLE.getStatus()) + .eq(RawFoilEmptyRollerCachePositionDO::getLockStatus,LockStatusEnum.IDLE.getCode()) + .orderByDesc(RawFoilEmptyRollerCachePositionDO::getSortSeq) + ); + } + + +// default List selectEmptyPositionList(String pointType) { +// return selectList(new LambdaQueryWrapperX() +// .eq(RawFoilCachePositionDO::getPointType, pointType) +// .eq(RawFoilCachePositionDO::getIsUsed, CommonStatusEnum.DISABLE.getStatus()) +// .and(w -> w.isNull(RawFoilCachePositionDO::getContainerName) +// .or().eq(RawFoilCachePositionDO::getContainerName, "")) +// .eq(RawFoilCachePositionDO::getLockStatus, LockStatusEnum.IDLE.getCode()) +// .orderByAsc(RawFoilCachePositionDO::getSortSeq)); +// } + + /** + * CAS 占用候选点位：仅当点位空闲时更新为占用 + * + * @param pointId 点位标识 + * @return 影响行数，大于 0 表示抢占成功 + */ + default int lockPosition(Long pointId){ + RawFoilEmptyRollerCachePositionDO updateObj = new RawFoilEmptyRollerCachePositionDO(); + updateObj.setLockStatus(LockStatusEnum.OCCUPIED.getCode()); + return update(updateObj, new LambdaUpdateWrapper<>(RawFoilEmptyRollerCachePositionDO.class) + .eq(RawFoilEmptyRollerCachePositionDO::getPointId,pointId) + .eq(RawFoilEmptyRollerCachePositionDO::getLockStatus,LockStatusEnum.IDLE.getCode()) + ); + } + +} \ No newline at end of file diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionMapper.java deleted file mode 100644 index 86856563..00000000 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionMapper.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercasheposition; - -import java.util.*; - -import cn.code.nl.framework.common.enums.CommonStatusEnum; -import cn.code.nl.framework.common.pojo.PageResult; -import cn.code.nl.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.code.nl.framework.mybatis.core.mapper.BaseMapperX; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; -import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionDO; -import cn.code.nl.module.lms.enums.EmptyRollerPointTypeEnum; -import cn.code.nl.module.lms.enums.LockStatusEnum; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import org.apache.ibatis.annotations.Mapper; -import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo.*; - -/** - * 空辊缓存位 Mapper - * - * @author 诺力管理员 - */ -@Mapper -public interface RawFoilEmptyRollerCashePositionMapper extends BaseMapperX { - - default PageResult selectPage(RawFoilEmptyRollerCashePositionPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(RawFoilEmptyRollerCashePositionDO::getPointCode, reqVO.getPointCode()) - .eqIfPresent(RawFoilEmptyRollerCashePositionDO::getProductionArea, reqVO.getProductionArea()) - .eqIfPresent(RawFoilEmptyRollerCashePositionDO::getIsUsed, reqVO.getIsUsed()) - .eqIfPresent(RawFoilEmptyRollerCashePositionDO::getHasStock, reqVO.getHasStock()) - .orderByDesc(RawFoilEmptyRollerCashePositionDO::getPointId)); - } - - /** - * 根据点位类型获取空辊缓存位等待点 - * @param pointType 点位类型 3:生箔空辊等待点 4:分切空辊等待点 - * @return RawFoilEmptyRollerCashePositionDO - */ - default RawFoilEmptyRollerCashePositionDO selectEmptyRollerWaitPointByPointType(String pointType){ - return selectOne(RawFoilEmptyRollerCashePositionDO::getPointType, pointType, - RawFoilEmptyRollerCashePositionDO::getIsUsed, CommonStatusEnum.DISABLE.getStatus()); - } - - /** - * 根据点位类型查询空闲且未占用的候选点位列表 - * 筛选条件：点位类型、已启用、有货无货、未占用，按顺序号降序 - * - * @param pointType 点位类型, hasStock 是否有货 - * @return 候选点位列表 - */ - default List selectEmptyPositionList(String pointType,String hasStock){ - return selectList(new LambdaQueryWrapperX() - .eq(RawFoilEmptyRollerCashePositionDO::getHasStock,hasStock) - .eq(RawFoilEmptyRollerCashePositionDO::getPointType,pointType) - .eq(RawFoilEmptyRollerCashePositionDO::getIsUsed,CommonStatusEnum.DISABLE.getStatus()) - .eq(RawFoilEmptyRollerCashePositionDO::getLockStatus,LockStatusEnum.IDLE.getCode()) - .orderByDesc(RawFoilEmptyRollerCashePositionDO::getSortSeq) - ); - } - - -// default List selectEmptyPositionList(String pointType) { -// return selectList(new LambdaQueryWrapperX() -// .eq(RawFoilCashePositionDO::getPointType, pointType) -// .eq(RawFoilCashePositionDO::getIsUsed, CommonStatusEnum.DISABLE.getStatus()) -// .and(w -> w.isNull(RawFoilCashePositionDO::getContainerName) -// .or().eq(RawFoilCashePositionDO::getContainerName, "")) -// .eq(RawFoilCashePositionDO::getLockStatus, LockStatusEnum.IDLE.getCode()) -// .orderByAsc(RawFoilCashePositionDO::getSortSeq)); -// } - - /** - * CAS 占用候选点位：仅当点位空闲时更新为占用 - * - * @param pointId 点位标识 - * @return 影响行数，大于 0 表示抢占成功 - */ - default int lockPosition(Long pointId){ - RawFoilEmptyRollerCashePositionDO updateObj = new RawFoilEmptyRollerCashePositionDO(); - updateObj.setLockStatus(LockStatusEnum.OCCUPIED.getCode()); - return update(updateObj, new LambdaUpdateWrapper<>(RawFoilEmptyRollerCashePositionDO.class) - .eq(RawFoilEmptyRollerCashePositionDO::getPointId,pointId) - .eq(RawFoilEmptyRollerCashePositionDO::getLockStatus,LockStatusEnum.IDLE.getCode()) - ); - } - -} \ No newline at end of file diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsService.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsService.java index fa6680ec..6c093020 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsService.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsService.java @@ -1,6 +1,7 @@ package cn.code.nl.module.lms.service.acs; import cn.code.nl.framework.common.pojo.CommonResult; +import cn.code.nl.module.lms.controller.acs.vo.WeighPointToCachePointReqVO; import cn.code.nl.module.lms.controller.acs.vo.WeighingCompleteReqVO; /** @@ -13,4 +14,10 @@ public interface AcsToLmsService { * 称重完成 */ void weighingComplete(WeighingCompleteReqVO weighingCompleteReqVO); + + /** + * ACS申请母卷称重点入生箔缓存位任务 + * @param weighPointToCachePointReqVO + */ + void applyWeighPointToCachePoint(WeighPointToCachePointReqVO weighPointToCachePointReqVO); } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsServiceImpl.java index 629f1c02..ddbdd58d 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsServiceImpl.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/acs/AcsToLmsServiceImpl.java @@ -2,17 +2,16 @@ package cn.code.nl.module.lms.service.acs; import cn.code.nl.framework.common.pojo.CommonResult; import cn.code.nl.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.code.nl.module.lms.controller.acs.vo.WeighPointToCachePointReqVO; import cn.code.nl.module.lms.controller.acs.vo.WeighingCompleteReqVO; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; +import cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition.RawFoilCachePositionDO; import cn.code.nl.module.lms.dal.dataobject.rawfoilworkorder.RawFoilWorkOrderDO; -import cn.code.nl.module.lms.dal.mysql.rawfoilcasheposition.RawFoilCashePositionMapper; +import cn.code.nl.module.lms.dal.mysql.rawfoilcacheposition.RawFoilCachePositionMapper; import cn.code.nl.module.lms.dal.mysql.rawfoilworkorder.RawFoilWorkOrderMapper; -import cn.code.nl.module.lms.enums.RawFoilCashePositionTypeEnum; +import cn.code.nl.module.lms.enums.RawFoilCachePositionTypeEnum; import cn.code.nl.module.lms.enums.RawFoilHandleCodeConstants; -import cn.code.nl.module.lms.enums.RawFoilWorkOrderStatusEnum; -import cn.code.nl.module.lms.service.rawfoilcasheposition.RawFoilCashePositionService; +import cn.code.nl.module.lms.service.rawfoilcacheposition.RawFoilCachePositionService; import cn.code.nl.module.task.api.TransportTaskApi; -import cn.code.nl.module.task.dto.TaskInfoDTO; import cn.code.nl.module.task.dto.TransportTaskCreateReqDTO; import cn.code.nl.module.task.enums.AcsTaskTypeEnum; import cn.code.nl.module.task.enums.TaskOwnerServiceEnum; @@ -45,13 +44,13 @@ public class AcsToLmsServiceImpl implements AcsToLmsService { private RawFoilWorkOrderMapper rawFoilWorkOrderMapper; @Resource - private RawFoilCashePositionMapper rawFoilCashePositionMapper; + private RawFoilCachePositionMapper rawFoilCachePositionMapper; @Resource - private RawFoilCashePositionService rawFoilCashePositionService; + private RawFoilCachePositionService rawFoilCachePositionService; /** - * ACS 上报称重完成：校验后更新工单重量，创建母卷从称重位到常规缓存位的入库搬运任务 + * ACS 上报称重完成：校验后更新工单重量， * * @param weighingCompleteReqVO 称重完成请求信息 */ @@ -64,45 +63,37 @@ public class AcsToLmsServiceImpl implements AcsToLmsService { if (workOrder == null) { throw exception(RAW_FOIL_WORK_ORDER_NOT_EXISTS); } - // 2. 校验工单状态为执行中（称重完成只可能发生在需要空轴任务下发之后） -// if (!RawFoilWorkOrderStatusEnum.EXECUTION.getCode().equals(workOrder.getStatus())) { -// throw exception(RAW_FOIL_WORK_ORDER_STATUS_NOT_EXECUTION); -// } - // 3. 幂等校验：母卷存在在途搬运任务则拒绝（拦截任务执行期间的重复上报） - CommonResult> runningResult = transportTaskApi - .getRunningTaskByMaterialCode(containerName, TaskOwnerServiceEnum.LMS.getCode()); - if (runningResult.isError()) { - log.error("查询在途搬运任务失败, containerName={}, 返回={}", containerName, runningResult); - throw exception(RAW_FOIL_WORK_ORDER_FAIL); - } - if (CollUtil.isNotEmpty(runningResult.getData())) { - throw exception(RAW_FOIL_WORK_ORDER_NOT_SELECT); - } - // 4. 起点：称重位 - List weighingPositions = rawFoilCashePositionMapper.selectList( - new LambdaQueryWrapperX() - .eq(RawFoilCashePositionDO::getPointType, - RawFoilCashePositionTypeEnum.WEIGHING_POSITION.getCode())); - if (CollUtil.isEmpty(weighingPositions)) { - throw exception(RAW_FOIL_WEIGHING_POSITION_NOT_EXISTS); - } - RawFoilCashePositionDO weighingPosition = weighingPositions.get(0); - // 5. 校验母卷在称重位 - if (!containerName.equals(weighingPosition.getContainerName())) { - throw exception(RAW_FOIL_CONTAINER_NOT_ON_WEIGHING_POSITION); - } - - // 6. 更新生箔工单重量 + // 2. 更新生箔工单重量 RawFoilWorkOrderDO weightUpdate = new RawFoilWorkOrderDO(); weightUpdate.setWorkorderId(workOrder.getWorkorderId()); weightUpdate.setProductWeight(weighingCompleteReqVO.getProductWeight()); rawFoilWorkOrderMapper.updateById(weightUpdate); + } - // 7. 终点：分配常规缓存位并 CAS 占用 - RawFoilCashePositionDO conventionalPosition = rawFoilCashePositionService.allocateConventionalPosition(); + @Override + public void applyWeighPointToCachePoint(WeighPointToCachePointReqVO weighPointToCachePointReqVO) { + String containerName = weighPointToCachePointReqVO.getContainerName(); - // 8. 创建入库搬运任务；失败必须补偿释放已占用的常规位，否则点位死锁 + // 1. 起点：称重位 + List weighingPositions = rawFoilCachePositionMapper.selectList( + new LambdaQueryWrapperX() + .eq(RawFoilCachePositionDO::getPointType, + RawFoilCachePositionTypeEnum.WEIGHING_POSITION.getCode())); + if (CollUtil.isEmpty(weighingPositions)) { + throw exception(RAW_FOIL_WEIGHING_POSITION_NOT_EXISTS); + } + RawFoilCachePositionDO weighingPosition = weighingPositions.get(0); + + // 2. 校验母卷在称重位 + if (!containerName.equals(weighingPosition.getContainerName())) { + throw exception(RAW_FOIL_CONTAINER_NOT_ON_WEIGHING_POSITION); + } + + // 3. 终点：分配常规缓存位并 CAS 占用 + RawFoilCachePositionDO conventionalPosition = rawFoilCachePositionService.allocateConventionalPosition(); + + // 4. 创建入库搬运任务；失败必须补偿释放已占用的常规位，否则点位死锁 try { TransportTaskCreateReqDTO reqDTO = new TransportTaskCreateReqDTO(); reqDTO.setTaskName(UUID.randomUUID().toString()); @@ -114,7 +105,7 @@ public class AcsToLmsServiceImpl implements AcsToLmsService { reqDTO.setPointCode2(conventionalPosition.getPointCode()); reqDTO.setMaterialCode(containerName); reqDTO.setPriority("1"); - reqDTO.setProductArea(workOrder.getProductionArea()); + reqDTO.setProductArea(weighingPosition.getProductionArea()); reqDTO.setIsAutoIssue("1"); reqDTO.setIsCreateFinish(true); reqDTO.setTaskType(TaskTypeEnum.RAW_FOIL_INSTORAGE_TASK.getCode()); @@ -127,7 +118,7 @@ public class AcsToLmsServiceImpl implements AcsToLmsService { } } catch (Exception e) { // 补偿释放：常规缓存位 - rawFoilCashePositionService.releasePositionLock(conventionalPosition.getPointCode()); + rawFoilCachePositionService.releasePositionLock(conventionalPosition.getPointCode()); throw e; } } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/pda/RawFoilServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/pda/RawFoilServiceImpl.java index 147ba1f1..0031473e 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/pda/RawFoilServiceImpl.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/pda/RawFoilServiceImpl.java @@ -5,15 +5,15 @@ import cn.code.nl.framework.common.pojo.CommonResult; import cn.code.nl.framework.common.util.object.BeanUtils; import cn.code.nl.module.base.api.materialbase.MaterialBaseApi; import cn.code.nl.module.base.api.materialbase.dto.MaterialBaseRespDTO; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; -import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionDO; +import cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition.RawFoilCachePositionDO; +import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionDO; import cn.code.nl.module.lms.dal.dataobject.rawfoilpointivt.RawFoilPointIVTDO; import cn.code.nl.module.lms.dal.dataobject.rawfoilworkorder.RawFoilWorkOrderDO; -import cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionMapper; +import cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionMapper; import cn.code.nl.module.lms.dal.mysql.rawfoilpointivt.RawFoilPointIVTMapper; import cn.code.nl.module.lms.dal.mysql.rawfoilworkorder.RawFoilWorkOrderMapper; import cn.code.nl.module.lms.enums.*; -import cn.code.nl.module.lms.service.rawfoilcasheposition.RawFoilCashePositionService; +import cn.code.nl.module.lms.service.rawfoilcacheposition.RawFoilCachePositionService; import cn.code.nl.module.lms.service.rawfoilpointivt.RawFoilPointIVTService; import cn.code.nl.module.task.enums.AcsTaskTypeEnum; import cn.code.nl.module.lms.controller.pda.vo.NeedEmptyAxisReqVO; @@ -50,13 +50,13 @@ public class RawFoilServiceImpl implements RawFoilService{ private RawFoilPointIVTMapper rawFoilPointIVTMapper; @Resource - private RawFoilEmptyRollerCashePositionMapper rawFoilEmptyRollerCashePositionMapper; + private RawFoilEmptyRollerCachePositionMapper rawFoilEmptyRollerCachePositionMapper; @Resource private TransportTaskApi transportTaskApi; @Resource - private RawFoilCashePositionService rawFoilCashePositionService; + private RawFoilCachePositionService rawFoilCachePositionService; @Resource private RawFoilPointIVTService rawFoilPointIVTService; @@ -119,9 +119,9 @@ public class RawFoilServiceImpl implements RawFoilService{ // 4.分配母卷下料位 分配规则:称重位>称重缓存位>母卷缓存位离称重位近的点位优先 // 校验是否存在空辊等待点 - RawFoilEmptyRollerCashePositionDO emptyRollerCashePositionDO = rawFoilEmptyRollerCashePositionMapper.selectEmptyRollerWaitPointByPointType(EmptyRollerPointTypeEnum.RAW_FOIL_EMPTY_ROLLER_WAIT_POINT.getCode()); - if (ObjectUtil.isEmpty(emptyRollerCashePositionDO)){ - throw exception(EMPTY_ROLLER_CASHE_POSITION_WAIT_POINT_NOT_EXISTS); + RawFoilEmptyRollerCachePositionDO emptyRollerCachePositionDO = rawFoilEmptyRollerCachePositionMapper.selectEmptyRollerWaitPointByPointType(EmptyRollerPointTypeEnum.RAW_FOIL_EMPTY_ROLLER_WAIT_POINT.getCode()); + if (ObjectUtil.isEmpty(emptyRollerCachePositionDO)){ + throw exception(EMPTY_ROLLER_CACHE_POSITION_WAIT_POINT_NOT_EXISTS); } // 分配并占用生箔机点位（校验点位存在、已启用；CAS 占用，抢占失败抛出点位被占用异常） @@ -133,7 +133,7 @@ public class RawFoilServiceImpl implements RawFoilService{ reqDTO.setHandleCode(RawFoilHandleCodeConstants.RAW_FOIL_TASK); reqDTO.setAcsTaskType(AcsTaskTypeEnum.TRUSS_TASK.getCode()); reqDTO.setAgvSystemType("1"); - reqDTO.setPointCode1(emptyRollerCashePositionDO.getPointCode()); + reqDTO.setPointCode1(emptyRollerCachePositionDO.getPointCode()); reqDTO.setPointCode2(rawFoilPointIVTDO.getPointCode() + "_M"); reqDTO.setPointCode3(rawFoilPointIVTDO.getPointCode() + "_K"); reqDTO.setMaterialCode(rawFoilWorkOrderDO.getContainerName()); @@ -144,10 +144,10 @@ public class RawFoilServiceImpl implements RawFoilService{ reqDTO.setTaskType(TaskTypeEnum.RAW_FOIL_STANDARD_TASK.getCode()); // 分配母卷下料位并占用、创建搬运任务；失败时补偿释放已占用的点位，避免点位死锁 - RawFoilCashePositionDO unloadingPosition = null; + RawFoilCachePositionDO unloadingPosition = null; try { // 分配母卷下料位并占用（优先级：称重位 > 称重缓存位 > 常规缓存位） - unloadingPosition = rawFoilCashePositionService.allocateUnloadingPosition(); + unloadingPosition = rawFoilCachePositionService.allocateUnloadingPosition(); reqDTO.setPointCode4(unloadingPosition.getPointCode()); CommonResult result = transportTaskApi.createTransportTask(reqDTO); @@ -160,7 +160,7 @@ public class RawFoilServiceImpl implements RawFoilService{ // 补偿释放：生箔机点位 + 母卷下料位（下料位尚未分配成功时跳过） rawFoilPointIVTService.releasePointLock(rawFoilPointIVTDO.getPointCode()); if (ObjectUtil.isNotEmpty(unloadingPosition)) { - rawFoilCashePositionService.releasePositionLock(unloadingPosition.getPointCode()); + rawFoilCachePositionService.releasePositionLock(unloadingPosition.getPointCode()); } throw e; } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionService.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionService.java similarity index 73% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionService.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionService.java index e738ade5..8d173133 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionService.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionService.java @@ -1,18 +1,17 @@ -package cn.code.nl.module.lms.service.rawfoilcasheposition; +package cn.code.nl.module.lms.service.rawfoilcacheposition; import java.util.*; import jakarta.validation.*; -import cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; +import cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo.*; +import cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition.RawFoilCachePositionDO; import cn.code.nl.framework.common.pojo.PageResult; -import cn.code.nl.framework.common.pojo.PageParam; /** * 生箔母卷缓存位 Service 接口 * * @author 诺力管理员 */ -public interface RawFoilCashePositionService { +public interface RawFoilCachePositionService { /** * 创建生箔母卷缓存位 @@ -20,28 +19,28 @@ public interface RawFoilCashePositionService { * @param createReqVO 创建信息 * @return 编号 */ - Long createRawFoilCashePosition(@Valid RawFoilCashePositionSaveReqVO createReqVO); + Long createRawFoilCachePosition(@Valid RawFoilCachePositionSaveReqVO createReqVO); /** * 更新生箔母卷缓存位 * * @param updateReqVO 更新信息 */ - void updateRawFoilCashePosition(@Valid RawFoilCashePositionSaveReqVO updateReqVO); + void updateRawFoilCachePosition(@Valid RawFoilCachePositionSaveReqVO updateReqVO); /** * 删除生箔母卷缓存位 * * @param id 编号 */ - void deleteRawFoilCashePosition(Long id); + void deleteRawFoilCachePosition(Long id); /** * 批量删除生箔母卷缓存位 * * @param ids 编号 */ - void deleteRawFoilCashePositionListByIds(List ids); + void deleteRawFoilCachePositionListByIds(List ids); /** * 获得生箔母卷缓存位 @@ -49,7 +48,7 @@ public interface RawFoilCashePositionService { * @param id 编号 * @return 生箔母卷缓存位 */ - RawFoilCashePositionDO getRawFoilCashePosition(Long id); + RawFoilCachePositionDO getRawFoilCachePosition(Long id); /** * 获得生箔母卷缓存位分页 @@ -57,7 +56,7 @@ public interface RawFoilCashePositionService { * @param pageReqVO 分页查询 * @return 生箔母卷缓存位分页 */ - PageResult getRawFoilCashePositionPage(RawFoilCashePositionPageReqVO pageReqVO); + PageResult getRawFoilCachePositionPage(RawFoilCachePositionPageReqVO pageReqVO); /** * 分配母卷下料位并占用 @@ -66,7 +65,7 @@ public interface RawFoilCashePositionService { * * @return 已占用的下料位 */ - RawFoilCashePositionDO allocateUnloadingPosition(); + RawFoilCachePositionDO allocateUnloadingPosition(); /** * 母卷到达下料位：写入母卷信息并释放占用（任务完成回调用） @@ -90,7 +89,7 @@ public interface RawFoilCashePositionService { * * @return 已占用的常规缓存位 */ - RawFoilCashePositionDO allocateConventionalPosition(); + RawFoilCachePositionDO allocateConventionalPosition(); /** * 母卷离开起点：清空起点点位（称重位）上的母卷记录（任务完成回调用） diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionServiceImpl.java new file mode 100644 index 00000000..696203d5 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcacheposition/RawFoilCachePositionServiceImpl.java @@ -0,0 +1,149 @@ +package cn.code.nl.module.lms.service.rawfoilcacheposition; + +import cn.code.nl.module.lms.enums.RawFoilCachePositionTypeEnum; +import cn.hutool.core.util.IdUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.time.LocalDateTime; +import java.util.*; +import cn.code.nl.module.lms.controller.admin.rawfoilcacheposition.vo.*; +import cn.code.nl.module.lms.dal.dataobject.rawfoilcacheposition.RawFoilCachePositionDO; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.common.util.object.BeanUtils; + +import cn.code.nl.module.lms.dal.mysql.rawfoilcacheposition.RawFoilCachePositionMapper; + +import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertList; +import static cn.code.nl.module.lms.enums.ErrorCodeConstants.*; + +/** + * 生箔母卷缓存位 Service 实现类 + * + * @author 诺力管理员 + */ +@Slf4j +@Service +@Validated +public class RawFoilCachePositionServiceImpl implements RawFoilCachePositionService { + + /** 母卷下料位分配优先级：称重位 > 称重缓存位 > 质检位 > 常规缓存位 */ + private static final List UNLOADING_POSITION_PRIORITY = List.of( + RawFoilCachePositionTypeEnum.WEIGHING_POSITION.getCode(), + RawFoilCachePositionTypeEnum.WEIGHING_BUFFER_POSITION.getCode(), + RawFoilCachePositionTypeEnum.QUALITY_TESTING_POSITION.getCode(), + RawFoilCachePositionTypeEnum.CONVENTIONAL.getCode()); + + @Resource + private RawFoilCachePositionMapper rawFoilCachePositionMapper; + + @Override + public Long createRawFoilCachePosition(RawFoilCachePositionSaveReqVO createReqVO) { + // 插入 + RawFoilCachePositionDO rawFoilCachePosition = BeanUtils.toBean(createReqVO, RawFoilCachePositionDO.class); + rawFoilCachePosition.setIvtId(IdUtil.getSnowflakeNextId()); + rawFoilCachePositionMapper.insert(rawFoilCachePosition); + + // 返回 + return rawFoilCachePosition.getIvtId(); + } + + @Override + public void updateRawFoilCachePosition(RawFoilCachePositionSaveReqVO updateReqVO) { + // 校验存在 + validateRawFoilCachePositionExists(updateReqVO.getIvtId()); + // 更新 + RawFoilCachePositionDO updateObj = BeanUtils.toBean(updateReqVO, RawFoilCachePositionDO.class); + rawFoilCachePositionMapper.updateById(updateObj); + } + + @Override + public void deleteRawFoilCachePosition(Long id) { + // 校验存在 + validateRawFoilCachePositionExists(id); + // 删除 + rawFoilCachePositionMapper.deleteById(id); + } + + @Override + public void deleteRawFoilCachePositionListByIds(List ids) { + // 删除 + rawFoilCachePositionMapper.deleteByIds(ids); + } + + + private void validateRawFoilCachePositionExists(Long id) { + if (rawFoilCachePositionMapper.selectById(id) == null) { + throw exception(RAW_FOIL_CACHE_POSITION_NOT_EXISTS); + } + } + + @Override + public RawFoilCachePositionDO getRawFoilCachePosition(Long id) { + return rawFoilCachePositionMapper.selectById(id); + } + + @Override + public PageResult getRawFoilCachePositionPage(RawFoilCachePositionPageReqVO pageReqVO) { + return rawFoilCachePositionMapper.selectPage(pageReqVO); + } + + @Override + public RawFoilCachePositionDO allocateUnloadingPosition() { + return allocatePositionByPriority(UNLOADING_POSITION_PRIORITY); + } + + @Override + public RawFoilCachePositionDO allocateConventionalPosition() { + // 常规缓存位无优先级排序需求，单类型直接分配 + return allocatePositionByPriority(List.of(RawFoilCachePositionTypeEnum.CONVENTIONAL.getCode())); + } + + /** + * 按点位类型优先级顺序分配点位并占用 + * 逐级查询某类型全部空闲候选位，逐个尝试 CAS 占用；抢占失败（已被并发请求抢走）则顺延下一个候选位 + * + * @param pointTypes 点位类型编码优先级列表 + * @return 已占用的点位 + */ + private RawFoilCachePositionDO allocatePositionByPriority(List pointTypes) { + for (String pointType : pointTypes) { + List candidates = rawFoilCachePositionMapper.selectEmptyPositionList(pointType); + for (RawFoilCachePositionDO candidate : candidates) { + if (rawFoilCachePositionMapper.lockPosition(candidate.getIvtId()) > 0) { + return candidate; + } + } + } + throw exception(RAW_FOIL_CACHE_POSITION_NOT_SELECT); + } + + @Override + public void handlePositionInstorage(String pointCode, String containerName, String workorderId) { + int rows = rawFoilCachePositionMapper.instoragePosition(pointCode, containerName, + workorderId, LocalDateTime.now()); + if (rows == 0) { + log.info("下料位入库跳过（点位未被占用或已入库）, pointCode={}, containerName={}", pointCode, containerName); + } + } + + @Override + public void releasePositionLock(String pointCode) { + int rows = rawFoilCachePositionMapper.releaseLockByPointCode(pointCode); + if (rows == 0) { + log.info("下料位占用释放跳过（点位未被占用）, pointCode={}", pointCode); + } + } + + @Override + public void handlePositionOutstock(String pointCode, String containerName) { + int rows = rawFoilCachePositionMapper.outstockPosition(pointCode, containerName); + if (rows == 0) { + log.info("起点母卷出库跳过（点位上无该母卷）, pointCode={}, containerName={}", pointCode, containerName); + } + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionServiceImpl.java deleted file mode 100644 index 35e21cfb..00000000 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilcasheposition/RawFoilCashePositionServiceImpl.java +++ /dev/null @@ -1,152 +0,0 @@ -package cn.code.nl.module.lms.service.rawfoilcasheposition; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.*; -import cn.code.nl.module.lms.controller.admin.rawfoilcasheposition.vo.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; -import cn.code.nl.module.lms.enums.RawFoilCashePositionTypeEnum; -import cn.code.nl.framework.common.pojo.PageResult; -import cn.code.nl.framework.common.pojo.PageParam; -import cn.code.nl.framework.common.util.object.BeanUtils; - -import cn.code.nl.module.lms.dal.mysql.rawfoilcasheposition.RawFoilCashePositionMapper; - -import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertList; -import static cn.code.nl.framework.common.util.collection.CollectionUtils.diffList; -import static cn.code.nl.module.lms.enums.ErrorCodeConstants.*; - -/** - * 生箔母卷缓存位 Service 实现类 - * - * @author 诺力管理员 - */ -@Slf4j -@Service -@Validated -public class RawFoilCashePositionServiceImpl implements RawFoilCashePositionService { - - /** 母卷下料位分配优先级：称重位 > 称重缓存位 > 常规缓存位 */ - private static final List UNLOADING_POSITION_PRIORITY = List.of( - RawFoilCashePositionTypeEnum.WEIGHING_POSITION.getCode(), - RawFoilCashePositionTypeEnum.WEIGHING_BUFFER_POSITION.getCode(), - RawFoilCashePositionTypeEnum.CONVENTIONAL.getCode()); - - @Resource - private RawFoilCashePositionMapper rawFoilCashePositionMapper; - - @Override - public Long createRawFoilCashePosition(RawFoilCashePositionSaveReqVO createReqVO) { - // 插入 - RawFoilCashePositionDO rawFoilCashePosition = BeanUtils.toBean(createReqVO, RawFoilCashePositionDO.class); - rawFoilCashePosition.setIvtId(IdUtil.getSnowflakeNextId()); - rawFoilCashePositionMapper.insert(rawFoilCashePosition); - - // 返回 - return rawFoilCashePosition.getIvtId(); - } - - @Override - public void updateRawFoilCashePosition(RawFoilCashePositionSaveReqVO updateReqVO) { - // 校验存在 - validateRawFoilCashePositionExists(updateReqVO.getIvtId()); - // 更新 - RawFoilCashePositionDO updateObj = BeanUtils.toBean(updateReqVO, RawFoilCashePositionDO.class); - rawFoilCashePositionMapper.updateById(updateObj); - } - - @Override - public void deleteRawFoilCashePosition(Long id) { - // 校验存在 - validateRawFoilCashePositionExists(id); - // 删除 - rawFoilCashePositionMapper.deleteById(id); - } - - @Override - public void deleteRawFoilCashePositionListByIds(List ids) { - // 删除 - rawFoilCashePositionMapper.deleteByIds(ids); - } - - - private void validateRawFoilCashePositionExists(Long id) { - if (rawFoilCashePositionMapper.selectById(id) == null) { - throw exception(RAW_FOIL_CASHE_POSITION_NOT_EXISTS); - } - } - - @Override - public RawFoilCashePositionDO getRawFoilCashePosition(Long id) { - return rawFoilCashePositionMapper.selectById(id); - } - - @Override - public PageResult getRawFoilCashePositionPage(RawFoilCashePositionPageReqVO pageReqVO) { - return rawFoilCashePositionMapper.selectPage(pageReqVO); - } - - @Override - public RawFoilCashePositionDO allocateUnloadingPosition() { - return allocatePositionByPriority(UNLOADING_POSITION_PRIORITY); - } - - @Override - public RawFoilCashePositionDO allocateConventionalPosition() { - // 常规缓存位无优先级排序需求，单类型直接分配 - return allocatePositionByPriority(List.of(RawFoilCashePositionTypeEnum.CONVENTIONAL.getCode())); - } - - /** - * 按点位类型优先级顺序分配点位并占用 - * 逐级查询某类型全部空闲候选位，逐个尝试 CAS 占用；抢占失败（已被并发请求抢走）则顺延下一个候选位 - * - * @param pointTypes 点位类型编码优先级列表 - * @return 已占用的点位 - */ - private RawFoilCashePositionDO allocatePositionByPriority(List pointTypes) { - for (String pointType : pointTypes) { - List candidates = rawFoilCashePositionMapper.selectEmptyPositionList(pointType); - for (RawFoilCashePositionDO candidate : candidates) { - if (rawFoilCashePositionMapper.lockPosition(candidate.getIvtId()) > 0) { - return candidate; - } - } - } - throw exception(RAW_FOIL_CASHE_POSITION_NOT_SELECT); - } - - @Override - public void handlePositionInstorage(String pointCode, String containerName, String workorderId) { - int rows = rawFoilCashePositionMapper.instoragePosition(pointCode, containerName, - workorderId, LocalDateTime.now()); - if (rows == 0) { - log.info("下料位入库跳过（点位未被占用或已入库）, pointCode={}, containerName={}", pointCode, containerName); - } - } - - @Override - public void releasePositionLock(String pointCode) { - int rows = rawFoilCashePositionMapper.releaseLockByPointCode(pointCode); - if (rows == 0) { - log.info("下料位占用释放跳过（点位未被占用）, pointCode={}", pointCode); - } - } - - @Override - public void handlePositionOutstock(String pointCode, String containerName) { - int rows = rawFoilCashePositionMapper.outstockPosition(pointCode, containerName); - if (rows == 0) { - log.info("起点母卷出库跳过（点位上无该母卷）, pointCode={}, containerName={}", pointCode, containerName); - } - } - -} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionService.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionService.java similarity index 56% rename from nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionService.java rename to nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionService.java index 1877e222..576a6470 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionService.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionService.java @@ -1,20 +1,18 @@ -package cn.code.nl.module.lms.service.rawfoilemptyrollercasheposition; +package cn.code.nl.module.lms.service.rawfoilemptyrollercacheposition; import java.util.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; +import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionDO; import jakarta.validation.*; -import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionDO; +import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo.*; import cn.code.nl.framework.common.pojo.PageResult; -import cn.code.nl.framework.common.pojo.PageParam; /** * 空辊缓存位 Service 接口 * * @author 诺力管理员 */ -public interface RawFoilEmptyRollerCashePositionService { +public interface RawFoilEmptyRollerCachePositionService { /** * 创建空辊缓存位 @@ -22,28 +20,28 @@ public interface RawFoilEmptyRollerCashePositionService { * @param createReqVO 创建信息 * @return 编号 */ - Long createRawFoilEmptyRollerCashePosition(@Valid RawFoilEmptyRollerCashePositionSaveReqVO createReqVO); + Long createRawFoilEmptyRollerCachePosition(@Valid RawFoilEmptyRollerCachePositionSaveReqVO createReqVO); /** * 更新空辊缓存位 * * @param updateReqVO 更新信息 */ - void updateRawFoilEmptyRollerCashePosition(@Valid RawFoilEmptyRollerCashePositionSaveReqVO updateReqVO); + void updateRawFoilEmptyRollerCachePosition(@Valid RawFoilEmptyRollerCachePositionSaveReqVO updateReqVO); /** * 删除空辊缓存位 * * @param id 编号 */ - void deleteRawFoilEmptyRollerCashePosition(Long id); + void deleteRawFoilEmptyRollerCachePosition(Long id); /** * 批量删除空辊缓存位 * * @param ids 编号 */ - void deleteRawFoilEmptyRollerCashePositionListByIds(List ids); + void deleteRawFoilEmptyRollerCachePositionListByIds(List ids); /** * 获得空辊缓存位 @@ -51,7 +49,7 @@ public interface RawFoilEmptyRollerCashePositionService { * @param id 编号 * @return 空辊缓存位 */ - RawFoilEmptyRollerCashePositionDO getRawFoilEmptyRollerCashePosition(Long id); + RawFoilEmptyRollerCachePositionDO getRawFoilEmptyRollerCachePosition(Long id); /** * 获得空辊缓存位分页 @@ -59,7 +57,7 @@ public interface RawFoilEmptyRollerCashePositionService { * @param pageReqVO 分页查询 * @return 空辊缓存位分页 */ - PageResult getRawFoilEmptyRollerCashePositionPage(RawFoilEmptyRollerCashePositionPageReqVO pageReqVO); + PageResult getRawFoilEmptyRollerCachePositionPage(RawFoilEmptyRollerCachePositionPageReqVO pageReqVO); /** * 分配空辊位并占用 @@ -68,6 +66,6 @@ public interface RawFoilEmptyRollerCashePositionService { * * @return 已占用的空辊位 */ - RawFoilEmptyRollerCashePositionDO allocateLoadingPosition(String pointType); + RawFoilEmptyRollerCachePositionDO allocateLoadingPosition(String pointType); } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionServiceImpl.java new file mode 100644 index 00000000..2a310dc3 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercacheposition/RawFoilEmptyRollerCachePositionServiceImpl.java @@ -0,0 +1,97 @@ +package cn.code.nl.module.lms.service.rawfoilemptyrollercacheposition; + +import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionDO; +import cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionMapper; +import cn.code.nl.module.lms.enums.StockStatusEnum; +import cn.hutool.core.util.IdUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercacheposition.vo.*; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.common.util.object.BeanUtils; + +import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertList; +import static cn.code.nl.module.lms.enums.ErrorCodeConstants.*; + +/** + * 空辊缓存位 Service 实现类 + * + * @author 诺力管理员 + */ +@Service +@Validated +public class RawFoilEmptyRollerCachePositionServiceImpl implements RawFoilEmptyRollerCachePositionService { + + @Resource + private RawFoilEmptyRollerCachePositionMapper rawFoilEmptyRollerCachePositionMapper; + + @Override + public Long createRawFoilEmptyRollerCachePosition(RawFoilEmptyRollerCachePositionSaveReqVO createReqVO) { + // 插入 + RawFoilEmptyRollerCachePositionDO rawFoilEmptyRollerCachePosition = BeanUtils.toBean(createReqVO, RawFoilEmptyRollerCachePositionDO.class); + + rawFoilEmptyRollerCachePosition.setPointId(IdUtil.getSnowflakeNextId()); + rawFoilEmptyRollerCachePositionMapper.insert(rawFoilEmptyRollerCachePosition); + + // 返回 + return rawFoilEmptyRollerCachePosition.getPointId(); + } + + @Override + public void updateRawFoilEmptyRollerCachePosition(RawFoilEmptyRollerCachePositionSaveReqVO updateReqVO) { + // 校验存在 + validateRawFoilEmptyRollerCachePositionExists(updateReqVO.getPointId()); + // 更新 + RawFoilEmptyRollerCachePositionDO updateObj = BeanUtils.toBean(updateReqVO, RawFoilEmptyRollerCachePositionDO.class); + rawFoilEmptyRollerCachePositionMapper.updateById(updateObj); + } + + @Override + public void deleteRawFoilEmptyRollerCachePosition(Long id) { + // 校验存在 + validateRawFoilEmptyRollerCachePositionExists(id); + // 删除 + rawFoilEmptyRollerCachePositionMapper.deleteById(id); + } + + @Override + public void deleteRawFoilEmptyRollerCachePositionListByIds(List ids) { + // 删除 + rawFoilEmptyRollerCachePositionMapper.deleteByIds(ids); + } + + + private void validateRawFoilEmptyRollerCachePositionExists(Long id) { + if (rawFoilEmptyRollerCachePositionMapper.selectById(id) == null) { + throw exception(RAW_FOIL_EMPTY_ROLLER_CACHE_POSITION_NOT_EXISTS); + } + } + + @Override + public RawFoilEmptyRollerCachePositionDO getRawFoilEmptyRollerCachePosition(Long id) { + return rawFoilEmptyRollerCachePositionMapper.selectById(id); + } + + @Override + public PageResult getRawFoilEmptyRollerCachePositionPage(RawFoilEmptyRollerCachePositionPageReqVO pageReqVO) { + return rawFoilEmptyRollerCachePositionMapper.selectPage(pageReqVO); + } + + @Override + public RawFoilEmptyRollerCachePositionDO allocateLoadingPosition(String pointType) { + + List candidates = rawFoilEmptyRollerCachePositionMapper.selectEmptyPositionList(pointType, StockStatusEnum.YES.getCode()); + // 尝试 CAS 占用 + for (RawFoilEmptyRollerCachePositionDO candidate : candidates) { + if (rawFoilEmptyRollerCachePositionMapper.lockPosition(candidate.getPointId()) > 0) { + return candidate; + } + } + throw exception(EMPTY_ROLLER_CACHE_POSITION_NOT_ALLOCATE); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionServiceImpl.java deleted file mode 100644 index c7f2864c..00000000 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/rawfoilemptyrollercasheposition/RawFoilEmptyRollerCashePositionServiceImpl.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.code.nl.module.lms.service.rawfoilemptyrollercasheposition; - -import cn.code.nl.module.lms.dal.dataobject.rawfoilcasheposition.RawFoilCashePositionDO; -import cn.code.nl.module.lms.enums.StockStatusEnum; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.*; -import cn.code.nl.module.lms.controller.admin.rawfoilemptyrollercasheposition.vo.*; -import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionDO; -import cn.code.nl.framework.common.pojo.PageResult; -import cn.code.nl.framework.common.pojo.PageParam; -import cn.code.nl.framework.common.util.object.BeanUtils; - -import cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionMapper; - -import static cn.code.nl.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.code.nl.framework.common.util.collection.CollectionUtils.convertList; -import static cn.code.nl.framework.common.util.collection.CollectionUtils.diffList; -import static cn.code.nl.module.lms.enums.ErrorCodeConstants.*; - -/** - * 空辊缓存位 Service 实现类 - * - * @author 诺力管理员 - */ -@Service -@Validated -public class RawFoilEmptyRollerCashePositionServiceImpl implements RawFoilEmptyRollerCashePositionService { - - @Resource - private RawFoilEmptyRollerCashePositionMapper rawFoilEmptyRollerCashePositionMapper; - - @Override - public Long createRawFoilEmptyRollerCashePosition(RawFoilEmptyRollerCashePositionSaveReqVO createReqVO) { - // 插入 - RawFoilEmptyRollerCashePositionDO rawFoilEmptyRollerCashePosition = BeanUtils.toBean(createReqVO, RawFoilEmptyRollerCashePositionDO.class); - - rawFoilEmptyRollerCashePosition.setPointId(IdUtil.getSnowflakeNextId()); - rawFoilEmptyRollerCashePositionMapper.insert(rawFoilEmptyRollerCashePosition); - - // 返回 - return rawFoilEmptyRollerCashePosition.getPointId(); - } - - @Override - public void updateRawFoilEmptyRollerCashePosition(RawFoilEmptyRollerCashePositionSaveReqVO updateReqVO) { - // 校验存在 - validateRawFoilEmptyRollerCashePositionExists(updateReqVO.getPointId()); - // 更新 - RawFoilEmptyRollerCashePositionDO updateObj = BeanUtils.toBean(updateReqVO, RawFoilEmptyRollerCashePositionDO.class); - rawFoilEmptyRollerCashePositionMapper.updateById(updateObj); - } - - @Override - public void deleteRawFoilEmptyRollerCashePosition(Long id) { - // 校验存在 - validateRawFoilEmptyRollerCashePositionExists(id); - // 删除 - rawFoilEmptyRollerCashePositionMapper.deleteById(id); - } - - @Override - public void deleteRawFoilEmptyRollerCashePositionListByIds(List ids) { - // 删除 - rawFoilEmptyRollerCashePositionMapper.deleteByIds(ids); - } - - - private void validateRawFoilEmptyRollerCashePositionExists(Long id) { - if (rawFoilEmptyRollerCashePositionMapper.selectById(id) == null) { - throw exception(RAW_FOIL_EMPTY_ROLLER_CASHE_POSITION_NOT_EXISTS); - } - } - - @Override - public RawFoilEmptyRollerCashePositionDO getRawFoilEmptyRollerCashePosition(Long id) { - return rawFoilEmptyRollerCashePositionMapper.selectById(id); - } - - @Override - public PageResult getRawFoilEmptyRollerCashePositionPage(RawFoilEmptyRollerCashePositionPageReqVO pageReqVO) { - return rawFoilEmptyRollerCashePositionMapper.selectPage(pageReqVO); - } - - @Override - public RawFoilEmptyRollerCashePositionDO allocateLoadingPosition(String pointType) { - - List candidates = rawFoilEmptyRollerCashePositionMapper.selectEmptyPositionList(pointType, StockStatusEnum.YES.getCode()); - // 尝试 CAS 占用 - for (RawFoilEmptyRollerCashePositionDO candidate : candidates) { - if (rawFoilEmptyRollerCashePositionMapper.lockPosition(candidate.getPointId()) > 0) { - return candidate; - } - } - throw exception(EMPTY_ROLLER_CASHE_POSITION_NOT_ALLOCATE); - } - -} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/task/RawFoilTask.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/task/RawFoilTask.java index a51ffd54..e4613a44 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/task/RawFoilTask.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/task/RawFoilTask.java @@ -3,17 +3,15 @@ package cn.code.nl.module.lms.task; import cn.code.nl.framework.common.pojo.CommonResult; import cn.code.nl.framework.execute.core.AbstractTask; import cn.code.nl.framework.execute.core.dto.TaskExecuteDTO; -import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionDO; +import cn.code.nl.module.lms.dal.dataobject.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionDO; import cn.code.nl.module.lms.dal.dataobject.rawfoilworkorder.RawFoilWorkOrderDO; -import cn.code.nl.module.lms.dal.mysql.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionMapper; import cn.code.nl.module.lms.dal.mysql.rawfoilworkorder.RawFoilWorkOrderMapper; import cn.code.nl.module.lms.enums.EmptyRollerPointTypeEnum; import cn.code.nl.module.lms.enums.RawFoilHandleCodeConstants; -import cn.code.nl.module.lms.service.rawfoilcasheposition.RawFoilCashePositionService; -import cn.code.nl.module.lms.service.rawfoilemptyrollercasheposition.RawFoilEmptyRollerCashePositionService; +import cn.code.nl.module.lms.service.rawfoilcacheposition.RawFoilCachePositionService; +import cn.code.nl.module.lms.service.rawfoilemptyrollercacheposition.RawFoilEmptyRollerCachePositionService; import cn.code.nl.module.task.api.TransportTaskApi; import cn.code.nl.module.task.dto.TaskInfoDTO; -import cn.code.nl.module.task.enums.TransportTaskStatusEnum; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -37,10 +35,10 @@ public class RawFoilTask extends AbstractTask { private TransportTaskApi transportTaskApi; @Resource - private RawFoilCashePositionService rawFoilCashePositionService; + private RawFoilCachePositionService rawFoilCachePositionService; @Resource - private RawFoilEmptyRollerCashePositionService rawFoilEmptyRollerCashePositionService; + private RawFoilEmptyRollerCachePositionService rawFoilEmptyRollerCachePositionService; @Resource private RawFoilWorkOrderMapper rawFoilWorkOrderMapper; @@ -66,7 +64,7 @@ public class RawFoilTask extends AbstractTask { } String workorderId = workOrder != null ? String.valueOf(workOrder.getWorkorderId()) : null; // 母卷到达下料位：写入母卷信息并释放占用 - rawFoilCashePositionService.handlePositionInstorage( + rawFoilCachePositionService.handlePositionInstorage( task.getPointCode4(), task.getMaterialCode(), workorderId); @@ -83,7 +81,7 @@ public class RawFoilTask extends AbstractTask { if (task == null) { return; } - rawFoilCashePositionService.releasePositionLock(task.getPointCode4()); + rawFoilCachePositionService.releasePositionLock(task.getPointCode4()); } @Override @@ -93,8 +91,8 @@ public class RawFoilTask extends AbstractTask { throw exception(RAW_FOIL_TASK_ERROR); } //二次分配库位 分配生箔空辊点 - RawFoilEmptyRollerCashePositionDO rawFoilEmptyRollerCashePositionDO = rawFoilEmptyRollerCashePositionService.allocateLoadingPosition(EmptyRollerPointTypeEnum.RAW_FOIL_EMPTY_ROLLER_POINT.getCode()); - return rawFoilEmptyRollerCashePositionDO.getPointCode(); + RawFoilEmptyRollerCachePositionDO rawFoilEmptyRollerCachePositionDO = rawFoilEmptyRollerCachePositionService.allocateLoadingPosition(EmptyRollerPointTypeEnum.RAW_FOIL_EMPTY_ROLLER_POINT.getCode()); + return rawFoilEmptyRollerCachePositionDO.getPointCode(); } /** diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilcasheposition/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilcacheposition/index.ts similarity index 50% rename from nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilcasheposition/index.ts rename to nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilcacheposition/index.ts index cf6c3ebe..cc5afaa0 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilcasheposition/index.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilcacheposition/index.ts @@ -3,9 +3,9 @@ import type { Dayjs } from 'dayjs'; import { requestClient } from '#/api/request'; -export namespace LmsRawFoilCashePositionApi { +export namespace LmsRawFoilCachePositionApi { /** 生箔母卷缓存位信息 */ - export interface RawFoilCashePosition { + export interface RawFoilCachePosition { ivtId: number; // 库存记录标识 pointCode?: string; // 点位编码 containerName: string; // 母卷号 @@ -23,45 +23,45 @@ export namespace LmsRawFoilCashePositionApi { } /** 查询生箔母卷缓存位分页 */ -export function getRawFoilCashePositionPage(params: PageParam) { - return requestClient.get>( - '/lms/raw-foil-cashe-position/page', +export function getRawFoilCachePositionPage(params: PageParam) { + return requestClient.get>( + '/lms/raw-foil-cache-position/page', { params }, ); } /** 查询生箔母卷缓存位详情 */ -export function getRawFoilCashePosition(id: number) { - return requestClient.get( - `/lms/raw-foil-cashe-position/get?id=${id}`, +export function getRawFoilCachePosition(id: number) { + return requestClient.get( + `/lms/raw-foil-cache-position/get?id=${id}`, ); } /** 新增生箔母卷缓存位 */ -export function createRawFoilCashePosition(data: LmsRawFoilCashePositionApi.RawFoilCashePosition) { - return requestClient.post('/lms/raw-foil-cashe-position/create', data); +export function createRawFoilCachePosition(data: LmsRawFoilCachePositionApi.RawFoilCachePosition) { + return requestClient.post('/lms/raw-foil-cache-position/create', data); } /** 修改生箔母卷缓存位 */ -export function updateRawFoilCashePosition(data: LmsRawFoilCashePositionApi.RawFoilCashePosition) { - return requestClient.put('/lms/raw-foil-cashe-position/update', data); +export function updateRawFoilCachePosition(data: LmsRawFoilCachePositionApi.RawFoilCachePosition) { + return requestClient.put('/lms/raw-foil-cache-position/update', data); } /** 删除生箔母卷缓存位 */ -export function deleteRawFoilCashePosition(id: number) { - return requestClient.delete(`/lms/raw-foil-cashe-position/delete?id=${id}`); +export function deleteRawFoilCachePosition(id: number) { + return requestClient.delete(`/lms/raw-foil-cache-position/delete?id=${id}`); } /** 批量删除生箔母卷缓存位 */ -export function deleteRawFoilCashePositionList(ids: number[]) { +export function deleteRawFoilCachePositionList(ids: number[]) { return requestClient.delete( - `/lms/raw-foil-cashe-position/delete-list?ids=${ids.join(',')}`, + `/lms/raw-foil-cache-position/delete-list?ids=${ids.join(',')}`, ); } /** 导出生箔母卷缓存位 */ -export function exportRawFoilCashePosition(params: any) { - return requestClient.download('/lms/raw-foil-cashe-position/export-excel', { params }); +export function exportRawFoilCachePosition(params: any) { + return requestClient.download('/lms/raw-foil-cache-position/export-excel', { params }); } diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercacheposition/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercacheposition/index.ts new file mode 100644 index 00000000..59fa14bc --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercacheposition/index.ts @@ -0,0 +1,68 @@ +import type { PageParam, PageResult } from '@vben/request'; +import type { Dayjs } from 'dayjs'; + +import { requestClient } from '#/api/request'; + +export namespace LmsRawFoilEmptyRollerCachePositionApi { + /** 空辊缓存位信息 */ + export interface RawFoilEmptyRollerCachePosition { + pointId: number; // 点位标识 + pointCode?: string; // 点位编码 + vehicleCode: string; // 载具编码 + productionArea: string; // 生产区域 + pointLocation: string; // 位置 + remark: string; // 备注 + isUsed?: string; // 是否启用 + creator: string; // 创建人 + createTime?: string; // 创建时间 + updater: string; // 修改人 + updateTime?: string; // 修改时间 + weight: number; // 重量 + hasStock?: string; // 是否有货 + sortSeq?: number; // 顺序号 + } +} + +/** 查询空辊缓存位分页 */ +export function getRawFoilEmptyRollerCachePositionPage(params: PageParam) { + return requestClient.get>( + '/lms/raw-foil-empty-roller-cache-position/page', + { params }, + ); +} + +/** 查询空辊缓存位详情 */ +export function getRawFoilEmptyRollerCachePosition(id: number) { + return requestClient.get( + `/lms/raw-foil-empty-roller-cache-position/get?id=${id}`, + ); +} + +/** 新增空辊缓存位 */ +export function createRawFoilEmptyRollerCachePosition(data: LmsRawFoilEmptyRollerCachePositionApi.RawFoilEmptyRollerCachePosition) { + return requestClient.post('/lms/raw-foil-empty-roller-cache-position/create', data); +} + +/** 修改空辊缓存位 */ +export function updateRawFoilEmptyRollerCachePosition(data: LmsRawFoilEmptyRollerCachePositionApi.RawFoilEmptyRollerCachePosition) { + return requestClient.put('/lms/raw-foil-empty-roller-cache-position/update', data); +} + +/** 删除空辊缓存位 */ +export function deleteRawFoilEmptyRollerCachePosition(id: number) { + return requestClient.delete(`/lms/raw-foil-empty-roller-cache-position/delete?id=${id}`); +} + +/** 批量删除空辊缓存位 */ +export function deleteRawFoilEmptyRollerCachePositionList(ids: number[]) { + return requestClient.delete( + `/lms/raw-foil-empty-roller-cache-position/delete-list?ids=${ids.join(',')}`, + ); +} + +/** 导出空辊缓存位 */ +export function exportRawFoilEmptyRollerCachePosition(params: any) { + return requestClient.download('/lms/raw-foil-empty-roller-cache-position/export-excel', { params }); +} + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercasheposition/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercasheposition/index.ts deleted file mode 100644 index 57844fcb..00000000 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/rawfoilemptyrollercasheposition/index.ts +++ /dev/null @@ -1,68 +0,0 @@ -import type { PageParam, PageResult } from '@vben/request'; -import type { Dayjs } from 'dayjs'; - -import { requestClient } from '#/api/request'; - -export namespace LmsRawFoilEmptyRollerCashePositionApi { - /** 空辊缓存位信息 */ - export interface RawFoilEmptyRollerCashePosition { - pointId: number; // 点位标识 - pointCode?: string; // 点位编码 - vehicleCode: string; // 载具编码 - productionArea: string; // 生产区域 - pointLocation: string; // 位置 - remark: string; // 备注 - isUsed?: string; // 是否启用 - creator: string; // 创建人 - createTime?: string; // 创建时间 - updater: string; // 修改人 - updateTime?: string; // 修改时间 - weight: number; // 重量 - hasStock?: string; // 是否有货 - sortSeq?: number; // 顺序号 - } -} - -/** 查询空辊缓存位分页 */ -export function getRawFoilEmptyRollerCashePositionPage(params: PageParam) { - return requestClient.get>( - '/lms/raw-foil-empty-roller-cashe-position/page', - { params }, - ); -} - -/** 查询空辊缓存位详情 */ -export function getRawFoilEmptyRollerCashePosition(id: number) { - return requestClient.get( - `/lms/raw-foil-empty-roller-cashe-position/get?id=${id}`, - ); -} - -/** 新增空辊缓存位 */ -export function createRawFoilEmptyRollerCashePosition(data: LmsRawFoilEmptyRollerCashePositionApi.RawFoilEmptyRollerCashePosition) { - return requestClient.post('/lms/raw-foil-empty-roller-cashe-position/create', data); -} - -/** 修改空辊缓存位 */ -export function updateRawFoilEmptyRollerCashePosition(data: LmsRawFoilEmptyRollerCashePositionApi.RawFoilEmptyRollerCashePosition) { - return requestClient.put('/lms/raw-foil-empty-roller-cashe-position/update', data); -} - -/** 删除空辊缓存位 */ -export function deleteRawFoilEmptyRollerCashePosition(id: number) { - return requestClient.delete(`/lms/raw-foil-empty-roller-cashe-position/delete?id=${id}`); -} - -/** 批量删除空辊缓存位 */ -export function deleteRawFoilEmptyRollerCashePositionList(ids: number[]) { - return requestClient.delete( - `/lms/raw-foil-empty-roller-cashe-position/delete-list?ids=${ids.join(',')}`, - ); -} - -/** 导出空辊缓存位 */ -export function exportRawFoilEmptyRollerCashePosition(params: any) { - return requestClient.download('/lms/raw-foil-empty-roller-cashe-position/export-excel', { params }); -} - - diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcasheposition/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcacheposition/data.ts similarity index 94% rename from nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcasheposition/data.ts rename to nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcacheposition/data.ts index 18880281..b089a200 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcasheposition/data.ts +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcacheposition/data.ts @@ -1,6 +1,6 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { LmsRawFoilCashePositionApi } from '#/api/lms/rawfoilcasheposition'; +import type { LmsRawFoilCachePositionApi } from '#/api/lms/rawfoilcacheposition'; import { getDictOptions } from '@vben/hooks'; @@ -113,7 +113,7 @@ export function useFormSchema(): VbenFormSchema[] { rules: 'required', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.RAWFOIL_CASHEPOSITION_STATUS), + options: getDictOptions(DICT_TYPE.RAWFOIL_CACHEPOSITION_STATUS), placeholder: '请选择库存状态', }, }, @@ -122,7 +122,7 @@ export function useFormSchema(): VbenFormSchema[] { label: '点位类型', component: 'Select', componentProps: { - options: getDictOptions(DICT_TYPE.RAWFOIL_CASHEPOSITION_TYPE), + options: getDictOptions(DICT_TYPE.RAWFOIL_CACHEPOSITION_TYPE), placeholder: '请选择点位类型', }, }, @@ -188,7 +188,7 @@ export function useGridFormSchema(): VbenFormSchema[] { component: 'Select', componentProps: { allowClear: true, - options: getDictOptions(DICT_TYPE.RAWFOIL_CASHEPOSITION_STATUS), + options: getDictOptions(DICT_TYPE.RAWFOIL_CACHEPOSITION_STATUS), placeholder: '请选择库存状态', }, }, @@ -196,7 +196,7 @@ export function useGridFormSchema(): VbenFormSchema[] { } /** 列表的字段 */ -export function useGridColumns(): VxeTableGridOptions['columns'] { +export function useGridColumns(): VxeTableGridOptions['columns'] { return [ { type: 'checkbox', width: 40 }, { diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcasheposition/index.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcacheposition/index.vue similarity index 79% rename from nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcasheposition/index.vue rename to nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcacheposition/index.vue index 7f377809..baf2d771 100644 --- a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcasheposition/index.vue +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/rawfoilcacheposition/index.vue @@ -1,6 +1,6 @@