Merge remote-tracking branch 'origin/main'

main
weitingdong 1 year ago
commit 63fadf2eb9
  1. 5
      src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java
  2. 5
      src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java
  3. 21
      src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java
  4. 4
      src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java
  5. 4
      src/main/java/org/energy/modules/inspection/excel/InspectionRouteExcel.java
  6. 6
      src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml
  7. 6
      src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml
  8. 2
      src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.java
  9. 47
      src/main/java/org/energy/modules/inspection/mapper/InspectionTasksMapper.xml
  10. 7
      src/main/java/org/energy/modules/inspection/service/IInspectionTasksService.java
  11. 4
      src/main/java/org/energy/modules/inspection/service/impl/InspectionTasksServiceImpl.java
  12. 44
      src/main/java/org/energy/modules/smart/controller/OperationTicketController.java
  13. 4
      src/main/java/org/energy/modules/smart/entity/OperationTicket.java
  14. 202
      src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java
  15. 3
      src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java
  16. 41
      src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml
  17. 10
      src/main/java/org/energy/modules/smart/service/IOperationTicketService.java
  18. 8
      src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java
  19. 6
      src/main/java/org/energy/modules/spares/controller/InboundController.java
  20. 22
      src/main/java/org/energy/modules/spares/controller/ManufacturerInfoController.java
  21. 13
      src/main/java/org/energy/modules/spares/controller/MaterialClassCodeController.java
  22. 23
      src/main/java/org/energy/modules/spares/controller/MaterialController.java
  23. 26
      src/main/java/org/energy/modules/spares/controller/OutboundController.java
  24. 22
      src/main/java/org/energy/modules/spares/controller/SupplierInfoController.java
  25. 12
      src/main/java/org/energy/modules/spares/controller/WarehouseController.java
  26. 4
      src/main/java/org/energy/modules/spares/entity/Inbound.java
  27. 2
      src/main/java/org/energy/modules/spares/entity/Material.java
  28. 4
      src/main/java/org/energy/modules/spares/entity/Outbound.java
  29. 4
      src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.java
  30. 8
      src/main/java/org/energy/modules/spares/mapper/ManufacturerInfoMapper.xml
  31. 5
      src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.java
  32. 4
      src/main/java/org/energy/modules/spares/mapper/MaterialClassCodeMapper.xml
  33. 4
      src/main/java/org/energy/modules/spares/mapper/MaterialMapper.java
  34. 53
      src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
  35. 5
      src/main/java/org/energy/modules/spares/mapper/OutboundMapper.java
  36. 4
      src/main/java/org/energy/modules/spares/mapper/OutboundMapper.xml
  37. 3
      src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.java
  38. 8
      src/main/java/org/energy/modules/spares/mapper/SupplierInfoMapper.xml
  39. 2
      src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.java
  40. 4
      src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml
  41. 10
      src/main/java/org/energy/modules/spares/service/IManufacturerInfoService.java
  42. 7
      src/main/java/org/energy/modules/spares/service/IMaterialClassCodeService.java
  43. 6
      src/main/java/org/energy/modules/spares/service/IMaterialService.java
  44. 5
      src/main/java/org/energy/modules/spares/service/IOutboundService.java
  45. 10
      src/main/java/org/energy/modules/spares/service/ISupplierInfoService.java
  46. 2
      src/main/java/org/energy/modules/spares/service/IWarehouseService.java
  47. 13
      src/main/java/org/energy/modules/spares/service/impl/ManufacturerInfoServiceImpl.java
  48. 10
      src/main/java/org/energy/modules/spares/service/impl/MaterialClassCodeServiceImpl.java
  49. 18
      src/main/java/org/energy/modules/spares/service/impl/MaterialServiceImpl.java
  50. 6
      src/main/java/org/energy/modules/spares/service/impl/OutboundServiceImpl.java
  51. 12
      src/main/java/org/energy/modules/spares/service/impl/SupplierInfoServiceImpl.java
  52. 5
      src/main/java/org/energy/modules/spares/service/impl/WarehouseServiceImpl.java
  53. 8
      src/main/java/org/energy/modules/spares/vo/MaterialVO.java

@ -91,9 +91,6 @@ public class InspectionPlanController extends DafController {
if (StringUtil.isNotEmpty(inspectionPlan.getPlanName())) { if (StringUtil.isNotEmpty(inspectionPlan.getPlanName())) {
qw.lambda().like(InspectionPlan::getPlanName, inspectionPlan.getPlanName()); qw.lambda().like(InspectionPlan::getPlanName, inspectionPlan.getPlanName());
} }
if (null != inspectionPlan.getStation()) {
qw.lambda().eq(InspectionPlan::getStation, inspectionPlan.getStation());
}
if (StringUtil.isNotEmpty(inspectionPlan.getPeriodType())) { if (StringUtil.isNotEmpty(inspectionPlan.getPeriodType())) {
qw.lambda().like(InspectionPlan::getPeriodType, inspectionPlan.getPeriodType()); qw.lambda().like(InspectionPlan::getPeriodType, inspectionPlan.getPeriodType());
} }
@ -217,7 +214,7 @@ public class InspectionPlanController extends DafController {
public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) { public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
entity.remove("daf-auth"); entity.remove("daf-auth");
entity.forEach((key, value) -> { entity.forEach((key, value) -> {
if (!"station".equals(key) && !"planStatus".equals(key)) if (!"planStatus".equals(key))
{ {
entity.put(key, "%" + value + "%"); entity.put(key, "%" + value + "%");
} }

@ -91,9 +91,6 @@ public class InspectionRouteController extends DafController {
if (StringUtil.isNotEmpty(inspectionRoute.getRouteName())) { if (StringUtil.isNotEmpty(inspectionRoute.getRouteName())) {
qw.lambda().like(InspectionRoute::getRouteName, inspectionRoute.getRouteName()); qw.lambda().like(InspectionRoute::getRouteName, inspectionRoute.getRouteName());
} }
if (null != inspectionRoute.getStations()) {
qw.lambda().eq(InspectionRoute::getStations, inspectionRoute.getStations());
}
if (StringUtil.isNotEmpty(inspectionRoute.getType())) { if (StringUtil.isNotEmpty(inspectionRoute.getType())) {
qw.lambda().like(InspectionRoute::getType, inspectionRoute.getType()); qw.lambda().like(InspectionRoute::getType, inspectionRoute.getType());
} }
@ -218,7 +215,7 @@ public class InspectionRouteController extends DafController {
public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) { public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
entity.remove("daf-auth"); entity.remove("daf-auth");
entity.forEach((key, value) -> { entity.forEach((key, value) -> {
if (!"stations".equals(key) && !"istatus".equals(key)) if (!"istatus".equals(key))
{ {
entity.put(key, "%" + value + "%"); entity.put(key, "%" + value + "%");
} }

@ -35,9 +35,12 @@ import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func; import com.dayu.daf.core.tool.utils.Func;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.apache.commons.codec.Charsets; import org.apache.commons.codec.Charsets;
import org.energy.modules.inspection.entity.InspectionRoute;
import org.energy.modules.inspection.excel.InspectionRouteExcel;
import org.energy.modules.inspection.excel.InspectionTasksExcel; import org.energy.modules.inspection.excel.InspectionTasksExcel;
import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.EquipmentLedger;
import org.energy.modules.leger.excel.EquipmentLedgerExcel; import org.energy.modules.leger.excel.EquipmentLedgerExcel;
import org.energy.modules.system.util.DataUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -228,15 +231,15 @@ public class InspectionTasksController extends DafController {
@ApiOperation(value = "导出", notes = "传入") @ApiOperation(value = "导出", notes = "传入")
@ApiLog @ApiLog
public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) { public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
if (entity.containsKey("station_equal")) { entity.remove("daf-auth");
entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal"))); entity.forEach((key, value) -> {
} if (!"station".equals(key) && !"taskStatus".equals(key))
if (entity.containsKey("taskStatus_equal")) { {
entity.put("taskStatus_equal", Integer.parseInt((String) entity.get("taskStatus_equal"))); entity.put(key, "%" + value + "%");
} }
QueryWrapper<InspectionTasks> queryWrapper = Condition.getQueryWrapper(entity, InspectionTasks.class); });
queryWrapper.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED); InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new);
List<InspectionTasksExcel> list = inspectionTasksService.export(queryWrapper); List<InspectionTasksExcel> list = inspectionTasksService.export(vo);
response.setContentType("application/vnd.ms-excel"); response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(Charsets.UTF_8.name()); response.setCharacterEncoding(Charsets.UTF_8.name());
String fileName = URLEncoder.encode("巡检任务数据导出", Charsets.UTF_8.name()); String fileName = URLEncoder.encode("巡检任务数据导出", Charsets.UTF_8.name());

@ -42,10 +42,6 @@ public class InspectionPlanExcel implements Serializable {
@ExcelProperty(value = "计划名称") @ExcelProperty(value = "计划名称")
private String planName; private String planName;
@ColumnWidth(15)
@ExcelProperty(value = "场站")
private String stationName;
@ColumnWidth(15) @ColumnWidth(15)
@ExcelProperty(value = "计划类型") @ExcelProperty(value = "计划类型")
private String planType; private String planType;

@ -42,10 +42,6 @@ public class InspectionRouteExcel implements Serializable {
@ExcelProperty(value = "路线名称") @ExcelProperty(value = "路线名称")
private String routeName; private String routeName;
@ColumnWidth(15)
@ExcelProperty(value = "场站")
private String stationsName;
@ColumnWidth(15) @ColumnWidth(15)
@ExcelProperty(value = "类型") @ExcelProperty(value = "类型")
private String type; private String type;

@ -30,9 +30,8 @@
<select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionPlanExcel"> <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionPlanExcel">
SELECT plan_no, plan_name, plan_type, period_type, period_value, start_time, end_time, cancel_reason SELECT plan_no, plan_name, plan_type, period_type, period_value, start_time, end_time, cancel_reason
,dic1.dict_value AS station_name, dic2.dict_value AS plan_status_name , dic2.dict_value AS plan_status_name
FROM i_inspection_plan a FROM i_inspection_plan a
LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0' LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0'
WHERE a.is_deleted = 0 WHERE a.is_deleted = 0
<if test="entity.planNo != null and entity.planNo != ''"> <if test="entity.planNo != null and entity.planNo != ''">
@ -41,9 +40,6 @@
<if test="entity.planName != null and entity.planName != ''"> <if test="entity.planName != null and entity.planName != ''">
AND a.plan_name LIKE #{entity.planName} AND a.plan_name LIKE #{entity.planName}
</if> </if>
<if test="entity.station != null and entity.station != ''">
AND a.station = #{entity.station}
</if>
<if test="entity.periodType != null and entity.periodType != ''"> <if test="entity.periodType != null and entity.periodType != ''">
AND a.period_type LIKE #{entity.periodType} AND a.period_type LIKE #{entity.periodType}
</if> </if>

@ -27,9 +27,8 @@
<select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionRouteExcel"> <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionRouteExcel">
SELECT a.route_no, a.route_name, a.type, a.factory, a.cancel_reason SELECT a.route_no, a.route_name, a.type, a.factory, a.cancel_reason
,dic1.dict_value AS stations_name, dic2.dict_value AS istatus_name , dic2.dict_value AS istatus_name
FROM i_inspection_route a FROM i_inspection_route a
LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.stations AND dic1.is_deleted = '0'
LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0' LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0'
WHERE a.is_deleted = 0 WHERE a.is_deleted = 0
<if test="entity.routeNo != null and entity.routeNo != ''"> <if test="entity.routeNo != null and entity.routeNo != ''">
@ -38,9 +37,6 @@
<if test="entity.routeName != null and entity.routeName != ''"> <if test="entity.routeName != null and entity.routeName != ''">
AND a.route_name LIKE #{entity.routeName} AND a.route_name LIKE #{entity.routeName}
</if> </if>
<if test="entity.stations != null and entity.stations != ''">
AND a.stations = #{entity.stations}
</if>
<if test="entity.type != null and entity.type != ''"> <if test="entity.type != null and entity.type != ''">
AND a.type LIKE #{entity.type} AND a.type LIKE #{entity.type}
</if> </if>

@ -32,7 +32,7 @@ public interface InspectionTasksMapper extends BaseMapper<InspectionTasks> {
/** /**
* 导出 * 导出
*/ */
List<InspectionTasksExcel> exportData(@Param("ew") Wrapper<InspectionTasks> queryWrapper); List<InspectionTasksExcel> exportData(@Param("entity") InspectionTasks inspectionTasks);
/** /**
* 获取最大任务编号 * 获取最大任务编号

@ -36,25 +36,34 @@
</select> </select>
<select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionTasksExcel"> <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionTasksExcel">
SELECT task_no SELECT a.task_no, a.task_name, dic1.dict_value AS stationExt, a.task_start_date
,task_name , a.task_end_date, a.responsible_person, dic2.dict_value AS taskStatusExt
,CASE , a.cancel_reason
WHEN station = '1' THEN '景和光伏' FROM i_inspection_tasks a
WHEN station = '2' THEN '北沙一光伏' LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
WHEN station = '3' THEN '北沙二光伏' LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0'
WHEN station = '4' THEN '达坂城风电一场' WHERE a.is_deleted = 0
ELSE '' <if test="entity.taskNo != null and entity.taskNo != ''">
END AS station_ext AND a.task_no LIKE #{entity.taskNo}
,task_start_date </if>
,task_end_date <if test="entity.taskName != null and entity.taskName != ''">
,responsible_person AND a.task_name LIKE #{entity.taskName}
,CASE </if>
WHEN task_status = '1' THEN '已启动' <if test="entity.station != null and entity.station != ''">
WHEN task_status = '2' THEN '已停止' AND a.station = #{entity.station}
ELSE '' </if>
END AS task_status_ext <if test="entity.taskStartDate != null and entity.taskStartDate != ''">
, cancel_reason AND a.task_start_date LIKE #{entity.taskStartDate}
FROM i_inspection_tasks ${ew.customSqlSegment} </if>
<if test="entity.taskEndDate != null and entity.taskEndDate != ''">
AND a.task_end_date LIKE #{entity.taskEndDate}
</if>
<if test="entity.responsiblePerson != null and entity.responsiblePerson != ''">
AND a.responsible_person LIKE #{entity.responsiblePerson}
</if>
<if test="entity.taskStatus != null and entity.taskStatus != ''">
AND a.task_status = #{entity.taskStatus}
</if>
</select> </select>
<select id="getMaxTaskNO" resultType="java.lang.String"> <select id="getMaxTaskNO" resultType="java.lang.String">

@ -1,7 +1,9 @@
package org.energy.modules.inspection.service; package org.energy.modules.inspection.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.energy.modules.inspection.entity.InspectionRoute;
import org.energy.modules.inspection.entity.InspectionTasks; import org.energy.modules.inspection.entity.InspectionTasks;
import org.energy.modules.inspection.excel.InspectionRouteExcel;
import org.energy.modules.inspection.excel.InspectionTasksExcel; import org.energy.modules.inspection.excel.InspectionTasksExcel;
import org.energy.modules.inspection.vo.InspectionTasksVO; import org.energy.modules.inspection.vo.InspectionTasksVO;
import com.dayu.daf.core.mp.base.BaseService; import com.dayu.daf.core.mp.base.BaseService;
@ -30,11 +32,8 @@ public interface IInspectionTasksService extends BaseService<InspectionTasks> {
/** /**
* 获取导出数据 * 获取导出数据
*
* @param queryWrapper
* @return
*/ */
List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper); List<InspectionTasksExcel> export(InspectionTasks InspectionTasks);
/** /**
* 获取最大任务编号 * 获取最大任务编号

@ -29,8 +29,8 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl<InspectionTasksM
} }
@Override @Override
public List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper) { public List<InspectionTasksExcel> export(InspectionTasks inspectionTasks) {
List<InspectionTasksExcel> list = baseMapper.exportData(queryWrapper); List<InspectionTasksExcel> list = baseMapper.exportData(inspectionTasks);
return list; return list;
} }

@ -15,7 +15,9 @@
*/ */
package org.energy.modules.smart.controller; package org.energy.modules.smart.controller;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dayu.daf.core.log.annotation.ApiLog;
import com.dayu.daf.core.tool.constant.DafConstant; import com.dayu.daf.core.tool.constant.DafConstant;
import com.xkcoding.http.util.StringUtil; import com.xkcoding.http.util.StringUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -23,14 +25,18 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Condition;
import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.mp.support.Query;
import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func; import com.dayu.daf.core.tool.utils.Func;
import org.energy.modules.inspection.entity.InspectionRoute; import lombok.SneakyThrows;
import org.energy.modules.leger.entity.EquipmentLedger; import org.apache.commons.codec.Charsets;
import org.energy.modules.smart.excel.OperationTicketExcel;
import org.energy.modules.system.util.DataUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -38,9 +44,12 @@ import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.vo.OperationTicketVO;
import org.energy.modules.smart.service.IOperationTicketService; import org.energy.modules.smart.service.IOperationTicketService;
import com.dayu.daf.core.boot.ctrl.DafController; import com.dayu.daf.core.boot.ctrl.DafController;
import springfox.documentation.annotations.ApiIgnore;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 操作票一览 控制器 * 操作票一览 控制器
@ -170,7 +179,7 @@ public class OperationTicketController extends DafController {
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
@ApiOperation(value = "更新", notes = "传入ids") @ApiOperation(value = "更新", notes = "传入ids")
public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return this.approve("2",ids); return this.approve(2,ids);
} }
/** /**
@ -181,13 +190,13 @@ public class OperationTicketController extends DafController {
@ApiOperation(value = "更新", notes = "传入ids") @ApiOperation(value = "更新", notes = "传入ids")
public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids)
{ {
return this.approve("3",ids); return this.approve(3,ids);
} }
/** /**
* 驳回OR审核 操作票一览 * 驳回OR审核 操作票一览
*/ */
public R approve(String status, String ids) { public R approve(Integer status, String ids) {
List<OperationTicket> list = new ArrayList<>(); List<OperationTicket> list = new ArrayList<>();
for (String id : ids.split(",")) { for (String id : ids.split(",")) {
OperationTicket operationTicket = new OperationTicket(); OperationTicket operationTicket = new OperationTicket();
@ -222,4 +231,29 @@ public class OperationTicketController extends DafController {
} }
return R.status(operationTicketService.updateBatchById(list)); return R.status(operationTicketService.updateBatchById(list));
} }
/**
* 导出
*/
@SneakyThrows
@GetMapping("export")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "导出", notes = "传入")
@ApiLog
public void exportInspectionRoute(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
entity.remove("daf-auth");
entity.forEach((key, value) -> {
if (!"station".equals(key) && !"isQuakified".equals(key) && !"sts".equals(key))
{
entity.put(key, "%" + value + "%");
}
});
OperationTicket vo = DataUtils.mapToEntity(entity, OperationTicket::new);
List<OperationTicketExcel> list = operationTicketService.export(vo);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(Charsets.UTF_8.name());
String fileName = URLEncoder.encode("操作票数据导出", Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), OperationTicketExcel.class).sheet("操作票").doWrite(list);
}
} }

@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity;
import java.io.Serializable; import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -164,13 +165,14 @@ public class OperationTicket extends BaseEntity {
/** /**
* 是否合格 * 是否合格
*/ */
@JsonSerialize(nullsUsing = NullSerializer.class)
@ApiModelProperty(value = "是否合格") @ApiModelProperty(value = "是否合格")
private Integer isQuakified; private Integer isQuakified;
/** /**
* 审核状态 * 审核状态
*/ */
@ApiModelProperty(value = "审核状态") @ApiModelProperty(value = "审核状态")
private String reviewStatus; private Integer reviewStatus;
} }

@ -0,0 +1,202 @@
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <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.smart.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* EquipmentLedge model export
* @author edwong
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(16)
public class OperationTicketExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* KKS编码
*/
@ColumnWidth(20)
@ExcelProperty(value = "KKS编码")
private String kksEncoding;
/**
* KSS描述
*/
@ColumnWidth(20)
@ExcelProperty(value ="KSS描述")
private String kksDescription;
/**
* 场站
*/
@ColumnWidth(20)
@ExcelProperty(value = "场站")
private String stationName;
/**
* 操作票编号
*/
@ColumnWidth(20)
@ExcelProperty(value ="操作票编号")
private String operationTicketNo;
/**
* 工作班组
*/
@ColumnWidth(20)
@ExcelProperty(value = "工作班组")
private String workTeam;
/**
* 工作负责人
*/
@ColumnWidth(20)
@ExcelProperty(value = "工作负责人")
private String workLeader;
/**
* 监护人
*/
@ColumnWidth(20)
@ExcelProperty(value = "监护人")
private String guardian;
/**
* 发令人
*/
@ColumnWidth(20)
@ExcelProperty(value = "发令人")
private String givingOrdersUser;
/**
* 作业风险等级
*/
@ColumnWidth(20)
@ExcelProperty(value ="作业风险等级")
private String jobRiskLevel;
/**
* 控制等级
*/
@ColumnWidth(20)
@ExcelProperty(value = "控制等级")
private String controlLevel;
/**
* 计划开始时间
*/
@ColumnWidth(20)
@ExcelProperty(value = "计划开始时间")
private String plannedStartTime;
/**
* 计划结束时间
*/
@ColumnWidth(20)
@ExcelProperty(value = "计划结束时间")
private String plannedEndTime;
/**
* 工作签发时间
*/
@ColumnWidth(20)
@ExcelProperty(value ="工作签发时间")
private String workIssuanceTime;
/**
* 人员资格
*/
@ColumnWidth(20)
@ExcelProperty(value ="人员资格")
private String personnelQualification;
/**
* 人员状态
*/
@ColumnWidth(20)
@ExcelProperty(value = "人员状态")
private String personnelState;
/**
* 人员防护
*/
@ColumnWidth(20)
@ExcelProperty(value = "人员防护")
private String personnelPritection;
/**
* 安全距离
*/
@ColumnWidth(20)
@ExcelProperty(value = "安全距离")
private String safeDistance;
/**
* 走错间隔
*/
@ColumnWidth(20)
@ExcelProperty(value = "走错间隔")
private String wrongInterval;
/**
* 安全措施落实
*/
@ColumnWidth(20)
@ExcelProperty(value = "安全措施落实")
private String securityMeasuresImplement;
/**
* 开展过程检查
*/
@ColumnWidth(20)
@ExcelProperty(value = "开展过程检查")
private String conductProcessInspections;
/**
* 安全培训落实
*/
@ColumnWidth(20)
@ExcelProperty(value = "安全培训落实")
private String securityTrainingImplement;
/**
* 其他
*/
@ColumnWidth(20)
@ExcelProperty(value = "其他")
private String other;
/**
* 安全技术措施交底
*/
@ColumnWidth(20)
@ExcelProperty(value = "安全技术措施交底")
private String securityMeasuresDisclosure;
/**
* 作业后风险管控情况评价
*/
@ColumnWidth(20)
@ExcelProperty(value ="作业后风险管控情况评价")
private String riskControlEvaluation;
/**
* 状态
*/
@ColumnWidth(20)
@ExcelProperty(value ="状态")
private String stsName;
/**
* 是否合格
*/
@ColumnWidth(20)
@ExcelProperty(value = "是否合格")
private String isQuakifiedName;
/**
* 审核状态
*/
@ColumnWidth(20)
@ExcelProperty(value = "审核状态")
private String reviewStatus;
}

@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.entity.EquipmentLedger;
import org.energy.modules.leger.excel.EquipmentLedgerExcel; import org.energy.modules.leger.excel.EquipmentLedgerExcel;
import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.excel.OperationTicketExcel;
import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.vo.OperationTicketVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -27,7 +28,7 @@ public interface OperationTicketMapper extends BaseMapper<OperationTicket> {
*/ */
List<OperationTicketVO> selectOperationTicketPage(IPage page, OperationTicketVO operationTicket); List<OperationTicketVO> selectOperationTicketPage(IPage page, OperationTicketVO operationTicket);
List<OperationTicketVO> exportData(@Param("ew") Wrapper<OperationTicketVO> queryWrapper); List<OperationTicketExcel> exportData(@Param("entity")OperationTicket operationTicket);
List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper<OperationTicketVO> queryWrapper); List<OperationTicketVO> selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper<OperationTicketVO> queryWrapper);
} }

@ -118,4 +118,45 @@
, a.id , a.id
</select> </select>
<select id="exportData" resultType="org.energy.modules.smart.excel.OperationTicketExcel">
SELECT kks_encoding, kks_description, operation_ticket_no, work_team, work_leader, guardian ,giving_orders_user,job_risk_level,job_risk_level,control_level,planned_start_time,planned_end_time ,work_issuance_time,
personnel_qualification,personnel_state,personnel_pritection,safe_distance,wrong_interval,security_measures_implement,conduct_process_inspections,security_training_implement,other,security_measures_disclosure,
risk_control_evaluation,
dic1.dict_value AS station_name,dic2.dict_value AS is_quakified_name,dic3.dict_value AS sts_name, dic4.dict_value AS review_status
FROM smt_operation_ticket a
INNER JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
LEFT JOIN sys_dict dic2 ON dic2.code = 'is_qualified' AND dic2.dict_key = a.is_quakified AND dic2.is_deleted = '0'
INNER JOIN sys_dict dic3 ON dic3.code = 'operation_sts' AND dic3.dict_key = a.sts AND dic3.is_deleted = '0'
INNER JOIN sys_dict dic4 ON dic4.code = 'check_status' AND dic4.dict_key = a.review_status AND dic4.is_deleted = '0'
where a.is_deleted = 0
<if test="entity.station != null and entity.station != ''">
AND a.station = #{entity.station}
</if>
<if test="entity.operationTicketNo != null and entity.operationTicketNo != ''">
AND a.operation_ticket_no LIKE #{entity.operation_ticket_no}
</if>
<if test="entity.operationTicketType != null and entity.operationTicketType != ''">
AND a.operation_ticket_type LIKE #{entity.operation_ticket_type}
</if>
<if test="entity.workLeader != null and entity.workLeader != ''">
AND a.work_leader LIKE #{entity.work_leader}
</if>
<if test="entity.jobRiskLevel != null and entity.jobRiskLevel != ''">
AND a.job_risk_level LIKE #{entity.job_risk_level}
</if>
<if test="entity.controlLevel != null and entity.controlLevel != ''">
AND a.control_level LIKE #{entity.control_level}
</if>
<if test="entity.plannedStartTime != null and entity.plannedStartTime != ''">
AND a.planned_start_time LIKE #{entity.planned_start_time}
</if>
<if test="entity.sts != null and entity.sts != ''">
AND a.sts = #{entity.sts}
</if>
</select>
</mapper> </mapper>

@ -1,8 +1,7 @@
package org.energy.modules.smart.service; package org.energy.modules.smart.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.smart.excel.OperationTicketExcel;
import org.energy.modules.inspection.excel.InspectionRouteExcel;
import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.vo.OperationTicketVO;
import com.dayu.daf.core.mp.base.BaseService; import com.dayu.daf.core.mp.base.BaseService;
@ -29,4 +28,11 @@ public interface IOperationTicketService extends BaseService<OperationTicket> {
IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper); IPage<OperationTicketVO> selectOperationTicketPageExt(IPage<OperationTicketVO> page, Wrapper<OperationTicketVO> wrapper);
/**
* 获取导出数据
*
* @param operationTicket
* @return
*/
List<OperationTicketExcel> export(OperationTicket operationTicket);
} }

@ -1,8 +1,7 @@
package org.energy.modules.smart.service.impl; package org.energy.modules.smart.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.smart.excel.OperationTicketExcel;
import org.energy.modules.inspection.excel.InspectionRouteExcel;
import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.OperationTicket;
import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.vo.OperationTicketVO;
import org.energy.modules.smart.mapper.OperationTicketMapper; import org.energy.modules.smart.mapper.OperationTicketMapper;
@ -32,4 +31,9 @@ public class OperationTicketServiceImpl extends BaseServiceImpl<OperationTicketM
return page.setRecords(baseMapper.selectOperationTicketPageExt(page, wrapper)); return page.setRecords(baseMapper.selectOperationTicketPageExt(page, wrapper));
} }
@Override
public List<OperationTicketExcel> export(OperationTicket operationTicket) {
List<OperationTicketExcel> list = baseMapper.exportData(operationTicket);
return list;
}
} }

@ -29,6 +29,7 @@ import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func; import com.dayu.daf.core.tool.utils.Func;
import lombok.Data; import lombok.Data;
import org.energy.modules.leger.entity.TechParameters; import org.energy.modules.leger.entity.TechParameters;
import org.energy.modules.spares.service.IMaterialService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -54,6 +55,7 @@ import java.util.List;
public class InboundController extends DafController { public class InboundController extends DafController {
private IInboundService inboundService; private IInboundService inboundService;
private IMaterialService materialService;
/** /**
* 详情 * 详情
@ -105,6 +107,10 @@ public class InboundController extends DafController {
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入inbound") @ApiOperation(value = "修改", notes = "传入inbound")
public R update(@Valid @RequestBody Inbound inbound) { public R update(@Valid @RequestBody Inbound inbound) {
if (inbound.getIstatus() == 2)
{
materialService.updateNum(inbound.getMaterialNo(), inbound.getInboundCount());
}
return R.status(inboundService.updateById(inbound)); return R.status(inboundService.updateById(inbound));
} }

@ -201,4 +201,26 @@ public class ManufacturerInfoController extends DafController {
EasyExcel.write(response.getOutputStream(), ManufacturerInfoExcel.class).sheet("制造商信息管理").doWrite(list); EasyExcel.write(response.getOutputStream(), ManufacturerInfoExcel.class).sheet("制造商信息管理").doWrite(list);
} }
/**
* 获取制造商
*/
@GetMapping("/getNoList")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "获取编号", notes = "获取编号")
public R<List<ManufacturerInfo>> getNoList() {
List<ManufacturerInfo> noList = manufacturerInfoService.getNoList();
return R.data(noList);
}
/**
* 获取制造商信息
*/
@GetMapping("/getDetail")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "获取制造商信息", notes = "获取制造商信息")
public R<ManufacturerInfo> getDetail(String creditCode) {
ManufacturerInfo detail = manufacturerInfoService.getDetail(creditCode);
return R.data(detail);
}
} }

@ -34,6 +34,8 @@ import org.energy.modules.spares.vo.MaterialClassCodeVO;
import org.energy.modules.spares.service.IMaterialClassCodeService; import org.energy.modules.spares.service.IMaterialClassCodeService;
import com.dayu.daf.core.boot.ctrl.DafController; import com.dayu.daf.core.boot.ctrl.DafController;
import java.util.List;
/** /**
* 物资分类码 控制器 * 物资分类码 控制器
* *
@ -122,5 +124,16 @@ public class MaterialClassCodeController extends DafController {
return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids))); return R.status(materialClassCodeService.deleteLogic(Func.toLongList(ids)));
} }
/**
* 分页 物资分类码
*/
@GetMapping("/getMaterialClassCodeList")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "获取物资分类码", notes = "获取物资分类码")
public R<List<String>> getMaterialClassCodeList() {
List<String> list = materialClassCodeService.getMaterialClassCodeList();
return R.data(list);
}
} }

@ -38,6 +38,7 @@ import org.apache.commons.codec.Charsets;
import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.inspection.entity.InspectionRoute;
import org.energy.modules.inspection.excel.InspectionRouteExcel; import org.energy.modules.inspection.excel.InspectionRouteExcel;
import org.energy.modules.spares.excel.MaterialExcel; import org.energy.modules.spares.excel.MaterialExcel;
import org.energy.modules.system.util.DataUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -195,8 +196,8 @@ public class MaterialController extends DafController {
@GetMapping("/getDetailList") @GetMapping("/getDetailList")
@ApiOperationSupport(order = 9) @ApiOperationSupport(order = 9)
@ApiOperation(value = "获取物资信息", notes = "获取物资信息") @ApiOperation(value = "获取物资信息", notes = "获取物资信息")
public R<Material> getDetailList(String materialNo) { public R<MaterialVO> getDetailList(String materialNo) {
Material DetailList = materialService.getDetailList("'" + materialNo + "'"); MaterialVO DetailList = materialService.getDetailList(materialNo);
return R.data(DetailList); return R.data(DetailList);
} }
@ -209,15 +210,15 @@ public class MaterialController extends DafController {
@ApiOperation(value = "导出", notes = "传入") @ApiOperation(value = "导出", notes = "传入")
@ApiLog @ApiLog
public void exportMaterial(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) { public void exportMaterial(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
if (entity.containsKey("station_equal")) { entity.remove("daf-auth");
entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal"))); entity.forEach((key, value) -> {
} if (!"station".equals(key))
{
QueryWrapper<Material> queryWrapper = Condition.getQueryWrapper(entity, Material.class); entity.put(key, "%" + value + "%");
queryWrapper.lambda().eq(Material::getIsDeleted, DafConstant.DB_NOT_DELETED); }
queryWrapper.orderByAsc("material_no"); });
Material vo = DataUtils.mapToEntity(entity, Material::new);
List<MaterialExcel> list = materialService.exportData(queryWrapper); List<MaterialExcel> list = materialService.exportData(vo);
response.setContentType("application/vnd.ms-excel"); response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(Charsets.UTF_8.name()); response.setCharacterEncoding(Charsets.UTF_8.name());
String fileName = URLEncoder.encode("物资数据导出", Charsets.UTF_8.name()); String fileName = URLEncoder.encode("物资数据导出", Charsets.UTF_8.name());

@ -15,6 +15,7 @@
*/ */
package org.energy.modules.spares.controller; package org.energy.modules.spares.controller;
import com.xkcoding.http.util.StringUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -26,7 +27,7 @@ import com.dayu.daf.core.mp.support.Condition;
import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.mp.support.Query;
import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func; import com.dayu.daf.core.tool.utils.Func;
import org.energy.modules.spares.entity.Inbound; import org.energy.modules.spares.service.IMaterialService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -35,6 +36,8 @@ import org.energy.modules.spares.vo.OutboundVO;
import org.energy.modules.spares.service.IOutboundService; import org.energy.modules.spares.service.IOutboundService;
import com.dayu.daf.core.boot.ctrl.DafController; import com.dayu.daf.core.boot.ctrl.DafController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -50,6 +53,7 @@ import java.util.List;
public class OutboundController extends DafController { public class OutboundController extends DafController {
private IOutboundService outboundService; private IOutboundService outboundService;
private IMaterialService materialService;
/** /**
* 详情 * 详情
@ -101,6 +105,10 @@ public class OutboundController extends DafController {
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入outbound") @ApiOperation(value = "修改", notes = "传入outbound")
public R update(@Valid @RequestBody Outbound outbound) { public R update(@Valid @RequestBody Outbound outbound) {
if (outbound.getIstatus() == 2)
{
materialService.updateNum(outbound.getMaterialNo(), Math.negateExact(outbound.getOutboundCount()));
}
return R.status(outboundService.updateById(outbound)); return R.status(outboundService.updateById(outbound));
} }
@ -111,6 +119,22 @@ public class OutboundController extends DafController {
@ApiOperationSupport(order = 6) @ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入outbound") @ApiOperation(value = "新增或修改", notes = "传入outbound")
public R submit(@Valid @RequestBody Outbound outbound) { public R submit(@Valid @RequestBody Outbound outbound) {
String maxNo = outboundService.getMaxNo("'%" + outbound.getMaterialNo() + "%'");
int number;
if (StringUtil.isNotEmpty(maxNo)){
number = Integer.parseInt(maxNo.substring(11));
number++;
}else{
number = 1;
}
String numFormat = String.format("%06d", number);
String no = outbound.getMaterialNo() + "OUT" + numFormat;
outbound.setOutboundNo(no);
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String time = sdf.format(date);
outbound.setOutboundTime(time);
outbound.setIstatus(1L);
return R.status(outboundService.saveOrUpdate(outbound)); return R.status(outboundService.saveOrUpdate(outbound));
} }

@ -201,5 +201,27 @@ public class SupplierInfoController extends DafController {
EasyExcel.write(response.getOutputStream(), SupplierInfoExcel.class).sheet("供应商信息管理").doWrite(list); EasyExcel.write(response.getOutputStream(), SupplierInfoExcel.class).sheet("供应商信息管理").doWrite(list);
} }
/**
* 获取供应商
*/
@GetMapping("/getNoList")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "获取编号", notes = "获取编号")
public R<List<SupplierInfo>> getNoList() {
List<SupplierInfo> noList = supplierInfoService.getNoList();
return R.data(noList);
}
/**
* 获取供应商信息
*/
@GetMapping("/getDetail")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "获取供应商信息", notes = "获取供应商信息")
public R<SupplierInfo> getDetail(String creditCode) {
SupplierInfo detail = supplierInfoService.getDetail(creditCode);
return R.data(detail);
}
} }

@ -35,7 +35,6 @@ import com.dayu.daf.core.tool.api.R;
import com.dayu.daf.core.tool.utils.Func; import com.dayu.daf.core.tool.utils.Func;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.apache.commons.codec.Charsets; import org.apache.commons.codec.Charsets;
import org.energy.modules.spares.entity.ManufacturerInfo;
import org.energy.modules.spares.excel.WarehouseExcel; import org.energy.modules.spares.excel.WarehouseExcel;
import org.energy.modules.system.util.DataUtils; import org.energy.modules.system.util.DataUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -208,4 +207,15 @@ public class WarehouseController extends DafController {
EasyExcel.write(response.getOutputStream(), WarehouseExcel.class).sheet("仓库").doWrite(list); EasyExcel.write(response.getOutputStream(), WarehouseExcel.class).sheet("仓库").doWrite(list);
} }
/**
* 获取仓库信息
*/
@GetMapping("/getWarehouseList")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "获取仓库信息", notes = "获取仓库信息")
public R<List<Warehouse>> getWarehouseList() {
List<Warehouse> noList = warehouseService.getWarehouseList();
return R.data(noList);
}
} }

@ -3,6 +3,9 @@ package org.energy.modules.spares.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.dayu.daf.core.mp.base.BaseEntity; import com.dayu.daf.core.mp.base.BaseEntity;
import java.io.Serializable; import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -25,6 +28,7 @@ public class Inbound extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private Long id; private Long id;
/** /**

@ -60,7 +60,7 @@ public class Material extends BaseEntity {
* 供应商名称 * 供应商名称
*/ */
@ApiModelProperty(value = "供应商名称") @ApiModelProperty(value = "供应商名称")
private String sipplierName; private String supplierName;
/** /**
* 所属仓库 * 所属仓库
*/ */

@ -3,6 +3,9 @@ package org.energy.modules.spares.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.dayu.daf.core.mp.base.BaseEntity; import com.dayu.daf.core.mp.base.BaseEntity;
import java.io.Serializable; import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@ -25,6 +28,7 @@ public class Outbound extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private Long id; private Long id;
/** /**

@ -27,4 +27,8 @@ public interface ManufacturerInfoMapper extends BaseMapper<ManufacturerInfo> {
List<ManufacturerInfoVO> selectManufacturerInfoPage(IPage page, ManufacturerInfoVO manufacturerInfo); List<ManufacturerInfoVO> selectManufacturerInfoPage(IPage page, ManufacturerInfoVO manufacturerInfo);
List<ManufacturerInfoExcel> exportData(@Param("vo") ManufacturerInfoVO manufacturerInfo); List<ManufacturerInfoExcel> exportData(@Param("vo") ManufacturerInfoVO manufacturerInfo);
List<ManufacturerInfo> getNoList();
ManufacturerInfo getDetail(String creditCode);
} }

@ -48,4 +48,12 @@
order by a.update_time desc order by a.update_time desc
</select> </select>
<select id="getNoList" resultMap="manufacturerInfoResultMap">
select credit_code from spt_manufacturer_info where is_deleted = 0
</select>
<select id="getDetail" resultMap="manufacturerInfoResultMap">
select manufacturer_name from spt_manufacturer_info where credit_code = #{credit_code}
</select>
</mapper> </mapper>

@ -23,4 +23,9 @@ public interface MaterialClassCodeMapper extends BaseMapper<MaterialClassCode> {
*/ */
List<MaterialClassCodeVO> selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode); List<MaterialClassCodeVO> selectMaterialClassCodePage(IPage page, MaterialClassCodeVO materialClassCode);
/**
* 获取物资分类码
*/
List<String> getMaterialClassCodeList();
} }

@ -20,4 +20,8 @@
select * from s_material_class_code where is_deleted = 0 select * from s_material_class_code where is_deleted = 0
</select> </select>
<select id="getMaterialClassCodeList" resultType="java.lang.String">
select material_class_code from s_material_class_code where is_deleted = 0
</select>
</mapper> </mapper>

@ -33,7 +33,7 @@ public interface MaterialMapper extends BaseMapper<Material> {
/** /**
* 导出 * 导出
*/ */
List<MaterialExcel> exportData(@Param("ew") Wrapper<Material> queryWrapper); List<MaterialExcel> exportData(@Param("entity") Material material);
/** /**
* 获取物资编号 * 获取物资编号
@ -48,6 +48,6 @@ public interface MaterialMapper extends BaseMapper<Material> {
/** /**
* 获取物资的信息 * 获取物资的信息
*/ */
Material getDetailList(String materialNo); MaterialVO getDetailList(String materialNo);
} }

@ -16,7 +16,7 @@
<result column="material_class_code" property="materialClassCode"/> <result column="material_class_code" property="materialClassCode"/>
<result column="model" property="model"/> <result column="model" property="model"/>
<result column="manufacturer_name" property="manufacturerName"/> <result column="manufacturer_name" property="manufacturerName"/>
<result column="sipplier_name" property="sipplierName"/> <result column="supplier_name" property="supplierName"/>
<result column="warehouse" property="warehouse"/> <result column="warehouse" property="warehouse"/>
<result column="inventory_count" property="inventoryCount"/> <result column="inventory_count" property="inventoryCount"/>
<result column="material_description" property="materialDescription"/> <result column="material_description" property="materialDescription"/>
@ -37,31 +37,42 @@
select material_no from s_material where is_deleted = 0 select material_no from s_material where is_deleted = 0
</select> </select>
<select id="getDetailList" resultMap="materialResultMap"> <select id="getDetailList" resultType="org.energy.modules.spares.vo.MaterialVO">
select material_name, model select material_name, model
-- ,b.warehouse_name ,b.name as warehouse_name
,inventory_count
from s_material from s_material
-- inner join ( inner join (
-- select warehouse_name select code
-- ,warehouse ,name
-- from warehouse from spt_warehouse
-- where warehouse in (select warehouse from s_material where material_no = ${materialNo} and is_deleted = 0) where code in (select warehouse from s_material where material_no = #{materialNo} and is_deleted = 0)
-- ) as b ) as b
-- on b.warehouse = s_material.warehouse on b.code = s_material.warehouse
where material_no = ${materialNo} and is_deleted = 0 where material_no = #{materialNo} and is_deleted = 0
</select> </select>
<select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel"> <select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel">
SELECT material_no SELECT material_no, dic1.dict_value AS stationExt, material_name
,CASE , model, inventory_count, material_description
WHEN station = '1' THEN '景和光伏' FROM s_material a
WHEN station = '2' THEN '北沙一光伏' LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
WHEN station = '3' THEN '北沙二光伏' WHERE a.is_deleted = 0
WHEN station = '4' THEN '达坂城风电一场' <if test="entity.materialNo != null and entity.materialNo != ''">
ELSE '' AND a.material_no LIKE #{entity.materialNo}
END AS station_ext </if>
,material_name, model, inventory_count, material_description <if test="entity.station != null and entity.station != ''">
FROM s_material ${ew.customSqlSegment} AND a.station = #{entity.station}
</if>
<if test="entity.materialName != null and entity.materialName != ''">
AND a.material_name LIKE #{entity.materialName}
</if>
<if test="entity.model != null and entity.model != ''">
AND a.model LIKE #{entity.model}
</if>
<if test="entity.inventoryCount != null and entity.inventoryCount != ''">
AND a.inventory_count LIKE #{entity.inventoryCount}
</if>
</select> </select>
</mapper> </mapper>

@ -23,4 +23,9 @@ public interface OutboundMapper extends BaseMapper<Outbound> {
*/ */
List<OutboundVO> selectOutboundPage(IPage page, OutboundVO outbound); List<OutboundVO> selectOutboundPage(IPage page, OutboundVO outbound);
/**
* 获取最大编号
*/
String getMaxNo(String materialNo);
} }

@ -25,4 +25,8 @@
select * from s_outbound where is_deleted = 0 select * from s_outbound where is_deleted = 0
</select> </select>
<select id="getMaxNo" resultType="java.lang.String">
select max(outbound_no) from s_outbound where is_deleted = 0 and outbound_no like ${materialNo}
</select>
</mapper> </mapper>

@ -28,4 +28,7 @@ public interface SupplierInfoMapper extends BaseMapper<SupplierInfo> {
List<SupplierInfoExcel> exportData(@Param("vo") SupplierInfoVO supplierInfo); List<SupplierInfoExcel> exportData(@Param("vo") SupplierInfoVO supplierInfo);
List<SupplierInfo> getNoList();
SupplierInfo getDetail(String creditCode);
} }

@ -51,4 +51,12 @@
order by a.update_time desc order by a.update_time desc
</select> </select>
<select id="getNoList" resultMap="supplierInfoResultMap">
select credit_code from spt_supplier_info where is_deleted = 0
</select>
<select id="getDetail" resultMap="supplierInfoResultMap">
select supplier_name from spt_supplier_info where credit_code = #{credit_code}
</select>
</mapper> </mapper>

@ -27,4 +27,6 @@ public interface WarehouseMapper extends BaseMapper<Warehouse> {
List<WarehouseExcel> exportData(@Param("vo") WarehouseVO warehouseVO); List<WarehouseExcel> exportData(@Param("vo") WarehouseVO warehouseVO);
List<Warehouse> getWarehouseList();
} }

@ -53,4 +53,8 @@
order by a.update_time desc order by a.update_time desc
</select> </select>
<select id="getWarehouseList" resultMap="warehouseResultMap">
select id, code, name from spt_warehouse where is_deleted = 0
</select>
</mapper> </mapper>

@ -26,4 +26,14 @@ public interface IManufacturerInfoService extends BaseService<ManufacturerInfo>
IPage<ManufacturerInfoVO> selectManufacturerInfoPage(IPage<ManufacturerInfoVO> page, ManufacturerInfoVO manufacturerInfo); IPage<ManufacturerInfoVO> selectManufacturerInfoPage(IPage<ManufacturerInfoVO> page, ManufacturerInfoVO manufacturerInfo);
List<ManufacturerInfoExcel> export(ManufacturerInfoVO manufacturerInfoVO); List<ManufacturerInfoExcel> export(ManufacturerInfoVO manufacturerInfoVO);
/**
* 获取制造商
*/
List<ManufacturerInfo> getNoList();
/**
* 获取制造商信息
*/
ManufacturerInfo getDetail(String creditCode);
} }

@ -5,6 +5,8 @@ import org.energy.modules.spares.vo.MaterialClassCodeVO;
import com.dayu.daf.core.mp.base.BaseService; import com.dayu.daf.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
/** /**
* 物资分类码 服务类 * 物资分类码 服务类
* *
@ -22,4 +24,9 @@ public interface IMaterialClassCodeService extends BaseService<MaterialClassCode
*/ */
IPage<MaterialClassCodeVO> selectMaterialClassCodePage(IPage<MaterialClassCodeVO> page, MaterialClassCodeVO materialClassCode); IPage<MaterialClassCodeVO> selectMaterialClassCodePage(IPage<MaterialClassCodeVO> page, MaterialClassCodeVO materialClassCode);
/**
* 获取物资分类码
*/
List<String> getMaterialClassCodeList();
} }

@ -30,7 +30,7 @@ public interface IMaterialService extends BaseService<Material> {
/** /**
* 导出 * 导出
*/ */
List<MaterialExcel> exportData(Wrapper<Material> queryWrapper); List<MaterialExcel> exportData(Material material);
/** /**
* 获取物资编号 * 获取物资编号
@ -45,6 +45,8 @@ public interface IMaterialService extends BaseService<Material> {
/** /**
* 获取物资的信息 * 获取物资的信息
*/ */
Material getDetailList(String materialNo); MaterialVO getDetailList(String materialNo);
void updateNum(String materialNo, long num);
} }

@ -22,4 +22,9 @@ public interface IOutboundService extends BaseService<Outbound> {
*/ */
IPage<OutboundVO> selectOutboundPage(IPage<OutboundVO> page, OutboundVO outbound); IPage<OutboundVO> selectOutboundPage(IPage<OutboundVO> page, OutboundVO outbound);
/**
* 获取最大编号
*/
String getMaxNo(String materialNo);
} }

@ -26,4 +26,14 @@ public interface ISupplierInfoService extends BaseService<SupplierInfo> {
IPage<SupplierInfoVO> selectSupplierInfoPage(IPage<SupplierInfoVO> page, SupplierInfoVO supplierInfo); IPage<SupplierInfoVO> selectSupplierInfoPage(IPage<SupplierInfoVO> page, SupplierInfoVO supplierInfo);
List<SupplierInfoExcel> export(SupplierInfoVO supplierInfo); List<SupplierInfoExcel> export(SupplierInfoVO supplierInfo);
/**
* 获取制造商
*/
List<SupplierInfo> getNoList();
/**
* 获取制造商信息
*/
SupplierInfo getDetail(String creditCode);
} }

@ -27,4 +27,6 @@ public interface IWarehouseService extends BaseService<Warehouse> {
List<WarehouseExcel> export(WarehouseVO warehouseVO); List<WarehouseExcel> export(WarehouseVO warehouseVO);
List<Warehouse> getWarehouseList();
} }

@ -3,7 +3,6 @@ package org.energy.modules.spares.service.impl;
import io.micrometer.core.instrument.util.StringUtils; import io.micrometer.core.instrument.util.StringUtils;
import org.energy.modules.spares.entity.ManufacturerInfo; import org.energy.modules.spares.entity.ManufacturerInfo;
import org.energy.modules.spares.excel.ManufacturerInfoExcel; import org.energy.modules.spares.excel.ManufacturerInfoExcel;
import org.energy.modules.spares.excel.MaterialClassExcel;
import org.energy.modules.spares.vo.ManufacturerInfoVO; import org.energy.modules.spares.vo.ManufacturerInfoVO;
import org.energy.modules.spares.mapper.ManufacturerInfoMapper; import org.energy.modules.spares.mapper.ManufacturerInfoMapper;
import org.energy.modules.spares.service.IManufacturerInfoService; import org.energy.modules.spares.service.IManufacturerInfoService;
@ -42,4 +41,16 @@ public class ManufacturerInfoServiceImpl extends BaseServiceImpl<ManufacturerInf
return list; return list;
} }
@Override
public List<ManufacturerInfo> getNoList() {
List<ManufacturerInfo> list = baseMapper.getNoList();
return list;
}
@Override
public ManufacturerInfo getDetail(String creditCode) {
ManufacturerInfo detail = baseMapper.getDetail(creditCode);
return detail;
}
} }

@ -8,6 +8,8 @@ import com.dayu.daf.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
/** /**
* 物资分类码 服务实现类 * 物资分类码 服务实现类
* *
@ -22,4 +24,12 @@ public class MaterialClassCodeServiceImpl extends BaseServiceImpl<MaterialClassC
return page.setRecords(baseMapper.selectMaterialClassCodePage(page, materialClassCode)); return page.setRecords(baseMapper.selectMaterialClassCodePage(page, materialClassCode));
} }
/**
* 获取物资分类码
*/
@Override
public List<String> getMaterialClassCodeList() {
return baseMapper.getMaterialClassCodeList();
}
} }

@ -1,6 +1,7 @@
package org.energy.modules.spares.service.impl; package org.energy.modules.spares.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.dayu.daf.core.mp.support.Condition;
import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.inspection.entity.InspectionRoute;
import org.energy.modules.inspection.excel.InspectionRouteExcel; import org.energy.modules.inspection.excel.InspectionRouteExcel;
import org.energy.modules.spares.entity.Material; import org.energy.modules.spares.entity.Material;
@ -29,8 +30,8 @@ public class MaterialServiceImpl extends BaseServiceImpl<MaterialMapper, Materia
} }
@Override @Override
public List<MaterialExcel> exportData(Wrapper<Material> queryWrapper) { public List<MaterialExcel> exportData(Material material) {
List<MaterialExcel> list = baseMapper.exportData(queryWrapper); List<MaterialExcel> list = baseMapper.exportData(material);
return list; return list;
} }
@ -47,9 +48,18 @@ public class MaterialServiceImpl extends BaseServiceImpl<MaterialMapper, Materia
} }
@Override @Override
public Material getDetailList(String materialNo) { public MaterialVO getDetailList(String materialNo) {
Material DetailList = baseMapper.getDetailList(materialNo); MaterialVO DetailList = baseMapper.getDetailList(materialNo);
return DetailList; return DetailList;
} }
@Override
public void updateNum(String materialNo, long num) {
Material sel = new Material();
sel.setMaterialNo(materialNo);
Material entity = getOne(Condition.getQueryWrapper(sel));
entity.setInventoryCount(entity.getInventoryCount() + num);
updateById(entity);
}
} }

@ -22,4 +22,10 @@ public class OutboundServiceImpl extends BaseServiceImpl<OutboundMapper, Outboun
return page.setRecords(baseMapper.selectOutboundPage(page, outbound)); return page.setRecords(baseMapper.selectOutboundPage(page, outbound));
} }
@Override
public String getMaxNo(String materialNo){
String maxNo = baseMapper.getMaxNo(materialNo);
return maxNo;
}
} }

@ -41,4 +41,16 @@ public class SupplierInfoServiceImpl extends BaseServiceImpl<SupplierInfoMapper,
return list; return list;
} }
@Override
public List<SupplierInfo> getNoList() {
List<SupplierInfo> list = baseMapper.getNoList();
return list;
}
@Override
public SupplierInfo getDetail(String creditCode) {
SupplierInfo detail = baseMapper.getDetail(creditCode);
return detail;
}
} }

@ -42,4 +42,9 @@ public class WarehouseServiceImpl extends BaseServiceImpl<WarehouseMapper, Wareh
return list; return list;
} }
@Override
public List<Warehouse> getWarehouseList() {
List<Warehouse> list = baseMapper.getWarehouseList();
return list;
}
} }

@ -17,14 +17,8 @@ import io.swagger.annotations.ApiModel;
public class MaterialVO extends Material { public class MaterialVO extends Material {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
// 物资名称
private static final String materialName = "";
// 规格模型
private static final String model = "";
// 仓库名 // 仓库名
private static final String warehouseName = ""; private String warehouseName;

Loading…
Cancel
Save