Merge remote-tracking branch 'origin/main'

main
liuyiliang 12 months ago
commit dc5eae3a5c
  1. 4
      src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java
  2. 12
      src/main/java/org/energy/modules/smart/controller/OperationItemController.java
  3. 1
      src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.java
  4. 6
      src/main/java/org/energy/modules/smart/mapper/OperationItemMapper.xml
  5. 1
      src/main/java/org/energy/modules/smart/service/IOperationItemService.java
  6. 5
      src/main/java/org/energy/modules/smart/service/impl/OperationItemServiceImpl.java
  7. 140
      src/main/java/org/energy/modules/spares/controller/InboundController.java
  8. 126
      src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
  9. 126
      src/main/java/org/energy/modules/spares/controller/MaterialController.java
  10. 140
      src/main/java/org/energy/modules/spares/controller/OutboundController.java
  11. 18
      src/main/java/org/energy/modules/spares/dto/InboundDTO.java
  12. 18
      src/main/java/org/energy/modules/spares/dto/MaterialClassCodeDTO.java
  13. 18
      src/main/java/org/energy/modules/spares/dto/MaterialDTO.java
  14. 18
      src/main/java/org/energy/modules/spares/dto/OutboundDTO.java
  15. 67
      src/main/java/org/energy/modules/spares/entity/Inbound.java
  16. 87
      src/main/java/org/energy/modules/spares/entity/Material.java
  17. 42
      src/main/java/org/energy/modules/spares/entity/MaterialClassCode.java
  18. 67
      src/main/java/org/energy/modules/spares/entity/Outbound.java
  19. 26
      src/main/java/org/energy/modules/spares/mapper/InboundMapper.java
  20. 28
      src/main/java/org/energy/modules/spares/mapper/InboundMapper.xml
  21. 26
      src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java
  22. 23
      src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml
  23. 26
      src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java
  24. 32
      src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
  25. 26
      src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java
  26. 28
      src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml
  27. 25
      src/main/java/org/energy/modules/spares/service/IInboundService.java
  28. 25
      src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java
  29. 25
      src/main/java/org/energy/modules/spares/service/IMaterialService.java
  30. 25
      src/main/java/org/energy/modules/spares/service/IOutboundService.java
  31. 25
      src/main/java/org/energy/modules/spares/service/impl/InboundServiceImpl.java
  32. 25
      src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java
  33. 25
      src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java
  34. 25
      src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java
  35. 20
      src/main/java/org/energy/modules/spares/vo/InboundVO.java
  36. 20
      src/main/java/org/energy/modules/spares/vo/MaterialClassCodeVO.java
  37. 20
      src/main/java/org/energy/modules/spares/vo/MaterialVO.java
  38. 20
      src/main/java/org/energy/modules/spares/vo/OutboundVO.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;

@ -114,6 +114,18 @@ public class OperationItemController extends DafController {
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入operationItem")
public R submit(@Valid @RequestBody OperationItem operationItem) {
String perationItemNo = operationItem.getOperationTicketNo()+"XM";
String maxOperationItemNo =
operationItemService.getMaxOperationItemNo("'"+operationItem.getOperationTicketNo()+"'");
int number;
if (StringUtil.isNotEmpty(maxOperationItemNo)){
number = Integer.parseInt(maxOperationItemNo.substring(maxOperationItemNo.length()-4));
number++;
}else{
number = 1;
}
String numFormat = String.format("%04d", number);
operationItem.setOperationItemNo(perationItemNo+numFormat);
return R.status(operationItemService.saveOrUpdate(operationItem));
}

@ -23,4 +23,5 @@ public interface OperationItemMapper extends BaseMapper<OperationItem> {
*/
List<OperationItemVO> selectOperationItemPage(IPage page, OperationItemVO operationItem);
String getMaxOperationItemNo(String operationTicketNo);
}

@ -20,8 +20,14 @@
</resultMap>
<select id="selectOperationItemPage" resultMap="operationItemResultMap">
select * from smt_operation_item where is_deleted = 0
</select>
<select id="getMaxOperationItemNo" resultType="java.lang.String">
SELECT max(operation_item_no)
FROM smt_operation_item where operation_ticket_no like ${date}
</select>
</mapper>

@ -22,4 +22,5 @@ public interface IOperationItemService extends BaseService<OperationItem> {
*/
IPage<OperationItemVO> selectOperationItemPage(IPage<OperationItemVO> page, OperationItemVO operationItem);
String getMaxOperationItemNo(String operationTicketNo);
}

@ -21,5 +21,10 @@ public class OperationItemServiceImpl extends BaseServiceImpl<OperationItemMappe
public IPage<OperationItemVO> selectOperationItemPage(IPage<OperationItemVO> page, OperationItemVO operationItem) {
return page.setRecords(baseMapper.selectOperationItemPage(page, operationItem));
}
@Override
public String getMaxOperationItemNo(String operationTicketNo){
String operationItemNo = baseMapper.getMaxOperationItemNo(operationTicketNo);
return operationItemNo;
}
}

@ -0,0 +1,140 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* 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
* <p>
* http://www.gnu.org/licenses/lgpl.html
* <p>
* 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.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;
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;
import java.util.List;
/**
* 入库 控制器
*
* @author Daf
* @since 2024-07-15
*/
@RestController
@AllArgsConstructor
@RequestMapping("/spares/inbound")
@Api(value = "入库", tags = "入库接口")
public class InboundController extends DafController {
private IInboundService inboundService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入inbound")
public R<Inbound> 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<IPage<Inbound>> list(Inbound inbound, Query query) {
IPage<Inbound> pages = inboundService.page(Condition.getPage(query), Condition.getQueryWrapper(inbound));
return R.data(pages);
}
/**
* 自定义分页 入库
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入inbound")
public R<IPage<InboundVO>> page(InboundVO inbound, Query query) {
IPage<InboundVO> 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)));
}
/**
* 列表 入库详细
*/
@GetMapping("/getList")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "列表", notes = "传入inbound")
public R<List<Inbound>> getList(Inbound inbound) {
List<Inbound> list = inboundService.list(Condition.getQueryWrapper(inbound));
return R.data(list);
}
}

@ -0,0 +1,126 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* 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
* <p>
* http://www.gnu.org/licenses/lgpl.html
* <p>
* 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("/spares/materialclasscode")
@Api(value = "物资分类码", tags = "物资分类码接口")
public class MaterialClassCodeController extends DafController {
private IMaterialClassCodeService materialClassCodeService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入materialClassCode")
public R<MaterialClassCode> 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<IPage<MaterialClassCode>> list(MaterialClassCode materialClassCode, Query query) {
IPage<MaterialClassCode> pages = materialClassCodeService.page(Condition.getPage(query), Condition.getQueryWrapper(materialClassCode));
return R.data(pages);
}
/**
* 自定义分页 物资分类码
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入materialClassCode")
public R<IPage<MaterialClassCodeVO>> page(MaterialClassCodeVO materialClassCode, Query query) {
IPage<MaterialClassCodeVO> 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)));
}
}

@ -0,0 +1,126 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* 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
* <p>
* http://www.gnu.org/licenses/lgpl.html
* <p>
* 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("/spares/material")
@Api(value = "物资", tags = "物资接口")
public class MaterialController extends DafController {
private IMaterialService materialService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入material")
public R<Material> 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<IPage<Material>> list(Material material, Query query) {
IPage<Material> pages = materialService.page(Condition.getPage(query), Condition.getQueryWrapper(material));
return R.data(pages);
}
/**
* 自定义分页 物资
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入material")
public R<IPage<MaterialVO>> page(MaterialVO material, Query query) {
IPage<MaterialVO> 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)));
}
}

@ -0,0 +1,140 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* 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
* <p>
* http://www.gnu.org/licenses/lgpl.html
* <p>
* 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.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;
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;
import java.util.List;
/**
* 出库 控制器
*
* @author Daf
* @since 2024-07-15
*/
@RestController
@AllArgsConstructor
@RequestMapping("/spares/outbound")
@Api(value = "出库", tags = "出库接口")
public class OutboundController extends DafController {
private IOutboundService outboundService;
/**
* 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入outbound")
public R<Outbound> 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<IPage<Outbound>> list(Outbound outbound, Query query) {
IPage<Outbound> pages = outboundService.page(Condition.getPage(query), Condition.getQueryWrapper(outbound));
return R.data(pages);
}
/**
* 自定义分页 出库
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入outbound")
public R<IPage<OutboundVO>> page(OutboundVO outbound, Query query) {
IPage<OutboundVO> 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)));
}
/**
* 列表 出库详细
*/
@GetMapping("/getList")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "列表", notes = "传入outbound")
public R<List<Outbound>> getList(Outbound outbound) {
List<Outbound> list = outboundService.list(Condition.getQueryWrapper(outbound));
return R.data(list);
}
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -0,0 +1,87 @@
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 station;
/**
* 审核状态
*/
@ApiModelProperty(value = "审核状态")
private Long istatus;
}

@ -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;
}

@ -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;
}

@ -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<Inbound> {
/**
* 自定义分页
*
* @param page
* @param inbound
* @return
*/
List<InboundVO> selectInboundPage(IPage page, InboundVO inbound);
}

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.energy.modules.spares.mapper.InboundMapper">
<!-- 通用查询映射结果 -->
<resultMap id="inboundResultMap" type="org.energy.modules.spares.entity.Inbound">
<id column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="status" property="status"/>
<result column="material_no" property="materialNo"/>
<result column="inbound_no" property="inboundNo"/>
<result column="inbound_time" property="inboundTime"/>
<result column="inbound_claimants" property="inboundClaimants"/>
<result column="inbound_manager" property="inboundManager"/>
<result column="inbound_count" property="inboundCount"/>
<result column="istatus" property="istatus"/>
</resultMap>
<select id="selectInboundPage" resultMap="inboundResultMap">
select * from s_inbound where is_deleted = 0
</select>
</mapper>

@ -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<MaterialClassCode> {
/**
* 自定义分页
*
* @param page
* @param materialClassCode
* @return
*/
List<MaterialClassCodeVO> selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode);
}

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.energy.modules.spares.mapper.MaterialClassCodeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="materialClassCodeResultMap" type="org.energy.modules.spares.entity.MaterialClassCode">
<id column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="status" property="status"/>
<result column="material_type" property="materialType"/>
<result column="material_class_code" property="materialClassCode"/>
</resultMap>
<select id="selectMaterialClassCodePage" resultMap="materialClassCodeResultMap">
select * from s_material_class_code where is_deleted = 0
</select>
</mapper>

@ -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<Material> {
/**
* 自定义分页
*
* @param page
* @param material
* @return
*/
List<MaterialVO> selectMaterialPage(IPage page, MaterialVO material);
}

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.energy.modules.spares.mapper.MaterialMapper">
<!-- 通用查询映射结果 -->
<resultMap id="materialResultMap" type="org.energy.modules.spares.entity.Material">
<id column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="status" property="status"/>
<result column="material_no" property="materialNo"/>
<result column="material_name" property="materialName"/>
<result column="material_class_code" property="materialClassCode"/>
<result column="model" property="model"/>
<result column="manufacturer_name" property="manufacturerName"/>
<result column="sipplier_name" property="sipplierName"/>
<result column="warehouse" property="warehouse"/>
<result column="inventory_count" property="inventoryCount"/>
<result column="material_description" property="materialDescription"/>
<result column="station" property="station"/>
<result column="istatus" property="istatus"/>
</resultMap>
<select id="selectMaterialPage" resultMap="materialResultMap">
select * from s_material where is_deleted = 0
</select>
</mapper>

@ -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<Outbound> {
/**
* 自定义分页
*
* @param page
* @param outbound
* @return
*/
List<OutboundVO> selectOutboundPage(IPage page, OutboundVO outbound);
}

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.energy.modules.spares.mapper.OutboundMapper">
<!-- 通用查询映射结果 -->
<resultMap id="outboundResultMap" type="org.energy.modules.spares.entity.Outbound">
<id column="id" property="id"/>
<result column="create_time" property="createTime"/>
<result column="create_user" property="createUser"/>
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="is_deleted" property="isDeleted"/>
<result column="status" property="status"/>
<result column="material_no" property="materialNo"/>
<result column="outbound_no" property="outboundNo"/>
<result column="outbound_time" property="outboundTime"/>
<result column="outbound_claimants" property="outboundClaimants"/>
<result column="outbound_manager" property="outboundManager"/>
<result column="outbound_count" property="outboundCount"/>
<result column="istatus" property="istatus"/>
</resultMap>
<select id="selectOutboundPage" resultMap="outboundResultMap">
select * from s_outbound where is_deleted = 0
</select>
</mapper>

@ -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<Inbound> {
/**
* 自定义分页
*
* @param page
* @param inbound
* @return
*/
IPage<InboundVO> selectInboundPage(IPage<InboundVO> page, InboundVO inbound);
}

@ -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<MaterialClassCode> {
/**
* 自定义分页
*
* @param page
* @param materialClassCode
* @return
*/
IPage<MaterialClassCodeVO> selectMaterialClassCodePage(IPage<MaterialClassCodeVO> page, MaterialClassCodeVO materialClassCode);
}

@ -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<Material> {
/**
* 自定义分页
*
* @param page
* @param material
* @return
*/
IPage<MaterialVO> selectMaterialPage(IPage<MaterialVO> page, MaterialVO material);
}

@ -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<Outbound> {
/**
* 自定义分页
*
* @param page
* @param outbound
* @return
*/
IPage<OutboundVO> selectOutboundPage(IPage<OutboundVO> page, OutboundVO outbound);
}

@ -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<InboundMapper, Inbound> implements IInboundService {
@Override
public IPage<InboundVO> selectInboundPage(IPage<InboundVO> page, InboundVO inbound) {
return page.setRecords(baseMapper.selectInboundPage(page, inbound));
}
}

@ -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<MaterialClassCodeMapper, MaterialClassCode> implements IMaterialClassCodeService {
@Override
public IPage<MaterialClassCodeVO> selectMaterialClassCodePage(IPage<MaterialClassCodeVO> page, MaterialClassCodeVO materialClassCode) {
return page.setRecords(baseMapper.selectMaterialClassCodePage(page, materialClassCode));
}
}

@ -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<MaterialMapper, Material> implements IMaterialService {
@Override
public IPage<MaterialVO> selectMaterialPage(IPage<MaterialVO> page, MaterialVO material) {
return page.setRecords(baseMapper.selectMaterialPage(page, material));
}
}

@ -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<OutboundMapper, Outbound> implements IOutboundService {
@Override
public IPage<OutboundVO> selectOutboundPage(IPage<OutboundVO> page, OutboundVO outbound) {
return page.setRecords(baseMapper.selectOutboundPage(page, outbound));
}
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}
Loading…
Cancel
Save