From 00ddae6db94a68890751da861b6dbef56762160a Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Mon, 15 Jul 2024 10:28:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=87=E4=BB=B6=20=E7=89=A9=E8=B5=84=20?=
=?UTF-8?q?=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../spares/controller/InboundController.java | 126 ++++++++++++++++++
.../MaterialClassCodeController.java | 126 ++++++++++++++++++
.../spares/controller/MaterialController.java | 126 ++++++++++++++++++
.../spares/controller/OutboundController.java | 126 ++++++++++++++++++
.../energy/modules/spares/dto/InboundDTO.java | 18 +++
.../spares/dto/MaterialClassCodeDTO.java | 18 +++
.../modules/spares/dto/MaterialDTO.java | 18 +++
.../modules/spares/dto/OutboundDTO.java | 18 +++
.../energy/modules/spares/entity/Inbound.java | 67 ++++++++++
.../modules/spares/entity/Material.java | 82 ++++++++++++
.../spares/entity/MaterialClassCode.java | 42 ++++++
.../modules/spares/entity/Outbound.java | 67 ++++++++++
.../modules/spares/mapper/InboundMapper.java | 26 ++++
.../modules/spares/mapper/InboundMapper.xml | 28 ++++
.../mapper/MaterialClassCodeMapper.java | 26 ++++
.../spares/mapper/MaterialClassCodeMapper.xml | 23 ++++
.../modules/spares/mapper/MaterialMapper.java | 26 ++++
.../modules/spares/mapper/MaterialMapper.xml | 31 +++++
.../modules/spares/mapper/OutboundMapper.java | 26 ++++
.../modules/spares/mapper/OutboundMapper.xml | 28 ++++
.../spares/service/IInboundService.java | 25 ++++
.../service/IMaterialClassCodeService.java | 25 ++++
.../spares/service/IMaterialService.java | 25 ++++
.../spares/service/IOutboundService.java | 25 ++++
.../service/impl/InboundServiceImpl.java | 25 ++++
.../impl/MaterialClassCodeServiceImpl.java | 25 ++++
.../service/impl/MaterialServiceImpl.java | 25 ++++
.../service/impl/OutboundServiceImpl.java | 25 ++++
.../energy/modules/spares/vo/InboundVO.java | 20 +++
.../spares/vo/MaterialClassCodeVO.java | 20 +++
.../energy/modules/spares/vo/MaterialVO.java | 20 +++
.../energy/modules/spares/vo/OutboundVO.java | 20 +++
32 files changed, 1328 insertions(+)
create mode 100644 src/main/java/org/energy/modules/spares/controller/InboundController.java
create mode 100644 src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
create mode 100644 src/main/java/org/energy/modules/spares/controller/MaterialController.java
create mode 100644 src/main/java/org/energy/modules/spares/controller/OutboundController.java
create mode 100644 src/main/java/org/energy/modules/spares/dto/InboundDTO.java
create mode 100644 src/main/java/org/energy/modules/spares/dto/MaterialClassCodeDTO.java
create mode 100644 src/main/java/org/energy/modules/spares/dto/MaterialDTO.java
create mode 100644 src/main/java/org/energy/modules/spares/dto/OutboundDTO.java
create mode 100644 src/main/java/org/energy/modules/spares/entity/Inbound.java
create mode 100644 src/main/java/org/energy/modules/spares/entity/Material.java
create mode 100644 src/main/java/org/energy/modules/spares/entity/MaterialClassCode.java
create mode 100644 src/main/java/org/energy/modules/spares/entity/Outbound.java
create mode 100644 src/main/java/org/energy/modules/spares/mapper/InboundMapper.java
create mode 100644 src/main/java/org/energy/modules/spares/mapper/InboundMapper.xml
create mode 100644 src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java
create mode 100644 src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml
create mode 100644 src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java
create mode 100644 src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
create mode 100644 src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java
create mode 100644 src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml
create mode 100644 src/main/java/org/energy/modules/spares/service/IInboundService.java
create mode 100644 src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java
create mode 100644 src/main/java/org/energy/modules/spares/service/IMaterialService.java
create mode 100644 src/main/java/org/energy/modules/spares/service/IOutboundService.java
create mode 100644 src/main/java/org/energy/modules/spares/service/impl/InboundServiceImpl.java
create mode 100644 src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java
create mode 100644 src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java
create mode 100644 src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java
create mode 100644 src/main/java/org/energy/modules/spares/vo/InboundVO.java
create mode 100644 src/main/java/org/energy/modules/spares/vo/MaterialClassCodeVO.java
create mode 100644 src/main/java/org/energy/modules/spares/vo/MaterialVO.java
create mode 100644 src/main/java/org/energy/modules/spares/vo/OutboundVO.java
diff --git a/src/main/java/org/energy/modules/spares/controller/InboundController.java b/src/main/java/org/energy/modules/spares/controller/InboundController.java
new file mode 100644
index 0000000..e7a85f9
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/controller/InboundController.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.spares.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.spares.entity.Inbound;
+import org.energy.modules.spares.vo.InboundVO;
+import org.energy.modules.spares.service.IInboundService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+/**
+ * 入库 控制器
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/inbound")
+@Api(value = "入库", tags = "入库接口")
+public class InboundController extends DafController {
+
+ private IInboundService inboundService;
+
+ /**
+ * 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入inbound")
+ public R detail(Inbound inbound) {
+ Inbound detail = inboundService.getOne(Condition.getQueryWrapper(inbound));
+ return R.data(detail);
+ }
+
+ /**
+ * 分页 入库
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入inbound")
+ public R> list(Inbound inbound, Query query) {
+ IPage pages = inboundService.page(Condition.getPage(query), Condition.getQueryWrapper(inbound));
+ return R.data(pages);
+ }
+
+ /**
+ * 自定义分页 入库
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入inbound")
+ public R> page(InboundVO inbound, Query query) {
+ IPage pages = inboundService.selectInboundPage(Condition.getPage(query), inbound);
+ return R.data(pages);
+ }
+
+ /**
+ * 新增 入库
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入inbound")
+ public R save(@Valid @RequestBody Inbound inbound) {
+ return R.status(inboundService.save(inbound));
+ }
+
+ /**
+ * 修改 入库
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入inbound")
+ public R update(@Valid @RequestBody Inbound inbound) {
+ return R.status(inboundService.updateById(inbound));
+ }
+
+ /**
+ * 新增或修改 入库
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入inbound")
+ public R submit(@Valid @RequestBody Inbound inbound) {
+ return R.status(inboundService.saveOrUpdate(inbound));
+ }
+
+
+ /**
+ * 删除 入库
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(inboundService.deleteLogic(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
new file mode 100644
index 0000000..dc059be
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.spares.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.spares.entity.MaterialClassCode;
+import org.energy.modules.spares.vo.MaterialClassCodeVO;
+import org.energy.modules.spares.service.IMaterialClassCodeService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+/**
+ * 物资分类码 控制器
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/materialclasscode")
+@Api(value = "物资分类码", tags = "物资分类码接口")
+public class MaterialClassCodeController extends DafController {
+
+ private IMaterialClassCodeService materialClassCodeService;
+
+ /**
+ * 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入materialClassCode")
+ public R detail(MaterialClassCode materialClassCode) {
+ MaterialClassCode detail = materialClassCodeService.getOne(Condition.getQueryWrapper(materialClassCode));
+ return R.data(detail);
+ }
+
+ /**
+ * 分页 物资分类码
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入materialClassCode")
+ public R> list(MaterialClassCode materialClassCode, Query query) {
+ IPage pages = materialClassCodeService.page(Condition.getPage(query), Condition.getQueryWrapper(materialClassCode));
+ return R.data(pages);
+ }
+
+ /**
+ * 自定义分页 物资分类码
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入materialClassCode")
+ public R> page(MaterialClassCodeVO materialClassCode, Query query) {
+ IPage pages = materialClassCodeService.selectMaterialClassCodePage(Condition.getPage(query), materialClassCode);
+ return R.data(pages);
+ }
+
+ /**
+ * 新增 物资分类码
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入materialClassCode")
+ public R save(@Valid @RequestBody MaterialClassCode materialClassCode) {
+ return R.status(materialClassCodeService.save(materialClassCode));
+ }
+
+ /**
+ * 修改 物资分类码
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入materialClassCode")
+ public R update(@Valid @RequestBody MaterialClassCode materialClassCode) {
+ return R.status(materialClassCodeService.updateById(materialClassCode));
+ }
+
+ /**
+ * 新增或修改 物资分类码
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入materialClassCode")
+ public R submit(@Valid @RequestBody MaterialClassCode materialClassCode) {
+ return R.status(materialClassCodeService.saveOrUpdate(materialClassCode));
+ }
+
+
+ /**
+ * 删除 物资分类码
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialController.java b/src/main/java/org/energy/modules/spares/controller/MaterialController.java
new file mode 100644
index 0000000..b05bd03
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/controller/MaterialController.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.spares.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.spares.entity.Material;
+import org.energy.modules.spares.vo.MaterialVO;
+import org.energy.modules.spares.service.IMaterialService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+/**
+ * 物资 控制器
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/material")
+@Api(value = "物资", tags = "物资接口")
+public class MaterialController extends DafController {
+
+ private IMaterialService materialService;
+
+ /**
+ * 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入material")
+ public R detail(Material material) {
+ Material detail = materialService.getOne(Condition.getQueryWrapper(material));
+ return R.data(detail);
+ }
+
+ /**
+ * 分页 物资
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入material")
+ public R> list(Material material, Query query) {
+ IPage pages = materialService.page(Condition.getPage(query), Condition.getQueryWrapper(material));
+ return R.data(pages);
+ }
+
+ /**
+ * 自定义分页 物资
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入material")
+ public R> page(MaterialVO material, Query query) {
+ IPage pages = materialService.selectMaterialPage(Condition.getPage(query), material);
+ return R.data(pages);
+ }
+
+ /**
+ * 新增 物资
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入material")
+ public R save(@Valid @RequestBody Material material) {
+ return R.status(materialService.save(material));
+ }
+
+ /**
+ * 修改 物资
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入material")
+ public R update(@Valid @RequestBody Material material) {
+ return R.status(materialService.updateById(material));
+ }
+
+ /**
+ * 新增或修改 物资
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入material")
+ public R submit(@Valid @RequestBody Material material) {
+ return R.status(materialService.saveOrUpdate(material));
+ }
+
+
+ /**
+ * 删除 物资
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(materialService.deleteLogic(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/controller/OutboundController.java b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
new file mode 100644
index 0000000..45d5a9d
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.energy.modules.spares.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import com.dayu.daf.core.mp.support.Condition;
+import com.dayu.daf.core.mp.support.Query;
+import com.dayu.daf.core.tool.api.R;
+import com.dayu.daf.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.energy.modules.spares.entity.Outbound;
+import org.energy.modules.spares.vo.OutboundVO;
+import org.energy.modules.spares.service.IOutboundService;
+import com.dayu.daf.core.boot.ctrl.DafController;
+
+/**
+ * 出库 控制器
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/outbound")
+@Api(value = "出库", tags = "出库接口")
+public class OutboundController extends DafController {
+
+ private IOutboundService outboundService;
+
+ /**
+ * 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入outbound")
+ public R detail(Outbound outbound) {
+ Outbound detail = outboundService.getOne(Condition.getQueryWrapper(outbound));
+ return R.data(detail);
+ }
+
+ /**
+ * 分页 出库
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入outbound")
+ public R> list(Outbound outbound, Query query) {
+ IPage pages = outboundService.page(Condition.getPage(query), Condition.getQueryWrapper(outbound));
+ return R.data(pages);
+ }
+
+ /**
+ * 自定义分页 出库
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入outbound")
+ public R> page(OutboundVO outbound, Query query) {
+ IPage pages = outboundService.selectOutboundPage(Condition.getPage(query), outbound);
+ return R.data(pages);
+ }
+
+ /**
+ * 新增 出库
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入outbound")
+ public R save(@Valid @RequestBody Outbound outbound) {
+ return R.status(outboundService.save(outbound));
+ }
+
+ /**
+ * 修改 出库
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入outbound")
+ public R update(@Valid @RequestBody Outbound outbound) {
+ return R.status(outboundService.updateById(outbound));
+ }
+
+ /**
+ * 新增或修改 出库
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入outbound")
+ public R submit(@Valid @RequestBody Outbound outbound) {
+ return R.status(outboundService.saveOrUpdate(outbound));
+ }
+
+
+ /**
+ * 删除 出库
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(outboundService.deleteLogic(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/dto/InboundDTO.java b/src/main/java/org/energy/modules/spares/dto/InboundDTO.java
new file mode 100644
index 0000000..c2f0909
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/dto/InboundDTO.java
@@ -0,0 +1,18 @@
+package org.energy.modules.spares.dto;
+
+import org.energy.modules.spares.entity.Inbound;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 入库数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class InboundDTO extends Inbound {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/dto/MaterialClassCodeDTO.java b/src/main/java/org/energy/modules/spares/dto/MaterialClassCodeDTO.java
new file mode 100644
index 0000000..aba2274
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/dto/MaterialClassCodeDTO.java
@@ -0,0 +1,18 @@
+package org.energy.modules.spares.dto;
+
+import org.energy.modules.spares.entity.MaterialClassCode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物资分类码数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialClassCodeDTO extends MaterialClassCode {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/dto/MaterialDTO.java b/src/main/java/org/energy/modules/spares/dto/MaterialDTO.java
new file mode 100644
index 0000000..5255dbe
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/dto/MaterialDTO.java
@@ -0,0 +1,18 @@
+package org.energy.modules.spares.dto;
+
+import org.energy.modules.spares.entity.Material;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 物资数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MaterialDTO extends Material {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/dto/OutboundDTO.java b/src/main/java/org/energy/modules/spares/dto/OutboundDTO.java
new file mode 100644
index 0000000..73adb2e
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/dto/OutboundDTO.java
@@ -0,0 +1,18 @@
+package org.energy.modules.spares.dto;
+
+import org.energy.modules.spares.entity.Outbound;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 出库数据传输对象实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OutboundDTO extends Outbound {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/entity/Inbound.java b/src/main/java/org/energy/modules/spares/entity/Inbound.java
new file mode 100644
index 0000000..f0d20b0
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/entity/Inbound.java
@@ -0,0 +1,67 @@
+package org.energy.modules.spares.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 入库实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@TableName("s_inbound")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Inbound对象", description = "入库")
+public class Inbound extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long id;
+ /**
+ * 物资编号
+ */
+ @ApiModelProperty(value = "物资编号")
+ private String materialNo;
+ /**
+ * 入库编号
+ */
+ @ApiModelProperty(value = "入库编号")
+ private String inboundNo;
+ /**
+ * 入库时间
+ */
+ @ApiModelProperty(value = "入库时间")
+ private String inboundTime;
+ /**
+ * 入库申领人
+ */
+ @ApiModelProperty(value = "入库申领人")
+ private String inboundClaimants;
+ /**
+ * 入库经办人
+ */
+ @ApiModelProperty(value = "入库经办人")
+ private String inboundManager;
+ /**
+ * 入库数量
+ */
+ @ApiModelProperty(value = "入库数量")
+ private Long inboundCount;
+ /**
+ * 入库审核状态
+ */
+ @ApiModelProperty(value = "入库审核状态")
+ private Long istatus;
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/entity/Material.java b/src/main/java/org/energy/modules/spares/entity/Material.java
new file mode 100644
index 0000000..6ef83c9
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/entity/Material.java
@@ -0,0 +1,82 @@
+package org.energy.modules.spares.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 物资实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@TableName("s_material")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Material对象", description = "物资")
+public class Material extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long id;
+ /**
+ * 物资编号
+ */
+ @ApiModelProperty(value = "物资编号")
+ private String materialNo;
+ /**
+ * 物资名称
+ */
+ @ApiModelProperty(value = "物资名称")
+ private String materialName;
+ /**
+ * 物资分类码
+ */
+ @ApiModelProperty(value = "物资分类码")
+ private String materialClassCode;
+ /**
+ * 规格型号
+ */
+ @ApiModelProperty(value = "规格型号")
+ private String model;
+ /**
+ * 制造商名称
+ */
+ @ApiModelProperty(value = "制造商名称")
+ private String manufacturerName;
+ /**
+ * 供应商名称
+ */
+ @ApiModelProperty(value = "供应商名称")
+ private String sipplierName;
+ /**
+ * 所属仓库
+ */
+ @ApiModelProperty(value = "所属仓库")
+ private String warehouse;
+ /**
+ * 库存数量
+ */
+ @ApiModelProperty(value = "库存数量")
+ private Long inventoryCount;
+ /**
+ * 物资描述
+ */
+ @ApiModelProperty(value = "物资描述")
+ private String materialDescription;
+ /**
+ * 审核状态
+ */
+ @ApiModelProperty(value = "审核状态")
+ private Long istatus;
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/entity/MaterialClassCode.java b/src/main/java/org/energy/modules/spares/entity/MaterialClassCode.java
new file mode 100644
index 0000000..4ed0d4f
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/entity/MaterialClassCode.java
@@ -0,0 +1,42 @@
+package org.energy.modules.spares.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 物资分类码实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@TableName("s_material_class_code")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MaterialClassCode对象", description = "物资分类码")
+public class MaterialClassCode extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分类码编号
+ */
+ @ApiModelProperty(value = "分类码编号")
+ private Long id;
+ /**
+ * 物资类型
+ */
+ @ApiModelProperty(value = "物资类型")
+ private String materialType;
+ /**
+ * 物资分类码
+ */
+ @ApiModelProperty(value = "物资分类码")
+ private String materialClassCode;
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/entity/Outbound.java b/src/main/java/org/energy/modules/spares/entity/Outbound.java
new file mode 100644
index 0000000..cfea945
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/entity/Outbound.java
@@ -0,0 +1,67 @@
+package org.energy.modules.spares.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dayu.daf.core.mp.base.BaseEntity;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 出库实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@TableName("s_outbound")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Outbound对象", description = "出库")
+public class Outbound extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ private Long id;
+ /**
+ * 物资编号
+ */
+ @ApiModelProperty(value = "物资编号")
+ private String materialNo;
+ /**
+ * 出库编号
+ */
+ @ApiModelProperty(value = "出库编号")
+ private String outboundNo;
+ /**
+ * 出库时间
+ */
+ @ApiModelProperty(value = "出库时间")
+ private String outboundTime;
+ /**
+ * 出库申领人
+ */
+ @ApiModelProperty(value = "出库申领人")
+ private String outboundClaimants;
+ /**
+ * 出库经办人
+ */
+ @ApiModelProperty(value = "出库经办人")
+ private String outboundManager;
+ /**
+ * 出库数量
+ */
+ @ApiModelProperty(value = "出库数量")
+ private Long outboundCount;
+ /**
+ * 出库审核状态
+ */
+ @ApiModelProperty(value = "出库审核状态")
+ private Long istatus;
+
+
+}
diff --git a/src/main/java/org/energy/modules/spares/mapper/InboundMapper.java b/src/main/java/org/energy/modules/spares/mapper/InboundMapper.java
new file mode 100644
index 0000000..582f04a
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/InboundMapper.java
@@ -0,0 +1,26 @@
+package org.energy.modules.spares.mapper;
+
+import org.energy.modules.spares.entity.Inbound;
+import org.energy.modules.spares.vo.InboundVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 入库 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface InboundMapper extends BaseMapper {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param inbound
+ * @return
+ */
+ List selectInboundPage(IPage page, InboundVO inbound);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/mapper/InboundMapper.xml b/src/main/java/org/energy/modules/spares/mapper/InboundMapper.xml
new file mode 100644
index 0000000..1dde980
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/InboundMapper.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+ select * from s_inbound where is_deleted = 0
+
+
+
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java
new file mode 100644
index 0000000..290dda2
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java
@@ -0,0 +1,26 @@
+package org.energy.modules.spares.mapper;
+
+import org.energy.modules.spares.entity.MaterialClassCode;
+import org.energy.modules.spares.vo.MaterialClassCodeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 物资分类码 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface MaterialClassCodeMapper extends BaseMapper {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param materialClassCode
+ * @return
+ */
+ List selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml
new file mode 100644
index 0000000..9a74954
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+ select * from s_material_class_code where is_deleted = 0
+
+
+
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java
new file mode 100644
index 0000000..888e632
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java
@@ -0,0 +1,26 @@
+package org.energy.modules.spares.mapper;
+
+import org.energy.modules.spares.entity.Material;
+import org.energy.modules.spares.vo.MaterialVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 物资 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface MaterialMapper extends BaseMapper {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param material
+ * @return
+ */
+ List selectMaterialPage(IPage page, MaterialVO material);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
new file mode 100644
index 0000000..5274c47
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+ select * from s_material where is_deleted = 0
+
+
+
diff --git a/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java
new file mode 100644
index 0000000..d9a5d3b
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java
@@ -0,0 +1,26 @@
+package org.energy.modules.spares.mapper;
+
+import org.energy.modules.spares.entity.Outbound;
+import org.energy.modules.spares.vo.OutboundVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 出库 Mapper 接口
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface OutboundMapper extends BaseMapper {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param outbound
+ * @return
+ */
+ List selectOutboundPage(IPage page, OutboundVO outbound);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml
new file mode 100644
index 0000000..b1f5680
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+ select * from s_outbound where is_deleted = 0
+
+
+
diff --git a/src/main/java/org/energy/modules/spares/service/IInboundService.java b/src/main/java/org/energy/modules/spares/service/IInboundService.java
new file mode 100644
index 0000000..1a6a4d8
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/IInboundService.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service;
+
+import org.energy.modules.spares.entity.Inbound;
+import org.energy.modules.spares.vo.InboundVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 入库 服务类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface IInboundService extends BaseService {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param inbound
+ * @return
+ */
+ IPage selectInboundPage(IPage page, InboundVO inbound);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java b/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java
new file mode 100644
index 0000000..9ab8c24
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service;
+
+import org.energy.modules.spares.entity.MaterialClassCode;
+import org.energy.modules.spares.vo.MaterialClassCodeVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 物资分类码 服务类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface IMaterialClassCodeService extends BaseService {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param materialClassCode
+ * @return
+ */
+ IPage selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/IMaterialService.java b/src/main/java/org/energy/modules/spares/service/IMaterialService.java
new file mode 100644
index 0000000..710b073
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/IMaterialService.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service;
+
+import org.energy.modules.spares.entity.Material;
+import org.energy.modules.spares.vo.MaterialVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 物资 服务类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface IMaterialService extends BaseService {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param material
+ * @return
+ */
+ IPage selectMaterialPage(IPage page, MaterialVO material);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/IOutboundService.java b/src/main/java/org/energy/modules/spares/service/IOutboundService.java
new file mode 100644
index 0000000..4790ea1
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/IOutboundService.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service;
+
+import org.energy.modules.spares.entity.Outbound;
+import org.energy.modules.spares.vo.OutboundVO;
+import com.dayu.daf.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 出库 服务类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+public interface IOutboundService extends BaseService {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param outbound
+ * @return
+ */
+ IPage selectOutboundPage(IPage page, OutboundVO outbound);
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/impl/InboundServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/InboundServiceImpl.java
new file mode 100644
index 0000000..5ac96b0
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/impl/InboundServiceImpl.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service.impl;
+
+import org.energy.modules.spares.entity.Inbound;
+import org.energy.modules.spares.vo.InboundVO;
+import org.energy.modules.spares.mapper.InboundMapper;
+import org.energy.modules.spares.service.IInboundService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 入库 服务实现类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Service
+public class InboundServiceImpl extends BaseServiceImpl implements IInboundService {
+
+ @Override
+ public IPage selectInboundPage(IPage page, InboundVO inbound) {
+ return page.setRecords(baseMapper.selectInboundPage(page, inbound));
+ }
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java
new file mode 100644
index 0000000..1368cce
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service.impl;
+
+import org.energy.modules.spares.entity.MaterialClassCode;
+import org.energy.modules.spares.vo.MaterialClassCodeVO;
+import org.energy.modules.spares.mapper.MaterialClassCodeMapper;
+import org.energy.modules.spares.service.IMaterialClassCodeService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 物资分类码 服务实现类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Service
+public class MaterialClassCodeServiceImpl extends BaseServiceImpl implements IMaterialClassCodeService {
+
+ @Override
+ public IPage selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode) {
+ return page.setRecords(baseMapper.selectMaterialClassCodePage(page, materialClassCode));
+ }
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java
new file mode 100644
index 0000000..d806eec
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service.impl;
+
+import org.energy.modules.spares.entity.Material;
+import org.energy.modules.spares.vo.MaterialVO;
+import org.energy.modules.spares.mapper.MaterialMapper;
+import org.energy.modules.spares.service.IMaterialService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 物资 服务实现类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Service
+public class MaterialServiceImpl extends BaseServiceImpl implements IMaterialService {
+
+ @Override
+ public IPage selectMaterialPage(IPage page, MaterialVO material) {
+ return page.setRecords(baseMapper.selectMaterialPage(page, material));
+ }
+
+}
diff --git a/src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java b/src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java
new file mode 100644
index 0000000..cf4db80
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java
@@ -0,0 +1,25 @@
+package org.energy.modules.spares.service.impl;
+
+import org.energy.modules.spares.entity.Outbound;
+import org.energy.modules.spares.vo.OutboundVO;
+import org.energy.modules.spares.mapper.OutboundMapper;
+import org.energy.modules.spares.service.IOutboundService;
+import com.dayu.daf.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 出库 服务实现类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Service
+public class OutboundServiceImpl extends BaseServiceImpl implements IOutboundService {
+
+ @Override
+ public IPage selectOutboundPage(IPage page, OutboundVO outbound) {
+ return page.setRecords(baseMapper.selectOutboundPage(page, outbound));
+ }
+
+}
diff --git a/src/main/java/org/energy/modules/spares/vo/InboundVO.java b/src/main/java/org/energy/modules/spares/vo/InboundVO.java
new file mode 100644
index 0000000..29b59bf
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/vo/InboundVO.java
@@ -0,0 +1,20 @@
+package org.energy.modules.spares.vo;
+
+import org.energy.modules.spares.entity.Inbound;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 入库视图实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "InboundVO对象", description = "入库")
+public class InboundVO extends Inbound {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/vo/MaterialClassCodeVO.java b/src/main/java/org/energy/modules/spares/vo/MaterialClassCodeVO.java
new file mode 100644
index 0000000..f8660df
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/vo/MaterialClassCodeVO.java
@@ -0,0 +1,20 @@
+package org.energy.modules.spares.vo;
+
+import org.energy.modules.spares.entity.MaterialClassCode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 物资分类码视图实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MaterialClassCodeVO对象", description = "物资分类码")
+public class MaterialClassCodeVO extends MaterialClassCode {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/vo/MaterialVO.java b/src/main/java/org/energy/modules/spares/vo/MaterialVO.java
new file mode 100644
index 0000000..169afa8
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/vo/MaterialVO.java
@@ -0,0 +1,20 @@
+package org.energy.modules.spares.vo;
+
+import org.energy.modules.spares.entity.Material;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 物资视图实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MaterialVO对象", description = "物资")
+public class MaterialVO extends Material {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/energy/modules/spares/vo/OutboundVO.java b/src/main/java/org/energy/modules/spares/vo/OutboundVO.java
new file mode 100644
index 0000000..7669305
--- /dev/null
+++ b/src/main/java/org/energy/modules/spares/vo/OutboundVO.java
@@ -0,0 +1,20 @@
+package org.energy.modules.spares.vo;
+
+import org.energy.modules.spares.entity.Outbound;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 出库视图实体类
+ *
+ * @author Daf
+ * @since 2024-07-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "OutboundVO对象", description = "出库")
+public class OutboundVO extends Outbound {
+ private static final long serialVersionUID = 1L;
+
+}
From d9254451d7d2897a9d64286aa8099c00dd2b50b0 Mon Sep 17 00:00:00 2001
From: yangzhicheng
Date: Mon, 15 Jul 2024 10:48:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=97=E5=AE=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../energy/modules/inspection/excel/InspectionPlanExcel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java
index 9543508..5e6b038 100644
--- a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java
+++ b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java
@@ -58,11 +58,11 @@ public class InspectionPlanExcel implements Serializable {
@ExcelProperty(value = "周期值")
private String periodValue;
- @ColumnWidth(15)
+ @ColumnWidth(20)
@ExcelProperty(value = "计划起始时间")
private String startTime;
- @ColumnWidth(15)
+ @ColumnWidth(20)
@ExcelProperty(value = "计划终了时间")
private String endTime;
From 130d780570cc44f33b41d477b4cdf049ed9e2c63 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Mon, 15 Jul 2024 11:07:02 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=87=E4=BB=B6=20=E7=89=A9=E8=B5=84=20?=
=?UTF-8?q?=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../energy/modules/spares/controller/InboundController.java | 6 +++---
.../spares/controller/MaterialClassCodeController.java | 6 +++---
.../modules/spares/controller/MaterialController.java | 6 +++---
.../modules/spares/controller/OutboundController.java | 6 +++---
.../java/org/energy/modules/spares/entity/Material.java | 5 +++++
.../org/energy/modules/spares/mapper/MaterialMapper.xml | 1 +
6 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/energy/modules/spares/controller/InboundController.java b/src/main/java/org/energy/modules/spares/controller/InboundController.java
index e7a85f9..df44316 100644
--- a/src/main/java/org/energy/modules/spares/controller/InboundController.java
+++ b/src/main/java/org/energy/modules/spares/controller/InboundController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
*/
@RestController
@AllArgsConstructor
-@RequestMapping("/inbound")
+@RequestMapping("/spares//inbound")
@Api(value = "入库", tags = "入库接口")
public class InboundController extends DafController {
@@ -111,7 +111,7 @@ public class InboundController extends DafController {
return R.status(inboundService.saveOrUpdate(inbound));
}
-
+
/**
* 删除 入库
*/
@@ -122,5 +122,5 @@ public class InboundController extends DafController {
return R.status(inboundService.deleteLogic(Func.toLongList(ids)));
}
-
+
}
diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
index dc059be..8d6db1a 100644
--- a/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
+++ b/src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
*/
@RestController
@AllArgsConstructor
-@RequestMapping("/materialclasscode")
+@RequestMapping("/spares//materialclasscode")
@Api(value = "物资分类码", tags = "物资分类码接口")
public class MaterialClassCodeController extends DafController {
@@ -111,7 +111,7 @@ public class MaterialClassCodeController extends DafController {
return R.status(materialClassCodeService.saveOrUpdate(materialClassCode));
}
-
+
/**
* 删除 物资分类码
*/
@@ -122,5 +122,5 @@ public class MaterialClassCodeController extends DafController {
return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids)));
}
-
+
}
diff --git a/src/main/java/org/energy/modules/spares/controller/MaterialController.java b/src/main/java/org/energy/modules/spares/controller/MaterialController.java
index b05bd03..2d86a86 100644
--- a/src/main/java/org/energy/modules/spares/controller/MaterialController.java
+++ b/src/main/java/org/energy/modules/spares/controller/MaterialController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
*/
@RestController
@AllArgsConstructor
-@RequestMapping("/material")
+@RequestMapping("/spares//material")
@Api(value = "物资", tags = "物资接口")
public class MaterialController extends DafController {
@@ -111,7 +111,7 @@ public class MaterialController extends DafController {
return R.status(materialService.saveOrUpdate(material));
}
-
+
/**
* 删除 物资
*/
@@ -122,5 +122,5 @@ public class MaterialController extends DafController {
return R.status(materialService.deleteLogic(Func.toLongList(ids)));
}
-
+
}
diff --git a/src/main/java/org/energy/modules/spares/controller/OutboundController.java b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
index 45d5a9d..36e9c91 100644
--- a/src/main/java/org/energy/modules/spares/controller/OutboundController.java
+++ b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
@@ -42,7 +42,7 @@ import com.dayu.daf.core.boot.ctrl.DafController;
*/
@RestController
@AllArgsConstructor
-@RequestMapping("/outbound")
+@RequestMapping("/spares//outbound")
@Api(value = "出库", tags = "出库接口")
public class OutboundController extends DafController {
@@ -111,7 +111,7 @@ public class OutboundController extends DafController {
return R.status(outboundService.saveOrUpdate(outbound));
}
-
+
/**
* 删除 出库
*/
@@ -122,5 +122,5 @@ public class OutboundController extends DafController {
return R.status(outboundService.deleteLogic(Func.toLongList(ids)));
}
-
+
}
diff --git a/src/main/java/org/energy/modules/spares/entity/Material.java b/src/main/java/org/energy/modules/spares/entity/Material.java
index 6ef83c9..efb1439 100644
--- a/src/main/java/org/energy/modules/spares/entity/Material.java
+++ b/src/main/java/org/energy/modules/spares/entity/Material.java
@@ -72,6 +72,11 @@ public class Material extends BaseEntity {
*/
@ApiModelProperty(value = "物资描述")
private String materialDescription;
+ /**
+ * 场站
+ */
+ @ApiModelProperty(value = "场站")
+ private Long station;
/**
* 审核状态
*/
diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
index 5274c47..81fc633 100644
--- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
@@ -20,6 +20,7 @@
{
*/
List selectOperationItemPage(IPage page, OperationItemVO operationItem);
+ String getMaxOperationItemNo(String operationTicketNo);
}
diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml b/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml
index a4ff04e..d5d4de1 100644
--- a/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml
+++ b/src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml
@@ -20,8 +20,14 @@
+
select * from smt_operation_item where is_deleted = 0
+
+ SELECT max(operation_item_no)
+ FROM smt_operation_item where operation_ticket_no like ${date}
+
+
diff --git a/src/main/java/org/energy/modules/smart/service/IOperationItemService.java b/src/main/java/org/energy/modules/smart/service/IOperationItemService.java
index f15f9e2..a3211c4 100644
--- a/src/main/java/org/energy/modules/smart/service/IOperationItemService.java
+++ b/src/main/java/org/energy/modules/smart/service/IOperationItemService.java
@@ -22,4 +22,5 @@ public interface IOperationItemService extends BaseService {
*/
IPage selectOperationItemPage(IPage page, OperationItemVO operationItem);
+ String getMaxOperationItemNo(String operationTicketNo);
}
diff --git a/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java
index dab5b74..eb2ec92 100644
--- a/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java
+++ b/src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java
@@ -21,5 +21,10 @@ public class OperationItemServiceImpl extends BaseServiceImpl selectOperationItemPage(IPage page, OperationItemVO operationItem) {
return page.setRecords(baseMapper.selectOperationItemPage(page, operationItem));
}
+ @Override
+ public String getMaxOperationItemNo(String operationTicketNo){
+ String operationItemNo = baseMapper.getMaxOperationItemNo(operationTicketNo);
+ return operationItemNo;
+ }
}
From 4d5fa2e924eb8eba4507c70d1d8e07c03545c815 Mon Sep 17 00:00:00 2001
From: yangzhicheng
Date: Mon, 15 Jul 2024 14:50:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=A9=E8=B5=84=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../spares/controller/InboundController.java | 14 ++++++++++++++
.../spares/controller/OutboundController.java | 14 ++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/src/main/java/org/energy/modules/spares/controller/InboundController.java b/src/main/java/org/energy/modules/spares/controller/InboundController.java
index ee7b25d..2911f00 100644
--- a/src/main/java/org/energy/modules/spares/controller/InboundController.java
+++ b/src/main/java/org/energy/modules/spares/controller/InboundController.java
@@ -26,6 +26,7 @@ import com.dayu.daf.core.mp.support.Condition;
import com.dayu.daf.core.mp.support.Query;
import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.leger.entity.TechParameters;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +35,8 @@ import org.energy.modules.spares.vo.InboundVO;
import org.energy.modules.spares.service.IInboundService;
import com.dayu.daf.core.boot.ctrl.DafController;
+import java.util.List;
+
/**
* 入库 控制器
*
@@ -122,5 +125,16 @@ public class InboundController extends DafController {
return R.status(inboundService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 列表 入库详细
+ */
+ @GetMapping("/getList")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "列表", notes = "传入inbound")
+ public R> getList(Inbound inbound) {
+ List list = inboundService.list(Condition.getQueryWrapper(inbound));
+ return R.data(list);
+ }
+
}
diff --git a/src/main/java/org/energy/modules/spares/controller/OutboundController.java b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
index 584030f..f30c8d2 100644
--- a/src/main/java/org/energy/modules/spares/controller/OutboundController.java
+++ b/src/main/java/org/energy/modules/spares/controller/OutboundController.java
@@ -26,6 +26,7 @@ import com.dayu.daf.core.mp.support.Condition;
import com.dayu.daf.core.mp.support.Query;
import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func;
+import org.energy.modules.spares.entity.Inbound;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +35,8 @@ import org.energy.modules.spares.vo.OutboundVO;
import org.energy.modules.spares.service.IOutboundService;
import com.dayu.daf.core.boot.ctrl.DafController;
+import java.util.List;
+
/**
* 出库 控制器
*
@@ -122,5 +125,16 @@ public class OutboundController extends DafController {
return R.status(outboundService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 列表 出库详细
+ */
+ @GetMapping("/getList")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "列表", notes = "传入outbound")
+ public R> getList(Outbound outbound) {
+ List list = outboundService.list(Condition.getQueryWrapper(outbound));
+ return R.data(list);
+ }
+
}