From cf37c9c4cd28f3bf679c7cd8c10e0fe76da179e4 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Thu, 6 Aug 2026 17:29:03 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yaml | 6 +- .../src/main/resources/application-dev.yaml | 4 +- ...dMapper.xml => BtIvtCutpointivtMapper.xml} | 0 ...eMapper.xml => BtIvtCutpointivtMapper.xml} | 0 ...eMapper.xml => BtIvtCutpointivtMapper.xml} | 0 ...tMapper.xml => BtIvtCutpointivtMapper.xml} | 0 .../src/main/resources/application-dev.yaml | 6 +- .../module/lms/enums/ErrorCodeConstants.java | 4 + .../BtIvtCutpointivtController.java | 105 +++++ .../vo/BtIvtCutpointivtPageReqVO.java | 36 ++ .../vo/BtIvtCutpointivtRespVO.java | 92 ++++ .../vo/BtIvtCutpointivtSaveReqVO.java | 62 +++ .../cutpointivt/IvtCutpointivtController.java | 104 +++++ .../vo/IvtCutpointivtPageReqVO.java | 27 ++ .../cutpointivt/vo/IvtCutpointivtRespVO.java | 117 +++++ .../vo/IvtCutpointivtSaveReqVO.java | 95 ++++ .../IvtShafttubeivtController.java | 107 +++++ .../vo/IvtShafttubeivtPageReqVO.java | 22 + .../vo/IvtShafttubeivtRespVO.java | 93 ++++ .../vo/IvtShafttubeivtSaveReqVO.java | 59 +++ .../btivtcutpointivt/BtIvtCutpointivtDO.java | 101 +++++ .../cutpointIvt/IvtCutpointivtDO.java | 120 +++++ .../ivtshafttubeivt/IvtShafttubeivtDO.java | 96 ++++ .../BtIvtCutpointivtMapper.java | 29 ++ .../ivtcutpointivt/IvtCutpointivtMapper.java | 30 ++ .../IvtShafttubeivtMapper.java | 27 ++ .../cn/code/nl/module/lms/demo/DemoApi.java | 160 +++---- .../cutpointIvt/IvtCutpointivtService.java | 64 +++ .../IvtCutpointivtServiceImpl.java | 86 ++++ .../BtIvtCutpointivtService.java | 63 +++ .../BtIvtCutpointivtServiceImpl.java | 82 ++++ .../IvtShafttubeivtService.java | 64 +++ .../IvtShafttubeivtServiceImpl.java | 86 ++++ .../src/main/resources/application-dev.yaml | 6 +- .../BtIvtCutpointivtMapper.xml | 12 + .../ivtcutpointIvt/IvtCutpointivtMapper.xml | 12 + .../ivtshafttubeivt/IvtShafttubeivtMapper.xml | 12 + .../job/slitter/AutoCallAirShaftTask.java | 23 + .../src/main/resources/application-dev.yaml | 6 +- ...rMapper.xml => BtIvtCutpointivtMapper.xml} | 0 .../src/main/resources/application-dev.yaml | 4 +- .../src/api/lms/btivtcutpointivt/index.ts | 68 +++ .../src/api/lms/cutpointivt/index.ts | 78 ++++ .../src/api/lms/ivtshafttubeivt/index.ts | 68 +++ .../src/views/lms/btivtcutpointivt/data.ts | 317 +++++++++++++ .../src/views/lms/btivtcutpointivt/index.vue | 186 ++++++++ .../lms/btivtcutpointivt/modules/form.vue | 82 ++++ .../lms/cutpointivt/ivtcutpointivt/data.ts | 421 ++++++++++++++++++ .../lms/cutpointivt/ivtcutpointivt/index.vue | 186 ++++++++ .../ivtcutpointivt/modules/form.vue | 82 ++++ .../src/views/lms/ivtshafttubeivt/data.ts | 275 ++++++++++++ .../src/views/lms/ivtshafttubeivt/index.vue | 187 ++++++++ .../lms/ivtshafttubeivt/modules/form.vue | 82 ++++ 53 files changed, 3958 insertions(+), 96 deletions(-) rename nl-module-base/nl-module-base-server/src/main/resources/mapper/classstandard/{ClassStandardMapper.xml => BtIvtCutpointivtMapper.xml} (100%) rename nl-module-base/nl-module-base-server/src/main/resources/mapper/codegen/{CodeSequenceMapper.xml => BtIvtCutpointivtMapper.xml} (100%) rename nl-module-base/nl-module-base-server/src/main/resources/mapper/materialbase/{MaterialBaseMapper.xml => BtIvtCutpointivtMapper.xml} (100%) rename nl-module-base/nl-module-base-server/src/main/resources/mapper/measureunit/{MeasureUnitMapper.xml => BtIvtCutpointivtMapper.xml} (100%) create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/BtIvtCutpointivtController.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtPageReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtRespVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtSaveReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/IvtCutpointivtController.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtPageReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtRespVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtSaveReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/IvtShafttubeivtController.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtPageReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtRespVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtSaveReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/btivtcutpointivt/BtIvtCutpointivtDO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/cutpointIvt/IvtCutpointivtDO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/ivtshafttubeivt/IvtShafttubeivtDO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/btivtcutpointivt/BtIvtCutpointivtMapper.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtcutpointivt/IvtCutpointivtMapper.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtshafttubeivt/IvtShafttubeivtMapper.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtService.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtServiceImpl.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtService.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtServiceImpl.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtService.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtServiceImpl.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/resources/mapper/btivtcutpointivt/BtIvtCutpointivtMapper.xml create mode 100644 nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtcutpointIvt/IvtCutpointivtMapper.xml create mode 100644 nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtshafttubeivt/IvtShafttubeivtMapper.xml create mode 100644 nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/job/slitter/AutoCallAirShaftTask.java rename nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/{BsrealStorAttrMapper.xml => BtIvtCutpointivtMapper.xml} (100%) create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/btivtcutpointivt/index.ts create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/cutpointivt/index.ts create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/ivtshafttubeivt/index.ts create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/data.ts create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/index.vue create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/modules/form.vue create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/data.ts create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/index.vue create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/modules/form.vue create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/data.ts create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/index.vue create mode 100644 nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/modules/form.vue diff --git a/nl-gateway/src/main/resources/application-dev.yaml b/nl-gateway/src/main/resources/application-dev.yaml index 02342c5d..7b546c05 100644 --- a/nl-gateway/src/main/resources/application-dev.yaml +++ b/nl-gateway/src/main/resources/application-dev.yaml @@ -7,10 +7,10 @@ spring: username: nacos password: nacos discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP --- #################### 监控相关配置 #################### @@ -32,4 +32,4 @@ spring: instance: service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] username: admin - password: admin \ No newline at end of file + password: admin diff --git a/nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml b/nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml index e08ede1d..63b9fe66 100644 --- a/nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml +++ b/nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml @@ -7,7 +7,7 @@ spring: username: nacos password: nacos discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP metadata: version: 1.0.0 # 服务实例的版本号，可用于灰度发布 @@ -140,4 +140,4 @@ logging: # 芋道配置项，设置当前项目所有自定义的配置 nl: - demo: false # 开启演示模式 \ No newline at end of file + demo: false # 开启演示模式 diff --git a/nl-module-base/nl-module-base-server/src/main/resources/mapper/classstandard/ClassStandardMapper.xml b/nl-module-base/nl-module-base-server/src/main/resources/mapper/classstandard/BtIvtCutpointivtMapper.xml similarity index 100% rename from nl-module-base/nl-module-base-server/src/main/resources/mapper/classstandard/ClassStandardMapper.xml rename to nl-module-base/nl-module-base-server/src/main/resources/mapper/classstandard/BtIvtCutpointivtMapper.xml diff --git a/nl-module-base/nl-module-base-server/src/main/resources/mapper/codegen/CodeSequenceMapper.xml b/nl-module-base/nl-module-base-server/src/main/resources/mapper/codegen/BtIvtCutpointivtMapper.xml similarity index 100% rename from nl-module-base/nl-module-base-server/src/main/resources/mapper/codegen/CodeSequenceMapper.xml rename to nl-module-base/nl-module-base-server/src/main/resources/mapper/codegen/BtIvtCutpointivtMapper.xml diff --git a/nl-module-base/nl-module-base-server/src/main/resources/mapper/materialbase/MaterialBaseMapper.xml b/nl-module-base/nl-module-base-server/src/main/resources/mapper/materialbase/BtIvtCutpointivtMapper.xml similarity index 100% rename from nl-module-base/nl-module-base-server/src/main/resources/mapper/materialbase/MaterialBaseMapper.xml rename to nl-module-base/nl-module-base-server/src/main/resources/mapper/materialbase/BtIvtCutpointivtMapper.xml diff --git a/nl-module-base/nl-module-base-server/src/main/resources/mapper/measureunit/MeasureUnitMapper.xml b/nl-module-base/nl-module-base-server/src/main/resources/mapper/measureunit/BtIvtCutpointivtMapper.xml similarity index 100% rename from nl-module-base/nl-module-base-server/src/main/resources/mapper/measureunit/MeasureUnitMapper.xml rename to nl-module-base/nl-module-base-server/src/main/resources/mapper/measureunit/BtIvtCutpointivtMapper.xml diff --git a/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml b/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml index 9ccd9bc1..606d8cf3 100644 --- a/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml +++ b/nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml @@ -7,12 +7,12 @@ spring: username: nacos password: nacos discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP metadata: version: 1.0.0 # 服务实例的版本号，可用于灰度发布 config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP --- #################### 数据库相关配置 #################### @@ -99,7 +99,7 @@ xxl: accessToken: 123456 # 执行器通讯TOKEN executor: ip: 192.168.81.193 - port: 9991 + port: 9981 --- #################### 服务保障相关配置 #################### 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 02fd427e..8f31bbb1 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 @@ -10,5 +10,9 @@ public interface ErrorCodeConstants { // ========== 生箔点位库存 ========== ErrorCode RAW_FOIL_POINT_IVT_NOT_EXISTS = new ErrorCode(1, "生箔点位库存不存在"); + ErrorCode IVT_CUTPOINTIVT_NOT_EXISTS = new ErrorCode(2, "分切设备点位不存在"); + + ErrorCode IVT_SHAFTTUBEIVT_NOT_EXISTS = new ErrorCode(3, "穿拔轴点位不存在"); + } diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/BtIvtCutpointivtController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/BtIvtCutpointivtController.java new file mode 100644 index 00000000..5fbb8ab0 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/BtIvtCutpointivtController.java @@ -0,0 +1,105 @@ +package cn.code.nl.module.lms.controller.admin.btcutpointivt; + +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtRespVO; +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.btivtcutpointivt.BtIvtCutpointivtDO; +import cn.code.nl.module.lms.service.ivtcutpointivt.BtIvtCutpointivtService; +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +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.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.code.nl.framework.common.pojo.PageParam; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.common.pojo.CommonResult; +import cn.code.nl.framework.common.util.object.BeanUtils; +import static cn.code.nl.framework.common.pojo.CommonResult.success; + +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.*; + + +@Tag(name = "管理后台 - 分切区缓存点位库存") +@RestController +@RequestMapping("/btcutpointivt/ivt-cutpointivt") +@Validated +public class BtIvtCutpointivtController { + + @Resource + private BtIvtCutpointivtService ivtCutpointivtService; + + @PostMapping("/create") + @Operation(summary = "创建分切区缓存点位库存") + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:create')") + public CommonResult createIvtCutpointivt(@Valid @RequestBody BtIvtCutpointivtSaveReqVO createReqVO) { + return success(ivtCutpointivtService.createIvtCutpointivt(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新分切区缓存点位库存") + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:update')") + public CommonResult updateIvtCutpointivt(@Valid @RequestBody BtIvtCutpointivtSaveReqVO updateReqVO) { + ivtCutpointivtService.updateIvtCutpointivt(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除分切区缓存点位库存") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:delete')") + public CommonResult deleteIvtCutpointivt(@RequestParam("id") Long id) { + ivtCutpointivtService.deleteIvtCutpointivt(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除分切区缓存点位库存") + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:delete')") + public CommonResult deleteIvtCutpointivtList(@RequestParam("ids") List ids) { + ivtCutpointivtService.deleteIvtCutpointivtListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得分切区缓存点位库存") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:query')") + public CommonResult getIvtCutpointivt(@RequestParam("id") Long id) { + BtIvtCutpointivtDO ivtCutpointivt = ivtCutpointivtService.getIvtCutpointivt(id); + return success(BeanUtils.toBean(ivtCutpointivt, BtIvtCutpointivtRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得分切区缓存点位库存分页") + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:query')") + public CommonResult> getIvtCutpointivtPage(@Valid BtIvtCutpointivtPageReqVO pageReqVO) { + PageResult pageResult = ivtCutpointivtService.getIvtCutpointivtPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, BtIvtCutpointivtRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出分切区缓存点位库存 Excel") + @PreAuthorize("@ss.hasPermission('btcutpointivt:ivt-cutpointivt:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportIvtCutpointivtExcel(@Valid BtIvtCutpointivtPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = ivtCutpointivtService.getIvtCutpointivtPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "分切区缓存点位库存.xls", "数据", BtIvtCutpointivtRespVO.class, + BeanUtils.toBean(list, BtIvtCutpointivtRespVO.class)); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtPageReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtPageReqVO.java new file mode 100644 index 00000000..f8a28159 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtPageReqVO.java @@ -0,0 +1,36 @@ +package cn.code.nl.module.lms.controller.admin.btcutpointivt.vo; + +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.code.nl.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; + +import static cn.code.nl.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 分切区缓存点位库存分页 Request VO") +@Data +public class BtIvtCutpointivtPageReqVO extends PageParam { + + @Schema(description = "id") + private Long ivtId; + + @Schema(description = "AGV点位编码") + private String pointCode; + + @Schema(description = "点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位", example = "2") + private String pointType; + + @Schema(description = "生产区域") + private String productArea; + + @Schema(description = "是否启用") + private String isUsed; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private String[] createTime; + + @Schema(description = "点位状态", example = "2") + private String pointStatus; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtRespVO.java new file mode 100644 index 00000000..a48fced1 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtRespVO.java @@ -0,0 +1,92 @@ +package cn.code.nl.module.lms.controller.admin.btcutpointivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 分切区缓存点位库存 Response VO") +@Data +@ExcelIgnoreUnannotated +public class BtIvtCutpointivtRespVO { + + @Schema(description = "库存记录标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "16196") + @ExcelProperty("库存记录标识") + private Long ivtId; + + @Schema(description = "AGV点位编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("AGV点位编码") + private String pointCode; + + @Schema(description = "AGV点位名称", example = "芋艿") + @ExcelProperty("AGV点位名称") + private String pointName; + + @Schema(description = "桁架点位编码1 ", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("桁架点位编码1 ") + private String trussPointCode1; + + @Schema(description = "桁架点位编码2", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("桁架点位编码2") + private String trussPointCode2; + + @Schema(description = "气胀轴编码1") + @ExcelProperty("气胀轴编码1") + private String qzzNo1; + + @Schema(description = "气胀轴编码2") + @ExcelProperty("气胀轴编码2") + private String qzzNo2; + + @Schema(description = "上轴管芯") + @ExcelProperty("上轴管芯") + private String upGx; + + @Schema(description = "下轴管芯") + @ExcelProperty("下轴管芯") + private String downGx; + + @Schema(description = "点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位", example = "2") + @ExcelProperty("点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位") + private String pointType; + + @Schema(description = "生产区域") + @ExcelProperty("生产区域") + private String productArea; + + @Schema(description = "顺序号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("顺序号") + private Integer sortSeq; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否启用") + private String isUsed; + + @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "16464") + @ExcelProperty("创建人") + private String createId; + + @Schema(description = "创建人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") + @ExcelProperty("创建人姓名") + private String createName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private String createTime; + + @Schema(description = "修改人", example = "1014") + @ExcelProperty("修改人") + private String updateOptid; + + @Schema(description = "修改人姓名", example = "芋艿") + @ExcelProperty("修改人姓名") + private String updateOptname; + + @Schema(description = "点位状态", example = "2") + @ExcelProperty("点位状态") + private String pointStatus; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtSaveReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtSaveReqVO.java new file mode 100644 index 00000000..a056f5c2 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/btcutpointivt/vo/BtIvtCutpointivtSaveReqVO.java @@ -0,0 +1,62 @@ +package cn.code.nl.module.lms.controller.admin.btcutpointivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 分切区缓存点位库存新增/修改 Request VO") +@Data +public class BtIvtCutpointivtSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "id不能为空") + private Long ivtId; + + @Schema(description = "AGV点位编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "AGV点位编码不能为空") + private String pointCode; + + @Schema(description = "AGV点位名称", example = "芋艿") + private String pointName; + + @Schema(description = "桁架点位编码1 ", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "桁架点位编码1 不能为空") + private String trussPointCode1; + + @Schema(description = "桁架点位编码2", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "桁架点位编码2不能为空") + private String trussPointCode2; + + @Schema(description = "气胀轴编码1") + private String qzzNo1; + + @Schema(description = "气胀轴编码2") + private String qzzNo2; + + @Schema(description = "上轴管芯") + private String upGx; + + @Schema(description = "下轴管芯") + private String downGx; + + @Schema(description = "点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位", example = "2") + private String pointType; + + @Schema(description = "生产区域") + private String productArea; + + @Schema(description = "顺序号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "顺序号不能为空") + private Integer sortSeq; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "是否启用不能为空") + private String isUsed; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "点位状态", example = "2") + private String pointStatus; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/IvtCutpointivtController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/IvtCutpointivtController.java new file mode 100644 index 00000000..81edaaa2 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/IvtCutpointivtController.java @@ -0,0 +1,104 @@ +package cn.code.nl.module.lms.controller.admin.cutpointivt; + +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtRespVO; +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.cutpointIvt.IvtCutpointivtDO; +import cn.code.nl.module.lms.service.cutpointIvt.IvtCutpointivtService; +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +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.*; +import java.io.IOException; + +import cn.code.nl.framework.common.pojo.PageParam; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.common.pojo.CommonResult; +import cn.code.nl.framework.common.util.object.BeanUtils; +import static cn.code.nl.framework.common.pojo.CommonResult.success; + +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.*; +@Tag(name = "管理后台 - 分切区点位库存") +@RestController +@RequestMapping("/cutpointivt/ivt-cutpointivt") +@Validated +public class IvtCutpointivtController { + + @Resource + private IvtCutpointivtService ivtCutpointivtService; + + @PostMapping("/create") + @Operation(summary = "创建分切区点位库存") + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:create')") + public CommonResult createIvtCutpointivt(@Valid @RequestBody IvtCutpointivtSaveReqVO createReqVO) { + return success(ivtCutpointivtService.createIvtCutpointivt(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新分切区点位库存") + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:update')") + public CommonResult updateIvtCutpointivt(@Valid @RequestBody IvtCutpointivtSaveReqVO updateReqVO) { + ivtCutpointivtService.updateIvtCutpointivt(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除分切区点位库存") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:delete')") + public CommonResult deleteIvtCutpointivt(@RequestParam("id") Long id) { + ivtCutpointivtService.deleteIvtCutpointivt(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除分切区点位库存") + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:delete')") + public CommonResult deleteIvtCutpointivtList(@RequestParam("ids") List ids) { + ivtCutpointivtService.deleteIvtCutpointivtListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得分切区点位库存") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:query')") + public CommonResult getIvtCutpointivt(@RequestParam("id") Long id) { + IvtCutpointivtDO ivtCutpointivt = ivtCutpointivtService.getIvtCutpointivt(id); + return success(BeanUtils.toBean(ivtCutpointivt, IvtCutpointivtRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得分切区点位库存分页") + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:query')") + public CommonResult> getIvtCutpointivtPage(@Valid IvtCutpointivtPageReqVO pageReqVO) { + PageResult pageResult = ivtCutpointivtService.getIvtCutpointivtPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, IvtCutpointivtRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出分切区点位库存 Excel") + @PreAuthorize("@ss.hasPermission('cutpointivt:ivt-cutpointivt:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportIvtCutpointivtExcel(@Valid IvtCutpointivtPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = ivtCutpointivtService.getIvtCutpointivtPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "分切区点位库存.xls", "数据", IvtCutpointivtRespVO.class, + BeanUtils.toBean(list, IvtCutpointivtRespVO.class)); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtPageReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtPageReqVO.java new file mode 100644 index 00000000..f6948ede --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtPageReqVO.java @@ -0,0 +1,27 @@ +package cn.code.nl.module.lms.controller.admin.cutpointivt.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.code.nl.framework.common.pojo.PageParam; + +@Schema(description = "管理后台 - 分切区点位库存分页 Request VO") +@Data +public class IvtCutpointivtPageReqVO extends PageParam { + + @Schema(description = "点位编码") + private String pointCode; + + @Schema(description = "满轴位状态", example = "1") + private String fullPointStatus; + + @Schema(description = "空轴位状态", example = "1") + private String emptyPointStatus; + + @Schema(description = "生产区域") + private String productArea; + + @Schema(description = "是否启用") + private String isUsed; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtRespVO.java new file mode 100644 index 00000000..98e10979 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtRespVO.java @@ -0,0 +1,117 @@ +package cn.code.nl.module.lms.controller.admin.cutpointivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 分切区点位库存 Response VO") +@Data +@ExcelIgnoreUnannotated +public class IvtCutpointivtRespVO { + + @Schema(description = "库存记录标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "12268") + @ExcelProperty("库存记录标识") + private Long ivtId; + + @Schema(description = "点位编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("点位编码") + private String pointCode; + + @Schema(description = "满轴位编码") + @ExcelProperty("满轴位编码") + private String fullPointCode; + + @Schema(description = "满轴位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("满轴位状态") + private String fullPointStatus; + + @Schema(description = "母卷号", example = "芋艿") + @ExcelProperty("母卷号") + private String containerName; + + @Schema(description = "母卷轴编码") + @ExcelProperty("母卷轴编码") + private String fullVehicleCode; + + @Schema(description = "空轴位编码") + @ExcelProperty("空轴位编码") + private String emptyPointCode; + + @Schema(description = "空轴位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("空轴位状态") + private String emptyPointStatus; + + @Schema(description = "空轴编码") + @ExcelProperty("空轴编码") + private String emptyVehicleCode; + + @Schema(description = "生产区域") + @ExcelProperty("生产区域") + private String productArea; + + @Schema(description = "位置") + @ExcelProperty("位置") + private String pointLocation; + + @Schema(description = "分切下料位上轴点位") + @ExcelProperty("分切下料位上轴点位") + private String upPointCode; + + @Schema(description = "分切下料位下轴点位") + @ExcelProperty("分切下料位下轴点位") + private String downPointCode; + + @Schema(description = "顺序号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("顺序号") + private Integer sortSeq; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("是否启用") + private String isUsed; + + @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "3118") + @ExcelProperty("创建人") + private Long createId; + + @Schema(description = "创建人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("创建人姓名") + private String createName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private String createTime; + + @Schema(description = "修改人", example = "3176") + @ExcelProperty("修改人") + private Long updateOptid; + + @Schema(description = "修改人姓名", example = "赵六") + @ExcelProperty("修改人姓名") + private String updateOptname; + + @Schema(description = "规划") + @ExcelProperty("规划") + private String plan; + + @Schema(description = "对应MES系统设备编码") + @ExcelProperty("对应MES系统设备编码") + private String extCode; + + @Schema(description = "分切下料位上轴") + @ExcelProperty("分切下料位上轴") + private String upQzzno; + + @Schema(description = "分切下料位下轴") + @ExcelProperty("分切下料位下轴") + private String downQzzno; + + @Schema(description = "气胀轴代数") + @ExcelProperty("气胀轴代数") + private String qzzGeneration; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtSaveReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtSaveReqVO.java new file mode 100644 index 00000000..35cd34d8 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/cutpointivt/vo/IvtCutpointivtSaveReqVO.java @@ -0,0 +1,95 @@ +package cn.code.nl.module.lms.controller.admin.cutpointivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 分切区点位库存新增/修改 Request VO") +@Data +public class IvtCutpointivtSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "id不能为空") + private Long ivtId; + + @Schema(description = "点位编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "点位编码不能为空") + private String pointCode; + + @Schema(description = "满轴位编码") + private String fullPointCode; + + @Schema(description = "满轴位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "满轴位状态不能为空") + private String fullPointStatus; + + @Schema(description = "母卷号", example = "芋艿") + private String containerName; + + @Schema(description = "母卷轴编码") + private String fullVehicleCode; + + @Schema(description = "空轴位编码") + private String emptyPointCode; + + @Schema(description = "空轴位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "空轴位状态不能为空") + private String emptyPointStatus; + + @Schema(description = "空轴编码") + private String emptyVehicleCode; + + @Schema(description = "生产区域") + private String productArea; + + @Schema(description = "位置") + private String pointLocation; + + @Schema(description = "分切下料位上轴点位") + private String upPointCode; + + @Schema(description = "分切下料位下轴点位") + private String downPointCode; + + @Schema(description = "顺序号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "顺序号不能为空") + private Integer sortSeq; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "是否启用不能为空") + private String isUsed; + + @Schema(description = "备注", example = "你猜") + private String remark; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "3118") + @NotNull(message = "创建人不能为空") + private Long createId; + + @Schema(description = "创建人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "创建人姓名不能为空") + private String createName; + + @Schema(description = "修改人", example = "3176") + private Long updateOptid; + + @Schema(description = "修改人姓名", example = "赵六") + private String updateOptname; + + @Schema(description = "规划") + private String plan; + + @Schema(description = "对应MES系统设备编码") + private String extCode; + + @Schema(description = "分切下料位上轴") + private String upQzzno; + + @Schema(description = "分切下料位下轴") + private String downQzzno; + + @Schema(description = "气胀轴代数") + private String qzzGeneration; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/IvtShafttubeivtController.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/IvtShafttubeivtController.java new file mode 100644 index 00000000..bc2259a7 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/IvtShafttubeivtController.java @@ -0,0 +1,107 @@ +package cn.code.nl.module.lms.controller.admin.ivtshafttubeivt; + +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtRespVO; +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.ivtshafttubeivt.IvtShafttubeivtDO; +import cn.code.nl.module.lms.service.ivtshafttubeivt.IvtShafttubeivtService; +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +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.*; +import java.io.IOException; + +import cn.code.nl.framework.common.pojo.PageParam; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.common.pojo.CommonResult; +import cn.code.nl.framework.common.util.object.BeanUtils; +import static cn.code.nl.framework.common.pojo.CommonResult.success; + +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.*; + + + +@Tag(name = "管理后台 - 穿拔轴区点位库存") +@RestController +@RequestMapping("/ivtshafttubeivt/ivt-shafttubeivt") +@Validated +public class IvtShafttubeivtController { + + @Resource + private IvtShafttubeivtService ivtShafttubeivtService; + + @PostMapping("/create") + @Operation(summary = "创建穿拔轴区点位库存") + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:create')") + public CommonResult createIvtShafttubeivt(@Valid @RequestBody IvtShafttubeivtSaveReqVO createReqVO) { + return success(ivtShafttubeivtService.createIvtShafttubeivt(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新穿拔轴区点位库存") + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:update')") + public CommonResult updateIvtShafttubeivt(@Valid @RequestBody IvtShafttubeivtSaveReqVO updateReqVO) { + ivtShafttubeivtService.updateIvtShafttubeivt(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除穿拔轴区点位库存") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:delete')") + public CommonResult deleteIvtShafttubeivt(@RequestParam("id") Long id) { + ivtShafttubeivtService.deleteIvtShafttubeivt(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除穿拔轴区点位库存") + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:delete')") + public CommonResult deleteIvtShafttubeivtList(@RequestParam("ids") List ids) { + ivtShafttubeivtService.deleteIvtShafttubeivtListByIds(ids); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得穿拔轴区点位库存") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:query')") + public CommonResult getIvtShafttubeivt(@RequestParam("id") Long id) { + IvtShafttubeivtDO ivtShafttubeivt = ivtShafttubeivtService.getIvtShafttubeivt(id); + return success(BeanUtils.toBean(ivtShafttubeivt, IvtShafttubeivtRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得穿拔轴区点位库存分页") + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:query')") + public CommonResult> getIvtShafttubeivtPage(@Valid IvtShafttubeivtPageReqVO pageReqVO) { + PageResult pageResult = ivtShafttubeivtService.getIvtShafttubeivtPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, IvtShafttubeivtRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出穿拔轴区点位库存 Excel") + @PreAuthorize("@ss.hasPermission('ivtshafttubeivt:ivt-shafttubeivt:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportIvtShafttubeivtExcel(@Valid IvtShafttubeivtPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = ivtShafttubeivtService.getIvtShafttubeivtPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "穿拔轴区点位库存.xls", "数据", IvtShafttubeivtRespVO.class, + BeanUtils.toBean(list, IvtShafttubeivtRespVO.class)); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtPageReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtPageReqVO.java new file mode 100644 index 00000000..934f6046 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtPageReqVO.java @@ -0,0 +1,22 @@ +package cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo; + +import cn.idev.excel.annotation.ExcelProperty; +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.code.nl.framework.common.pojo.PageParam; + +@Schema(description = "管理后台 - 穿拔轴区点位库存分页 Request VO") +@Data +public class IvtShafttubeivtPageReqVO extends PageParam { + + @Schema(description = "id") + private Long ivtId; + + @Schema(description = "点位编码") + private String pointCode; + + @Schema(description = "点位类型", example = "2") + private String pointType; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtRespVO.java new file mode 100644 index 00000000..cda9c4e1 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtRespVO.java @@ -0,0 +1,93 @@ +package cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import cn.idev.excel.annotation.*; + +@Schema(description = "管理后台 - 穿拔轴区点位库存 Response VO") +@Data +@ExcelIgnoreUnannotated +public class IvtShafttubeivtRespVO { + + @Schema(description = "库存记录标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "15458") + @ExcelProperty("库存记录标识") + private Long ivtId; + + @Schema(description = "点位编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("点位编码") + private String pointCode; + + @Schema(description = "点位名称", example = "赵六") + @ExcelProperty("点位名称") + private String pointName; + + @Schema(description = "气涨轴尺寸") + @ExcelProperty("气涨轴尺寸") + private String qzzSize; + + @Schema(description = "气涨轴代数") + @ExcelProperty("气涨轴代数") + private String qzzGeneration; + + @Schema(description = "纸管编码") + @ExcelProperty("纸管编码") + private String tubeCode; + + @Schema(description = "纸管描述", example = "赵六") + @ExcelProperty("纸管描述") + private String tubeName; + + @Schema(description = "子卷号", example = "李四") + @ExcelProperty("子卷号") + private String containerName; + + @Schema(description = "点位类型", example = "2") + @ExcelProperty("点位类型") + private String pointType; + + @Schema(description = "位置") + @ExcelProperty("位置") + private String pointLocation; + + @Schema(description = "是否有轴") + @ExcelProperty("是否有轴") + private String haveQzz; + + @Schema(description = "是否启用") + @ExcelProperty("是否启用") + private String isUsed; + + @Schema(description = "顺序号") + @ExcelProperty("顺序号") + private Integer sortSeq; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "7598") + @ExcelProperty("创建人") + private String createId; + + @Schema(description = "创建人", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @ExcelProperty("创建人") + private String createName; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private String createTime; + + @Schema(description = "修改人", example = "1720") + @ExcelProperty("修改人") + private String updateOptid; + + @Schema(description = "修改人", example = "李四") + @ExcelProperty("修改人") + private String updateOptname; + + @Schema(description = "规划") + @ExcelProperty("规划") + private String plan; + + @Schema(description = "关联点位") + @ExcelProperty("关联点位") + private String parentCode; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtSaveReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtSaveReqVO.java new file mode 100644 index 00000000..0f37ed13 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/ivtshafttubeivt/vo/IvtShafttubeivtSaveReqVO.java @@ -0,0 +1,59 @@ +package cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; + +@Schema(description = "管理后台 - 穿拔轴区点位库存新增/修改 Request VO") +@Data +public class IvtShafttubeivtSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "id不能为空") + private Long ivtId; + + @Schema(description = "点位编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "点位编码不能为空") + private String pointCode; + + @Schema(description = "点位名称", example = "赵六") + private String pointName; + + @Schema(description = "气涨轴尺寸") + private String qzzSize; + + @Schema(description = "气涨轴代数") + private String qzzGeneration; + + @Schema(description = "纸管编码") + private String tubeCode; + + @Schema(description = "纸管描述", example = "赵六") + private String tubeName; + + @Schema(description = "子卷号", example = "李四") + private String containerName; + + @Schema(description = "点位类型", example = "2") + private String pointType; + + @Schema(description = "位置") + private String pointLocation; + + @Schema(description = "是否有轴") + private String haveQzz; + + @Schema(description = "是否启用") + private String isUsed; + + @Schema(description = "顺序号") + private Integer sortSeq; + + @Schema(description = "规划") + private String plan; + + @Schema(description = "关联点位") + private String parentCode; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/btivtcutpointivt/BtIvtCutpointivtDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/btivtcutpointivt/BtIvtCutpointivtDO.java new file mode 100644 index 00000000..a20b67a3 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/btivtcutpointivt/BtIvtCutpointivtDO.java @@ -0,0 +1,101 @@ +package cn.code.nl.module.lms.dal.dataobject.btivtcutpointivt; + +import lombok.*; +import com.baomidou.mybatisplus.annotation.*; +import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; + +/** + * 分切区缓存点位库存 DO + * + * @author 诺力管理员 + */ +@TableName("bst_ivt_cutpointivt") +@KeySequence("bst_ivt_cutpointivt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BtIvtCutpointivtDO extends BaseDO { + + /** + * 库存记录标识 + */ + @TableId + private Long ivtId; + /** + * AGV点位编码 + */ + private String pointCode; + /** + * AGV点位名称 + */ + private String pointName; + /** + * 桁架点位编码1 + */ + private String trussPointCode1; + /** + * 桁架点位编码2 + */ + private String trussPointCode2; + /** + * 气胀轴编码1 + */ + private String qzzNo1; + /** + * 气胀轴编码2 + */ + private String qzzNo2; + /** + * 上轴管芯 + */ + private String upGx; + /** + * 下轴管芯 + */ + private String downGx; + /** + * 点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位 + */ + private String pointType; + /** + * 生产区域 + */ + private String productArea; + /** + * 顺序号 + */ + private Integer sortSeq; + /** + * 是否启用 + */ + private String isUsed; + /** + * 备注 + */ + private String remark; + /** + * 创建人 + */ + private String createId; + /** + * 创建人姓名 + */ + private String createName; + /** + * 修改人 + */ + private String updateOptid; + /** + * 修改人姓名 + */ + private String updateOptname; + /** + * 点位状态 + */ + private String pointStatus; + + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/cutpointIvt/IvtCutpointivtDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/cutpointIvt/IvtCutpointivtDO.java new file mode 100644 index 00000000..8a6e6d5c --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/cutpointIvt/IvtCutpointivtDO.java @@ -0,0 +1,120 @@ +package cn.code.nl.module.lms.dal.dataobject.cutpointIvt; + +import lombok.*; +import java.util.*; +import com.baomidou.mybatisplus.annotation.*; +import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; + +/** + * 分切区点位库存 DO + * + * @author 诺力管理员 + */ +@TableName("st_ivt_cutpointivt") +@KeySequence("st_ivt_cutpointivt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IvtCutpointivtDO extends BaseDO { + + /** + * 库存记录标识 + */ + @TableId + private Long ivtId; + /** + * 点位编码 + */ + private String pointCode; + /** + * 满轴位编码 + */ + private String fullPointCode; + /** + * 满轴位状态 + */ + private String fullPointStatus; + /** + * 母卷号 + */ + private String containerName; + /** + * 母卷轴编码 + */ + private String fullVehicleCode; + /** + * 空轴位编码 + */ + private String emptyPointCode; + /** + * 空轴位状态 + */ + private String emptyPointStatus; + /** + * 空轴编码 + */ + private String emptyVehicleCode; + /** + * 生产区域 + */ + private String productArea; + /** + * 位置 + */ + private String pointLocation; + /** + * 分切下料位上轴点位 + */ + private String upPointCode; + /** + * 分切下料位下轴点位 + */ + private String downPointCode; + /** + * 顺序号 + */ + private Integer sortSeq; + /** + * 是否启用 + */ + private String isUsed; + /** + * 备注 + */ + private String remark; + + /** + * 创建人姓名 + */ + private String createName; + + /** + * 修改人姓名 + */ + private String updateOptname; + /** + * 规划 + */ + private String plan; + /** + * 对应MES系统设备编码 + */ + private String extCode; + /** + * 分切下料位上轴 + */ + private String upQzzno; + /** + * 分切下料位下轴 + */ + private String downQzzno; + /** + * 气胀轴代数 + */ + private String qzzGeneration; + + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/ivtshafttubeivt/IvtShafttubeivtDO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/ivtshafttubeivt/IvtShafttubeivtDO.java new file mode 100644 index 00000000..df1f1733 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/dataobject/ivtshafttubeivt/IvtShafttubeivtDO.java @@ -0,0 +1,96 @@ +package cn.code.nl.module.lms.dal.dataobject.ivtshafttubeivt; + +import lombok.*; +import java.util.*; +import com.baomidou.mybatisplus.annotation.*; +import cn.code.nl.framework.mybatis.core.dataobject.BaseDO; + +/** + * 穿拔轴区点位库存 DO + * + * @author 诺力管理员 + */ +@TableName("bst_ivt_shafttubeivt") +@KeySequence("bst_ivt_shafttubeivt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class IvtShafttubeivtDO extends BaseDO { + + /** + * 库存记录标识 + */ + @TableId + private Long ivtId; + /** + * 点位编码 + */ + private String pointCode; + /** + * 点位名称 + */ + private String pointName; + /** + * 气涨轴尺寸 + */ + private String qzzSize; + /** + * 气涨轴代数 + */ + private String qzzGeneration; + /** + * 纸管编码 + */ + private String tubeCode; + /** + * 纸管描述 + */ + private String tubeName; + /** + * 子卷号 + */ + private String containerName; + /** + * 点位类型 + */ + private String pointType; + /** + * 位置 + */ + private String pointLocation; + /** + * 是否有轴 + */ + private String haveQzz; + /** + * 是否启用 + */ + private String isUsed; + /** + * 顺序号 + */ + private Integer sortSeq; + + /** + * 创建人 + */ + private String createName; + + /** + * 修改人 + */ + private String updateOptname; + /** + * 规划 + */ + private String plan; + /** + * 关联点位 + */ + private String parentCode; + + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/btivtcutpointivt/BtIvtCutpointivtMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/btivtcutpointivt/BtIvtCutpointivtMapper.java new file mode 100644 index 00000000..901cb05f --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/btivtcutpointivt/BtIvtCutpointivtMapper.java @@ -0,0 +1,29 @@ +package cn.code.nl.module.lms.dal.mysql.btivtcutpointivt; + +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.controller.admin.btcutpointivt.vo.BtIvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.dal.dataobject.btivtcutpointivt.BtIvtCutpointivtDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 分切区缓存点位库存 Mapper + * + * @author 诺力管理员 + */ +@Mapper +public interface BtIvtCutpointivtMapper extends BaseMapperX { + + default PageResult selectPage(BtIvtCutpointivtPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(BtIvtCutpointivtDO::getPointCode, reqVO.getPointCode()) + .eqIfPresent(BtIvtCutpointivtDO::getPointType, reqVO.getPointType()) + .eqIfPresent(BtIvtCutpointivtDO::getProductArea, reqVO.getProductArea()) + .eqIfPresent(BtIvtCutpointivtDO::getIsUsed, reqVO.getIsUsed()) + .betweenIfPresent(BtIvtCutpointivtDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(BtIvtCutpointivtDO::getPointStatus, reqVO.getPointStatus()) + .orderByDesc(BtIvtCutpointivtDO::getIvtId)); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtcutpointivt/IvtCutpointivtMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtcutpointivt/IvtCutpointivtMapper.java new file mode 100644 index 00000000..bc63907d --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtcutpointivt/IvtCutpointivtMapper.java @@ -0,0 +1,30 @@ +package cn.code.nl.module.lms.dal.mysql.ivtcutpointivt; + +import java.util.*; + +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.controller.admin.cutpointivt.vo.IvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.dal.dataobject.cutpointIvt.IvtCutpointivtDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 分切区点位库存 Mapper + * + * @author 诺力管理员 + */ +@Mapper +public interface IvtCutpointivtMapper extends BaseMapperX { + + default PageResult selectPage(IvtCutpointivtPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(IvtCutpointivtDO::getPointCode, reqVO.getPointCode()) + .eqIfPresent(IvtCutpointivtDO::getFullPointStatus, reqVO.getFullPointStatus()) + .eqIfPresent(IvtCutpointivtDO::getEmptyPointStatus, reqVO.getEmptyPointStatus()) + .eqIfPresent(IvtCutpointivtDO::getProductArea, reqVO.getProductArea()) + .eqIfPresent(IvtCutpointivtDO::getIsUsed, reqVO.getIsUsed()) + .orderByDesc(IvtCutpointivtDO::getIvtId)); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtshafttubeivt/IvtShafttubeivtMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtshafttubeivt/IvtShafttubeivtMapper.java new file mode 100644 index 00000000..376d6d9f --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/ivtshafttubeivt/IvtShafttubeivtMapper.java @@ -0,0 +1,27 @@ +package cn.code.nl.module.lms.dal.mysql.ivtshafttubeivt; + +import java.util.*; + +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.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtPageReqVO; +import cn.code.nl.module.lms.dal.dataobject.ivtshafttubeivt.IvtShafttubeivtDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 穿拔轴区点位库存 Mapper + * + * @author 诺力管理员 + */ +@Mapper +public interface IvtShafttubeivtMapper extends BaseMapperX { + + default PageResult selectPage(IvtShafttubeivtPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(IvtShafttubeivtDO::getPointCode, reqVO.getPointCode()) + .eqIfPresent(IvtShafttubeivtDO::getPointType, reqVO.getPointType()) + .orderByDesc(IvtShafttubeivtDO::getIvtId)); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/demo/DemoApi.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/demo/DemoApi.java index a1b44f70..b08f3ad9 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/demo/DemoApi.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/demo/DemoApi.java @@ -1,80 +1,80 @@ -package cn.code.nl.module.lms.demo; - -import cn.code.nl.framework.common.pojo.CommonResult; -import cn.code.nl.framework.execute.biz.api.lms.LmsTaskCommonApi; -import cn.code.nl.framework.execute.biz.dto.TaskStatusCallApiReqDTO; -import cn.code.nl.framework.execute.biz.vo.AcsApplyActionRespVO; -import com.alibaba.fastjson.JSON; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import static cn.code.nl.framework.common.pojo.CommonResult.success; - -/** - * - * @Author: liyongde - * @Date: 2026/7/15 15:25 - */ -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -public class DemoApi implements LmsTaskCommonApi { - @Override - public CommonResult doHandlePicked(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { - // 构建外层VO - AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); - respVO.setTaskId(10001L); - respVO.setTaskCode("ACS20260716001"); - // 内层data赋值 "success" - return success(respVO); - } - - @Override - public CommonResult doHandleApplyAgain(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { - DemoRespVO demoRespVO = new DemoRespVO(); - demoRespVO.setTargetPoint("A_10001"); - - // 构建外层VO - AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); - respVO.setTaskId(10001L); - respVO.setTaskCode("ACS20260716001"); - // 内层data赋值 "success" - respVO.setData(JSON.parseObject(JSON.toJSONString(demoRespVO))); - return success(respVO); - } - - @Override - public CommonResult doHandleRequestRelease(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { - // 构建外层VO - AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); - respVO.setTaskId(10001L); - respVO.setTaskCode("ACS20260716001"); - return success(respVO); - } - - @Override - public CommonResult doHandleRequestPick(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { - // 构建外层VO - AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); - respVO.setTaskId(10001L); - respVO.setTaskCode("ACS20260716001"); - return success(respVO); - } - - @Override - public CommonResult doHandleRequestLeave(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { - // 构建外层VO - AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); - respVO.setTaskId(10001L); - respVO.setTaskCode("ACS20260716001"); - return success(respVO); - } - - @Override - public CommonResult doHandleRequestEnter(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { - // 构建外层VO - AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); - respVO.setTaskId(10001L); - respVO.setTaskCode("ACS20260716001"); - return success(respVO); - } -} +//package cn.code.nl.module.lms.demo; +// +//import cn.code.nl.framework.common.pojo.CommonResult; +//import cn.code.nl.framework.execute.biz.api.lms.LmsTaskCommonApi; +//import cn.code.nl.framework.execute.biz.dto.TaskStatusCallApiReqDTO; +//import cn.code.nl.framework.execute.biz.vo.AcsApplyActionRespVO; +//import com.alibaba.fastjson.JSON; +//import org.springframework.validation.annotation.Validated; +//import org.springframework.web.bind.annotation.RestController; +// +//import static cn.code.nl.framework.common.pojo.CommonResult.success; +// +///** +// * +// * @Author: liyongde +// * @Date: 2026/7/15 15:25 +// */ +//@RestController // 提供 RESTful API 接口，给 Feign 调用 +//@Validated +//public class DemoApi implements LmsTaskCommonApi { +// @Override +// public CommonResult doHandlePicked(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { +// // 构建外层VO +// AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); +// respVO.setTaskId(10001L); +// respVO.setTaskCode("ACS20260716001"); +// // 内层data赋值 "success" +// return success(respVO); +// } +// +// @Override +// public CommonResult doHandleApplyAgain(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { +// DemoRespVO demoRespVO = new DemoRespVO(); +// demoRespVO.setTargetPoint("A_10001"); +// +// // 构建外层VO +// AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); +// respVO.setTaskId(10001L); +// respVO.setTaskCode("ACS20260716001"); +// // 内层data赋值 "success" +// respVO.setData(JSON.parseObject(JSON.toJSONString(demoRespVO))); +// return success(respVO); +// } +// +// @Override +// public CommonResult doHandleRequestRelease(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { +// // 构建外层VO +// AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); +// respVO.setTaskId(10001L); +// respVO.setTaskCode("ACS20260716001"); +// return success(respVO); +// } +// +// @Override +// public CommonResult doHandleRequestPick(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { +// // 构建外层VO +// AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); +// respVO.setTaskId(10001L); +// respVO.setTaskCode("ACS20260716001"); +// return success(respVO); +// } +// +// @Override +// public CommonResult doHandleRequestLeave(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { +// // 构建外层VO +// AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); +// respVO.setTaskId(10001L); +// respVO.setTaskCode("ACS20260716001"); +// return success(respVO); +// } +// +// @Override +// public CommonResult doHandleRequestEnter(TaskStatusCallApiReqDTO taskStatusCallApiReqDTO) { +// // 构建外层VO +// AcsApplyActionRespVO respVO = new AcsApplyActionRespVO(); +// respVO.setTaskId(10001L); +// respVO.setTaskCode("ACS20260716001"); +// return success(respVO); +// } +//} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtService.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtService.java new file mode 100644 index 00000000..f8e66ece --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtService.java @@ -0,0 +1,64 @@ +package cn.code.nl.module.lms.service.cutpointIvt; + +import java.util.*; + +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.cutpointIvt.IvtCutpointivtDO; +import jakarta.validation.*; + + +/** + * 分切区点位库存 Service 接口 + * + * @author 诺力管理员 + */ +public interface IvtCutpointivtService { + + /** + * 创建分切区点位库存 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIvtCutpointivt(@Valid IvtCutpointivtSaveReqVO createReqVO); + + /** + * 更新分切区点位库存 + * + * @param updateReqVO 更新信息 + */ + void updateIvtCutpointivt(@Valid IvtCutpointivtSaveReqVO updateReqVO); + + /** + * 删除分切区点位库存 + * + * @param id 编号 + */ + void deleteIvtCutpointivt(Long id); + + /** + * 批量删除分切区点位库存 + * + * @param ids 编号 + */ + void deleteIvtCutpointivtListByIds(List ids); + + /** + * 获得分切区点位库存 + * + * @param id 编号 + * @return 分切区点位库存 + */ + IvtCutpointivtDO getIvtCutpointivt(Long id); + + /** + * 获得分切区点位库存分页 + * + * @param pageReqVO 分页查询 + * @return 分切区点位库存分页 + */ + PageResult getIvtCutpointivtPage(IvtCutpointivtPageReqVO pageReqVO); + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtServiceImpl.java new file mode 100644 index 00000000..b19bc70d --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/cutpointIvt/IvtCutpointivtServiceImpl.java @@ -0,0 +1,86 @@ +package cn.code.nl.module.lms.service.cutpointIvt; + +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.cutpointivt.vo.IvtCutpointivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.cutpointIvt.IvtCutpointivtDO; +import cn.code.nl.module.lms.dal.mysql.ivtcutpointivt.IvtCutpointivtMapper; +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +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 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.IVT_CUTPOINTIVT_NOT_EXISTS; + +/** + * 分切区点位库存 Service 实现类 + * + * @author 诺力管理员 + */ +@Service +@Validated +public class IvtCutpointivtServiceImpl implements IvtCutpointivtService { + + @Resource + private IvtCutpointivtMapper ivtCutpointivtMapper; + + @Override + public Long createIvtCutpointivt(IvtCutpointivtSaveReqVO createReqVO) { + // 插入 + IvtCutpointivtDO ivtCutpointivt = BeanUtils.toBean(createReqVO, IvtCutpointivtDO.class); + ivtCutpointivtMapper.insert(ivtCutpointivt); + + // 返回 + return ivtCutpointivt.getIvtId(); + } + + @Override + public void updateIvtCutpointivt(IvtCutpointivtSaveReqVO updateReqVO) { + // 校验存在 + validateIvtCutpointivtExists(updateReqVO.getIvtId()); + // 更新 + IvtCutpointivtDO updateObj = BeanUtils.toBean(updateReqVO, IvtCutpointivtDO.class); + ivtCutpointivtMapper.updateById(updateObj); + } + + @Override + public void deleteIvtCutpointivt(Long id) { + // 校验存在 + validateIvtCutpointivtExists(id); + // 删除 + ivtCutpointivtMapper.deleteById(id); + } + + @Override + public void deleteIvtCutpointivtListByIds(List ids) { + // 删除 + ivtCutpointivtMapper.deleteByIds(ids); + } + + + private void validateIvtCutpointivtExists(Long id) { + if (ivtCutpointivtMapper.selectById(id) == null) { + throw exception(IVT_CUTPOINTIVT_NOT_EXISTS); + } + } + + @Override + public IvtCutpointivtDO getIvtCutpointivt(Long id) { + return ivtCutpointivtMapper.selectById(id); + } + + @Override + public PageResult getIvtCutpointivtPage(IvtCutpointivtPageReqVO pageReqVO) { + return ivtCutpointivtMapper.selectPage(pageReqVO); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtService.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtService.java new file mode 100644 index 00000000..0442b5de --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtService.java @@ -0,0 +1,63 @@ +package cn.code.nl.module.lms.service.ivtcutpointivt; + +import java.util.*; + +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.btivtcutpointivt.BtIvtCutpointivtDO; +import jakarta.validation.*; +import cn.code.nl.framework.common.pojo.PageResult; + +/** + * 分切区缓存点位库存 Service 接口 + * + * @author 诺力管理员 + */ +public interface BtIvtCutpointivtService { + + /** + * 创建分切区缓存点位库存 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIvtCutpointivt(@Valid BtIvtCutpointivtSaveReqVO createReqVO); + + /** + * 更新分切区缓存点位库存 + * + * @param updateReqVO 更新信息 + */ + void updateIvtCutpointivt(@Valid BtIvtCutpointivtSaveReqVO updateReqVO); + + /** + * 删除分切区缓存点位库存 + * + * @param id 编号 + */ + void deleteIvtCutpointivt(Long id); + + /** + * 批量删除分切区缓存点位库存 + * + * @param ids 编号 + */ + void deleteIvtCutpointivtListByIds(List ids); + + /** + * 获得分切区缓存点位库存 + * + * @param id 编号 + * @return 分切区缓存点位库存 + */ + BtIvtCutpointivtDO getIvtCutpointivt(Long id); + + /** + * 获得分切区缓存点位库存分页 + * + * @param pageReqVO 分页查询 + * @return 分切区缓存点位库存分页 + */ + PageResult getIvtCutpointivtPage(BtIvtCutpointivtPageReqVO pageReqVO); + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtServiceImpl.java new file mode 100644 index 00000000..605b2cbd --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtcutpointivt/BtIvtCutpointivtServiceImpl.java @@ -0,0 +1,82 @@ +package cn.code.nl.module.lms.service.ivtcutpointivt; + +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.btcutpointivt.vo.BtIvtCutpointivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.btivtcutpointivt.BtIvtCutpointivtDO; +import cn.code.nl.module.lms.dal.mysql.btivtcutpointivt.BtIvtCutpointivtMapper; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; + +import java.util.*; +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.IVT_CUTPOINTIVT_NOT_EXISTS; + +/** + * 分切区缓存点位库存 Service 实现类 + * + * @author 诺力管理员 + */ +@Service +@Validated +public class BtIvtCutpointivtServiceImpl implements BtIvtCutpointivtService { + + @Resource + private BtIvtCutpointivtMapper btIvtCutpointivtMapper; + + @Override + public Long createIvtCutpointivt(BtIvtCutpointivtSaveReqVO createReqVO) { + // 插入 + BtIvtCutpointivtDO ivtCutpointivt = BeanUtils.toBean(createReqVO, BtIvtCutpointivtDO.class); + btIvtCutpointivtMapper.insert(ivtCutpointivt); + + // 返回 + return ivtCutpointivt.getIvtId(); + } + + @Override + public void updateIvtCutpointivt(BtIvtCutpointivtSaveReqVO updateReqVO) { + // 校验存在 + validateIvtCutpointivtExists(updateReqVO.getIvtId()); + // 更新 + BtIvtCutpointivtDO updateObj = BeanUtils.toBean(updateReqVO, BtIvtCutpointivtDO.class); + btIvtCutpointivtMapper.updateById(updateObj); + } + + @Override + public void deleteIvtCutpointivt(Long id) { + // 校验存在 + validateIvtCutpointivtExists(id); + // 删除 + btIvtCutpointivtMapper.deleteById(id); + } + + @Override + public void deleteIvtCutpointivtListByIds(List ids) { + // 删除 + btIvtCutpointivtMapper.deleteByIds(ids); + } + + + private void validateIvtCutpointivtExists(Long id) { + if (btIvtCutpointivtMapper.selectById(id) == null) { + throw exception(IVT_CUTPOINTIVT_NOT_EXISTS); + } + } + + @Override + public BtIvtCutpointivtDO getIvtCutpointivt(Long id) { + return btIvtCutpointivtMapper.selectById(id); + } + + @Override + public PageResult getIvtCutpointivtPage(BtIvtCutpointivtPageReqVO pageReqVO) { + return btIvtCutpointivtMapper.selectPage(pageReqVO); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtService.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtService.java new file mode 100644 index 00000000..897e24ce --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtService.java @@ -0,0 +1,64 @@ +package cn.code.nl.module.lms.service.ivtshafttubeivt; + +import java.util.*; + +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.ivtshafttubeivt.IvtShafttubeivtDO; +import jakarta.validation.*; +import cn.code.nl.framework.common.pojo.PageResult; +import cn.code.nl.framework.common.pojo.PageParam; + +/** + * 穿拔轴区点位库存 Service 接口 + * + * @author 诺力管理员 + */ +public interface IvtShafttubeivtService { + + /** + * 创建穿拔轴区点位库存 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createIvtShafttubeivt(@Valid IvtShafttubeivtSaveReqVO createReqVO); + + /** + * 更新穿拔轴区点位库存 + * + * @param updateReqVO 更新信息 + */ + void updateIvtShafttubeivt(@Valid IvtShafttubeivtSaveReqVO updateReqVO); + + /** + * 删除穿拔轴区点位库存 + * + * @param id 编号 + */ + void deleteIvtShafttubeivt(Long id); + + /** + * 批量删除穿拔轴区点位库存 + * + * @param ids 编号 + */ + void deleteIvtShafttubeivtListByIds(List ids); + + /** + * 获得穿拔轴区点位库存 + * + * @param id 编号 + * @return 穿拔轴区点位库存 + */ + IvtShafttubeivtDO getIvtShafttubeivt(Long id); + + /** + * 获得穿拔轴区点位库存分页 + * + * @param pageReqVO 分页查询 + * @return 穿拔轴区点位库存分页 + */ + PageResult getIvtShafttubeivtPage(IvtShafttubeivtPageReqVO pageReqVO); + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtServiceImpl.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtServiceImpl.java new file mode 100644 index 00000000..ec9a3894 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/service/ivtshafttubeivt/IvtShafttubeivtServiceImpl.java @@ -0,0 +1,86 @@ +package cn.code.nl.module.lms.service.ivtshafttubeivt; + +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtPageReqVO; +import cn.code.nl.module.lms.controller.admin.ivtshafttubeivt.vo.IvtShafttubeivtSaveReqVO; +import cn.code.nl.module.lms.dal.dataobject.ivtshafttubeivt.IvtShafttubeivtDO; +import cn.code.nl.module.lms.dal.mysql.ivtshafttubeivt.IvtShafttubeivtMapper; +import cn.hutool.core.collection.CollUtil; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +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 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.IVT_SHAFTTUBEIVT_NOT_EXISTS; + +/** + * 穿拔轴区点位库存 Service 实现类 + * + * @author 诺力管理员 + */ +@Service +@Validated +public class IvtShafttubeivtServiceImpl implements IvtShafttubeivtService { + + @Resource + private IvtShafttubeivtMapper ivtShafttubeivtMapper; + + @Override + public Long createIvtShafttubeivt(IvtShafttubeivtSaveReqVO createReqVO) { + // 插入 + IvtShafttubeivtDO ivtShafttubeivt = BeanUtils.toBean(createReqVO, IvtShafttubeivtDO.class); + ivtShafttubeivtMapper.insert(ivtShafttubeivt); + + // 返回 + return ivtShafttubeivt.getIvtId(); + } + + @Override + public void updateIvtShafttubeivt(IvtShafttubeivtSaveReqVO updateReqVO) { + // 校验存在 + validateIvtShafttubeivtExists(updateReqVO.getIvtId()); + // 更新 + IvtShafttubeivtDO updateObj = BeanUtils.toBean(updateReqVO, IvtShafttubeivtDO.class); + ivtShafttubeivtMapper.updateById(updateObj); + } + + @Override + public void deleteIvtShafttubeivt(Long id) { + // 校验存在 + validateIvtShafttubeivtExists(id); + // 删除 + ivtShafttubeivtMapper.deleteById(id); + } + + @Override + public void deleteIvtShafttubeivtListByIds(List ids) { + // 删除 + ivtShafttubeivtMapper.deleteByIds(ids); + } + + + private void validateIvtShafttubeivtExists(Long id) { + if (ivtShafttubeivtMapper.selectById(id) == null) { + throw exception(IVT_SHAFTTUBEIVT_NOT_EXISTS); + } + } + + @Override + public IvtShafttubeivtDO getIvtShafttubeivt(Long id) { + return ivtShafttubeivtMapper.selectById(id); + } + + @Override + public PageResult getIvtShafttubeivtPage(IvtShafttubeivtPageReqVO pageReqVO) { + return ivtShafttubeivtMapper.selectPage(pageReqVO); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml b/nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml index e9e05859..c1ee8e83 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/application-dev.yaml @@ -7,12 +7,12 @@ spring: username: nacos password: nacos discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP metadata: version: 1.0.0 # 服务实例的版本号，可用于灰度发布 config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP --- #################### 数据库相关配置 #################### @@ -140,4 +140,4 @@ logging: # 芋道配置项，设置当前项目所有自定义的配置 nl: - demo: false # 开启演示模式 \ No newline at end of file + demo: false # 开启演示模式 diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/btivtcutpointivt/BtIvtCutpointivtMapper.xml b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/btivtcutpointivt/BtIvtCutpointivtMapper.xml new file mode 100644 index 00000000..84e7488d --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/btivtcutpointivt/BtIvtCutpointivtMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtcutpointIvt/IvtCutpointivtMapper.xml b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtcutpointIvt/IvtCutpointivtMapper.xml new file mode 100644 index 00000000..26ce70eb --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtcutpointIvt/IvtCutpointivtMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtshafttubeivt/IvtShafttubeivtMapper.xml b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtshafttubeivt/IvtShafttubeivtMapper.xml new file mode 100644 index 00000000..b2cb1460 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/resources/mapper/ivtshafttubeivt/IvtShafttubeivtMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/job/slitter/AutoCallAirShaftTask.java b/nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/job/slitter/AutoCallAirShaftTask.java new file mode 100644 index 00000000..a53fa3d7 --- /dev/null +++ b/nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/job/slitter/AutoCallAirShaftTask.java @@ -0,0 +1,23 @@ +package cn.code.nl.module.system.job.slitter; + +import cn.code.nl.framework.tenant.core.job.TenantJob; +import com.xxl.job.core.handler.annotation.XxlJob; +import org.springframework.stereotype.Component; + + +/** + * 自动套轴任务创建 + */ +@Component +public class AutoCallAirShaftTask { + + + + @XxlJob("autoCallAirShaftTask") + @TenantJob + public void execute() { + + + + } +} diff --git a/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml b/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml index 4acc8c8e..c9012eb3 100644 --- a/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml +++ b/nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml @@ -7,12 +7,12 @@ spring: username: # Nacos 账号 password: # Nacos 密码 discovery: # 【配置中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP metadata: version: 1.0.0 # 服务实例的版本号，可用于灰度发布 config: # 【注册中心】配置项 - namespace: dev # 命名空间。这里使用 dev 开发环境 + namespace: 9a321b6b-68c6-45e1-90b0-bc187d7c29bb # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP --- #################### 数据库相关配置 #################### @@ -99,7 +99,7 @@ xxl: accessToken: 123456 # 执行器通讯TOKEN executor: ip: 192.168.81.193 - port: 9992 + port: 9982 --- #################### 服务保障相关配置 #################### diff --git a/nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/BsrealStorAttrMapper.xml b/nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/BtIvtCutpointivtMapper.xml similarity index 100% rename from nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/BsrealStorAttrMapper.xml rename to nl-module-wms/nl-module-wms-server/src/main/resources/mapper/bsrealstorattr/BtIvtCutpointivtMapper.xml diff --git a/nl-server/src/main/resources/application-dev.yaml b/nl-server/src/main/resources/application-dev.yaml index 79fa9cf0..d1f38b0a 100644 --- a/nl-server/src/main/resources/application-dev.yaml +++ b/nl-server/src/main/resources/application-dev.yaml @@ -74,7 +74,7 @@ xxl: executor: appname: nl-lms-server ip: 192.168.81.193 - port: 9992 + port: 9982 --- #################### 消息队列相关 #################### @@ -212,4 +212,4 @@ iot: # 插件配置 pf4j: - pluginsDir: ${user.home}/plugins # 插件目录 \ No newline at end of file + pluginsDir: ${user.home}/plugins # 插件目录 diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/btivtcutpointivt/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/btivtcutpointivt/index.ts new file mode 100644 index 00000000..2b6cc857 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/btivtcutpointivt/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 BtcutpointivtBtIvtCutpointivtApi { + /** 分切区缓存点位库存信息 */ + export interface BtIvtCutpointivt { + pointCode?: string; // AGV点位编码 + pointName: string; // AGV点位名称 + trussPointCode1?: string; // 桁架点位编码1 + trussPointCode2?: string; // 桁架点位编码2 + qzzNo1: string; // 气胀轴编码1 + qzzNo2: string; // 气胀轴编码2 + upGx: string; // 上轴管芯 + downGx: string; // 下轴管芯 + pointType: string; // 点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位 + productArea: string; // 生产区域 + sortSeq?: number; // 顺序号 + isUsed?: string; // 是否启用 + remark: string; // 备注 + pointStatus: string; // 点位状态 + } +} + +/** 查询分切区缓存点位库存分页 */ +export function getBtIvtCutpointivtPage(params: PageParam) { + return requestClient.get>( + '/btcutpointivt/bt-ivt-cutpointivt/page', + { params }, + ); +} + +/** 查询分切区缓存点位库存详情 */ +export function getBtIvtCutpointivt(id: number) { + return requestClient.get( + `/btcutpointivt/bt-ivt-cutpointivt/get?id=${id}`, + ); +} + +/** 新增分切区缓存点位库存 */ +export function createBtIvtCutpointivt(data: BtcutpointivtBtIvtCutpointivtApi.BtIvtCutpointivt) { + return requestClient.post('/btcutpointivt/bt-ivt-cutpointivt/create', data); +} + +/** 修改分切区缓存点位库存 */ +export function updateBtIvtCutpointivt(data: BtcutpointivtBtIvtCutpointivtApi.BtIvtCutpointivt) { + return requestClient.put('/btcutpointivt/bt-ivt-cutpointivt/update', data); +} + +/** 删除分切区缓存点位库存 */ +export function deleteBtIvtCutpointivt(id: number) { + return requestClient.delete(`/btcutpointivt/bt-ivt-cutpointivt/delete?id=${id}`); +} + +/** 批量删除分切区缓存点位库存 */ +export function deleteBtIvtCutpointivtList(ids: number[]) { + return requestClient.delete( + `/btcutpointivt/bt-ivt-cutpointivt/delete-list?ids=${ids.join(',')}`, + ); +} + +/** 导出分切区缓存点位库存 */ +export function exportBtIvtCutpointivt(params: any) { + return requestClient.download('/btcutpointivt/bt-ivt-cutpointivt/export-excel', { params }); +} + + \ No newline at end of file diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/cutpointivt/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/cutpointivt/index.ts new file mode 100644 index 00000000..d74ebec1 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/cutpointivt/index.ts @@ -0,0 +1,78 @@ +import type { PageParam, PageResult } from '@vben/request'; +import type { Dayjs } from 'dayjs'; + +import { requestClient } from '#/api/request'; + +export namespace CutpointivtIvtCutpointivtApi { + /** 分切区点位库存信息 */ + export interface IvtCutpointivt { + pointCode?: string; // 点位编码 + fullPointCode: string; // 满轴位编码 + fullPointStatus?: string; // 满轴位状态 + containerName: string; // 母卷号 + fullVehicleCode: string; // 母卷轴编码 + emptyPointCode: string; // 空轴位编码 + emptyPointStatus?: string; // 空轴位状态 + emptyVehicleCode: string; // 空轴编码 + productArea: string; // 生产区域 + pointLocation: string; // 位置 + upPointCode: string; // 分切下料位上轴点位 + downPointCode: string; // 分切下料位下轴点位 + sortSeq: number; // 顺序号 + isUsed: string; // 是否启用 + remark: string; // 备注 + createId: number; // 创建人 + createName: string; // 创建人姓名 + updateOptid: number; // 修改人 + updateOptname: string; // 修改人姓名 + plan: string; // 规划 + extCode: string; // 对应MES系统设备编码 + upQzzno: string; // 分切下料位上轴 + downQzzno: string; // 分切下料位下轴 + qzzGeneration: string; // 气胀轴代数 + } +} + +/** 查询分切区点位库存分页 */ +export function getIvtCutpointivtPage(params: PageParam) { + return requestClient.get>( + '/cutpointivt/ivt-cutpointivt/page', + { params }, + ); +} + +/** 查询分切区点位库存详情 */ +export function getIvtCutpointivt(id: number) { + return requestClient.get( + `/cutpointivt/ivt-cutpointivt/get?id=${id}`, + ); +} + +/** 新增分切区点位库存 */ +export function createIvtCutpointivt(data: CutpointivtIvtCutpointivtApi.IvtCutpointivt) { + return requestClient.post('/cutpointivt/ivt-cutpointivt/create', data); +} + +/** 修改分切区点位库存 */ +export function updateIvtCutpointivt(data: CutpointivtIvtCutpointivtApi.IvtCutpointivt) { + return requestClient.put('/cutpointivt/ivt-cutpointivt/update', data); +} + +/** 删除分切区点位库存 */ +export function deleteIvtCutpointivt(id: number) { + return requestClient.delete(`/cutpointivt/ivt-cutpointivt/delete?id=${id}`); +} + +/** 批量删除分切区点位库存 */ +export function deleteIvtCutpointivtList(ids: number[]) { + return requestClient.delete( + `/cutpointivt/ivt-cutpointivt/delete-list?ids=${ids.join(',')}`, + ); +} + +/** 导出分切区点位库存 */ +export function exportIvtCutpointivt(params: any) { + return requestClient.download('/cutpointivt/ivt-cutpointivt/export-excel', { params }); +} + + \ No newline at end of file diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/ivtshafttubeivt/index.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/ivtshafttubeivt/index.ts new file mode 100644 index 00000000..0a4ddcb2 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/api/lms/ivtshafttubeivt/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 IvtshafttubeivtIvtApi { + /** 穿拔轴区点位库存信息 */ + export interface IvtShafttubeivt { + pointCode?: string; // 点位编码 + pointName: string; // 点位名称 + qzzSize: string; // 气涨轴尺寸 + qzzGeneration: string; // 气涨轴代数 + tubeCode: string; // 纸管编码 + tubeName: string; // 纸管描述 + containerName: string; // 子卷号 + pointType: string; // 点位类型 + pointLocation: string; // 位置 + haveQzz: string; // 是否有轴 + isUsed: string; // 是否启用 + sortSeq: number; // 顺序号 + plan: string; // 规划 + parentCode: string; // 关联点位 + } +} + +/** 查询穿拔轴区点位库存分页 */ +export function getIvtShafttubeivtPage(params: PageParam) { + return requestClient.get>( + '/ivtshafttubeivt/ivt-shafttubeivt/page', + { params }, + ); +} + +/** 查询穿拔轴区点位库存详情 */ +export function getIvtShafttubeivt(id: number) { + return requestClient.get( + `/ivtshafttubeivt/ivt-shafttubeivt/get?id=${id}`, + ); +} + +/** 新增穿拔轴区点位库存 */ +export function createIvtShafttubeivt(data: IvtshafttubeivtIvtApi.IvtShafttubeivt) { + return requestClient.post('/ivtshafttubeivt/ivt-shafttubeivt/create', data); +} + +/** 修改穿拔轴区点位库存 */ +export function updateIvtShafttubeivt(data: IvtshafttubeivtIvtApi.IvtShafttubeivt) { + return requestClient.put('/ivtshafttubeivt/ivt-shafttubeivt/update', data); +} + +/** 删除穿拔轴区点位库存 */ +export function deleteIvtShafttubeivt(id: number) { + return requestClient.delete(`/ivtshafttubeivt/ivt-shafttubeivt/delete?id=${id}`); +} + +/** 批量删除穿拔轴区点位库存 */ +export function deleteIvtShafttubeivtList(ids: number[]) { + return requestClient.delete( + `/ivtshafttubeivt/ivt-shafttubeivt/delete-list?ids=${ids.join(',')}`, + ); +} + +/** 导出穿拔轴区点位库存 */ +export function exportIvtShafttubeivt(params: any) { + return requestClient.download('/ivtshafttubeivt/ivt-shafttubeivt/export-excel', { params }); +} + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/data.ts new file mode 100644 index 00000000..0d4433da --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/data.ts @@ -0,0 +1,317 @@ +import type { VbenFormSchema } from '#/adapter/form'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { BtcutpointivtBtIvtCutpointivtApi } from '#/api/lms/btivtcutpointivt'; + +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; + +/** 新增/修改的表单 */ +export function useFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'id', + component: 'Input', + dependencies: { + triggerFields: [''], + show: () => false, + }, + }, + { + fieldName: 'pointCode', + label: 'AGV点位编码', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入AGV点位编码', + }, + }, + { + fieldName: 'pointName', + label: 'AGV点位名称', + component: 'Input', + componentProps: { + placeholder: '请输入AGV点位名称', + }, + }, + { + fieldName: 'trussPointCode1', + label: '桁架点位编码1 ', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入桁架点位编码1 ', + }, + }, + { + fieldName: 'trussPointCode2', + label: '桁架点位编码2', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入桁架点位编码2', + }, + }, + { + fieldName: 'qzzNo1', + label: '气胀轴编码1', + component: 'Input', + componentProps: { + placeholder: '请输入气胀轴编码1', + }, + }, + { + fieldName: 'qzzNo2', + label: '气胀轴编码2', + component: 'Input', + componentProps: { + placeholder: '请输入气胀轴编码2', + }, + }, + { + fieldName: 'upGx', + label: '上轴管芯', + component: 'Input', + componentProps: { + placeholder: '请输入上轴管芯', + }, + }, + { + fieldName: 'downGx', + label: '下轴管芯', + component: 'Input', + componentProps: { + placeholder: '请输入下轴管芯', + }, + }, + { + fieldName: 'pointType', + label: '点位类型', + component: 'Select', + componentProps: { + options: [], + placeholder: '请选择点位类型', + }, + }, + { + fieldName: 'productArea', + label: '生产区域', + component: 'Input', + componentProps: { + placeholder: '请输入生产区域', + }, + }, + { + fieldName: 'sortSeq', + label: '顺序号', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入顺序号', + }, + }, + { + fieldName: 'isUsed', + label: '是否启用', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入是否启用', + }, + }, + { + fieldName: 'remark', + label: '备注', + component: 'Input', + componentProps: { + placeholder: '请输入备注', + }, + }, + { + fieldName: 'pointStatus', + label: '点位状态', + component: 'RadioGroup', + componentProps: { + options: [], + buttonStyle: 'solid', + optionType: 'button', + }, + }, + ]; +} + +/** 列表的搜索表单 */ +export function useGridFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'pointCode', + label: 'AGV点位编码', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入AGV点位编码', + }, + }, + { + fieldName: 'pointType', + label: '点位类型', + component: 'Select', + componentProps: { + allowClear: true, + options: [], + placeholder: '请选择点位类型', + }, + }, + { + fieldName: 'productArea', + label: '生产区域', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入生产区域', + }, + }, + { + fieldName: 'isUsed', + label: '是否启用', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入是否启用', + }, + }, + { + fieldName: 'createTime', + label: '创建时间', + component: 'RangePicker', + componentProps: { + ...getRangePickerDefaultProps(), + allowClear: true, + }, + }, + { + fieldName: 'pointStatus', + label: '点位状态', + component: 'Select', + componentProps: { + allowClear: true, + options: [], + placeholder: '请选择点位状态', + }, + }, + ]; +} + +/** 列表的字段 */ +export function useGridColumns(): VxeTableGridOptions['columns'] { + return [ + { type: 'checkbox', width: 40 }, + { + field: 'ivtId', + title: '库存记录标识', + minWidth: 120, + }, + { + field: 'pointCode', + title: 'AGV点位编码', + minWidth: 120, + }, + { + field: 'pointName', + title: 'AGV点位名称', + minWidth: 120, + }, + { + field: 'trussPointCode1', + title: '桁架点位编码1 ', + minWidth: 120, + }, + { + field: 'trussPointCode2', + title: '桁架点位编码2', + minWidth: 120, + }, + { + field: 'qzzNo1', + title: '气胀轴编码1', + minWidth: 120, + }, + { + field: 'qzzNo2', + title: '气胀轴编码2', + minWidth: 120, + }, + { + field: 'upGx', + title: '上轴管芯', + minWidth: 120, + }, + { + field: 'downGx', + title: '下轴管芯', + minWidth: 120, + }, + { + field: 'pointType', + title: '点位类型,1-分切缓存位，2-分切对接位，3-套轴对接位，4-套轴缓存位', + minWidth: 120, + }, + { + field: 'productArea', + title: '生产区域', + minWidth: 120, + }, + { + field: 'sortSeq', + title: '顺序号', + minWidth: 120, + }, + { + field: 'isUsed', + title: '是否启用', + minWidth: 120, + }, + { + field: 'remark', + title: '备注', + minWidth: 120, + }, + { + field: 'createId', + title: '创建人', + minWidth: 120, + }, + { + field: 'createName', + title: '创建人姓名', + minWidth: 120, + }, + { + field: 'createTime', + title: '创建时间', + minWidth: 120, + }, + { + field: 'updateOptid', + title: '修改人', + minWidth: 120, + }, + { + field: 'updateOptname', + title: '修改人姓名', + minWidth: 120, + }, + { + field: 'pointStatus', + title: '点位状态', + minWidth: 120, + }, + { + title: '操作', + width: 200, + fixed: 'right', + slots: { default: 'actions' }, + }, + ]; +} + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/index.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/index.vue new file mode 100644 index 00000000..02e0806d --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/index.vue @@ -0,0 +1,186 @@ + + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/modules/form.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/modules/form.vue new file mode 100644 index 00000000..875c31a4 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/btivtcutpointivt/modules/form.vue @@ -0,0 +1,82 @@ + + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/data.ts new file mode 100644 index 00000000..3d2fb45b --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/data.ts @@ -0,0 +1,421 @@ +import type { VbenFormSchema } from '#/adapter/form'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { CutpointivtIvtCutpointivtApi } from '#/api/lms/cutpointivt/ivtcutpointivt'; + +import { getDictOptions } from '@vben/hooks'; + +import { getRangePickerDefaultProps } from '#/utils'; + +/** 新增/修改的表单 */ +export function useFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'ivtId', + component: 'Input', + dependencies: { + triggerFields: [''], + show: () => false, + }, + }, + { + fieldName: 'pointCode', + label: '点位编码', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入点位编码', + }, + }, + { + fieldName: 'fullPointCode', + label: '满轴位编码', + component: 'Input', + componentProps: { + placeholder: '请输入满轴位编码', + }, + }, + { + fieldName: 'fullPointStatus', + label: '满轴位状态', + rules: 'required', + component: 'RadioGroup', + componentProps: { + options: [], + buttonStyle: 'solid', + optionType: 'button', + }, + }, + { + fieldName: 'containerName', + label: '母卷号', + component: 'Input', + componentProps: { + placeholder: '请输入母卷号', + }, + }, + { + fieldName: 'fullVehicleCode', + label: '母卷轴编码', + component: 'Input', + componentProps: { + placeholder: '请输入母卷轴编码', + }, + }, + { + fieldName: 'emptyPointCode', + label: '空轴位编码', + component: 'Input', + componentProps: { + placeholder: '请输入空轴位编码', + }, + }, + { + fieldName: 'emptyPointStatus', + label: '空轴位状态', + rules: 'required', + component: 'RadioGroup', + componentProps: { + options: [], + buttonStyle: 'solid', + optionType: 'button', + }, + }, + { + fieldName: 'emptyVehicleCode', + label: '空轴编码', + component: 'Input', + componentProps: { + placeholder: '请输入空轴编码', + }, + }, + { + fieldName: 'productArea', + label: '生产区域', + component: 'Input', + componentProps: { + placeholder: '请输入生产区域', + }, + }, + { + fieldName: 'pointLocation', + label: '位置', + component: 'Input', + componentProps: { + placeholder: '请输入位置', + }, + }, + { + fieldName: 'upPointCode', + label: '分切下料位上轴点位', + component: 'Input', + componentProps: { + placeholder: '请输入分切下料位上轴点位', + }, + }, + { + fieldName: 'downPointCode', + label: '分切下料位下轴点位', + component: 'Input', + componentProps: { + placeholder: '请输入分切下料位下轴点位', + }, + }, + { + fieldName: 'sortSeq', + label: '顺序号', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入顺序号', + }, + }, + { + fieldName: 'isUsed', + label: '是否启用', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入是否启用', + }, + }, + { + fieldName: 'remark', + label: '备注', + component: 'Input', + componentProps: { + placeholder: '请输入备注', + }, + }, + { + fieldName: 'createId', + label: '创建人', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入创建人', + }, + }, + { + fieldName: 'createName', + label: '创建人姓名', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入创建人姓名', + }, + }, + { + fieldName: 'updateOptid', + label: '修改人', + component: 'Input', + componentProps: { + placeholder: '请输入修改人', + }, + }, + { + fieldName: 'updateOptname', + label: '修改人姓名', + component: 'Input', + componentProps: { + placeholder: '请输入修改人姓名', + }, + }, + { + fieldName: 'plan', + label: '规划', + component: 'Input', + componentProps: { + placeholder: '请输入规划', + }, + }, + { + fieldName: 'extCode', + label: '对应MES系统设备编码', + component: 'Input', + componentProps: { + placeholder: '请输入对应MES系统设备编码', + }, + }, + { + fieldName: 'upQzzno', + label: '分切下料位上轴', + component: 'Input', + componentProps: { + placeholder: '请输入分切下料位上轴', + }, + }, + { + fieldName: 'downQzzno', + label: '分切下料位下轴', + component: 'Input', + componentProps: { + placeholder: '请输入分切下料位下轴', + }, + }, + { + fieldName: 'qzzGeneration', + label: '气胀轴代数', + component: 'Input', + componentProps: { + placeholder: '请输入气胀轴代数', + }, + }, + ]; +} + +/** 列表的搜索表单 */ +export function useGridFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'pointCode', + label: '点位编码', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入点位编码', + }, + }, + { + fieldName: 'fullPointStatus', + label: '满轴位状态', + component: 'Select', + componentProps: { + allowClear: true, + options: [], + placeholder: '请选择满轴位状态', + }, + }, + { + fieldName: 'emptyPointStatus', + label: '空轴位状态', + component: 'Select', + componentProps: { + allowClear: true, + options: [], + placeholder: '请选择空轴位状态', + }, + }, + { + fieldName: 'productArea', + label: '生产区域', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入生产区域', + }, + }, + { + fieldName: 'isUsed', + label: '是否启用', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入是否启用', + }, + }, + ]; +} + +/** 列表的字段 */ +export function useGridColumns(): VxeTableGridOptions['columns'] { + return [ + { type: 'checkbox', width: 40 }, + { + field: 'ivtId', + title: '库存记录标识', + minWidth: 120, + }, + { + field: 'pointCode', + title: '点位编码', + minWidth: 120, + }, + { + field: 'fullPointCode', + title: '满轴位编码', + minWidth: 120, + }, + { + field: 'fullPointStatus', + title: '满轴位状态', + minWidth: 120, + }, + { + field: 'containerName', + title: '母卷号', + minWidth: 120, + }, + { + field: 'fullVehicleCode', + title: '母卷轴编码', + minWidth: 120, + }, + { + field: 'emptyPointCode', + title: '空轴位编码', + minWidth: 120, + }, + { + field: 'emptyPointStatus', + title: '空轴位状态', + minWidth: 120, + }, + { + field: 'emptyVehicleCode', + title: '空轴编码', + minWidth: 120, + }, + { + field: 'productArea', + title: '生产区域', + minWidth: 120, + }, + { + field: 'pointLocation', + title: '位置', + minWidth: 120, + }, + { + field: 'upPointCode', + title: '分切下料位上轴点位', + minWidth: 120, + }, + { + field: 'downPointCode', + title: '分切下料位下轴点位', + minWidth: 120, + }, + { + field: 'sortSeq', + title: '顺序号', + minWidth: 120, + }, + { + field: 'isUsed', + title: '是否启用', + minWidth: 120, + }, + { + field: 'remark', + title: '备注', + minWidth: 120, + }, + { + field: 'createId', + title: '创建人', + minWidth: 120, + }, + { + field: 'createName', + title: '创建人姓名', + minWidth: 120, + }, + { + field: 'createTime', + title: '创建时间', + minWidth: 120, + }, + { + field: 'updateOptid', + title: '修改人', + minWidth: 120, + }, + { + field: 'updateOptname', + title: '修改人姓名', + minWidth: 120, + }, + { + field: 'plan', + title: '规划', + minWidth: 120, + }, + { + field: 'extCode', + title: '对应MES系统设备编码', + minWidth: 120, + }, + { + field: 'upQzzno', + title: '分切下料位上轴', + minWidth: 120, + }, + { + field: 'downQzzno', + title: '分切下料位下轴', + minWidth: 120, + }, + { + field: 'qzzGeneration', + title: '气胀轴代数', + minWidth: 120, + }, + { + title: '操作', + width: 200, + fixed: 'right', + slots: { default: 'actions' }, + }, + ]; +} + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/index.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/index.vue new file mode 100644 index 00000000..a0daedce --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/index.vue @@ -0,0 +1,186 @@ + + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/modules/form.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/modules/form.vue new file mode 100644 index 00000000..9cb419ec --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/cutpointivt/ivtcutpointivt/modules/form.vue @@ -0,0 +1,82 @@ + + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/data.ts b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/data.ts new file mode 100644 index 00000000..6f75b290 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/data.ts @@ -0,0 +1,275 @@ +import type { VbenFormSchema } from '#/adapter/form'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { IvtshafttubeivtIvtApi } from '#/api/lms/ivtshafttubeivt'; + +import {DICT_TYPE} from "@vben/constants"; +import { getDictOptions } from '@vben/hooks'; + +import {z} from "#/adapter/form"; + +/** 新增/修改的表单 */ +export function useFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'id', + component: 'Input', + dependencies: { + triggerFields: [''], + show: () => false, + }, + }, + { + fieldName: 'pointCode', + label: '点位编码', + rules: 'required', + component: 'Input', + componentProps: { + placeholder: '请输入点位编码', + }, + }, + { + fieldName: 'pointName', + label: '点位名称', + component: 'Input', + componentProps: { + placeholder: '请输入点位名称', + }, + }, + { + fieldName: 'qzzSize', + label: '气涨轴尺寸', + component: 'Input', + componentProps: { + placeholder: '请输入气涨轴尺寸', + }, + }, + { + fieldName: 'qzzGeneration', + label: '气涨轴代数', + component: 'Input', + componentProps: { + placeholder: '请输入气涨轴代数', + }, + }, + { + fieldName: 'tubeCode', + label: '纸管编码', + component: 'Input', + componentProps: { + placeholder: '请输入纸管编码', + }, + }, + { + fieldName: 'tubeName', + label: '纸管描述', + component: 'Input', + componentProps: { + placeholder: '请输入纸管描述', + }, + }, + { + fieldName: 'containerName', + label: '子卷号', + component: 'Input', + componentProps: { + placeholder: '请输入子卷号', + }, + }, + { + fieldName: 'pointType', + label: '点位类型', + component: 'Select', + componentProps: { + options: [], + placeholder: '请选择点位类型', + }, + }, + { + fieldName: 'pointLocation', + label: '位置', + component: 'Input', + componentProps: { + placeholder: '请输入位置', + }, + }, + { + fieldName: 'haveQzz', + label: '是否有轴', + component: 'Input', + componentProps: { + placeholder: '请输入是否有轴', + }, + }, + { + fieldName: 'isUsed', + label: '是否启用', + component: 'Input', + componentProps: { + placeholder: '请输入是否启用', + }, + }, + { + fieldName: 'sortSeq', + label: '顺序号', + component: 'Input', + componentProps: { + placeholder: '请输入顺序号', + }, + }, + { + fieldName: 'plan', + label: '规划', + component: 'Input', + componentProps: { + placeholder: '请输入规划', + }, + }, + { + fieldName: 'parentCode', + label: '关联点位', + component: 'Input', + componentProps: { + placeholder: '请输入关联点位', + }, + }, + ]; +} + +/** 列表的搜索表单 */ +export function useGridFormSchema(): VbenFormSchema[] { + return [ + { + fieldName: 'pointCode', + label: '点位编码', + component: 'Input', + componentProps: { + allowClear: true, + placeholder: '请输入点位编码', + }, + }, + { + fieldName: 'pointType', + label: '点位类型', + component: 'Select', + componentProps: { + allowClear: true, + options: [], + placeholder: '请选择点位类型', + }, + }, + ]; +} + +/** 列表的字段 */ +export function useGridColumns(): VxeTableGridOptions['columns'] { + return [ + { type: 'checkbox', width: 40 }, + { + field: 'ivtId', + title: '库存记录标识', + minWidth: 120, + }, + { + field: 'pointCode', + title: '点位编码', + minWidth: 120, + }, + { + field: 'pointName', + title: '点位名称', + minWidth: 120, + }, + { + field: 'qzzSize', + title: '气涨轴尺寸', + minWidth: 120, + }, + { + field: 'qzzGeneration', + title: '气涨轴代数', + minWidth: 120, + }, + { + field: 'tubeCode', + title: '纸管编码', + minWidth: 120, + }, + { + field: 'tubeName', + title: '纸管描述', + minWidth: 120, + }, + { + field: 'containerName', + title: '子卷号', + minWidth: 120, + }, + { + field: 'pointType', + title: '点位类型', + minWidth: 120, + }, + { + field: 'pointLocation', + title: '位置', + minWidth: 120, + }, + { + field: 'haveQzz', + title: '是否有轴', + minWidth: 120, + }, + { + field: 'isUsed', + title: '是否启用', + minWidth: 120, + }, + { + field: 'sortSeq', + title: '顺序号', + minWidth: 120, + }, + { + field: 'createId', + title: '创建人', + minWidth: 120, + }, + { + field: 'createName', + title: '创建人', + minWidth: 120, + }, + { + field: 'createTime', + title: '创建时间', + minWidth: 120, + }, + { + field: 'updateOptid', + title: '修改人', + minWidth: 120, + }, + { + field: 'updateOptname', + title: '修改人', + minWidth: 120, + }, + { + field: 'plan', + title: '规划', + minWidth: 120, + }, + { + field: 'parentCode', + title: '关联点位', + minWidth: 120, + }, + { + title: '操作', + width: 200, + fixed: 'right', + slots: { default: 'actions' }, + }, + ]; +} + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/index.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/index.vue new file mode 100644 index 00000000..6c6980b3 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/index.vue @@ -0,0 +1,187 @@ + + + diff --git a/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/modules/form.vue b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/modules/form.vue new file mode 100644 index 00000000..fd884872 --- /dev/null +++ b/nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/lms/ivtshafttubeivt/modules/form.vue @@ -0,0 +1,82 @@ + + +