renfan
/
charging_pile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【admin】新增&优化#1、常见故障管理 2、常见维修结论描述 3、常见检修结论描述 4、优化配件领用，增加领用审核、发货、收货

dev
renfan 2024-08-10 21:09:59 +08:00
parent 2364db9fa8
commit 0047457806
51 changed files with 2746 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
admin/src/main/java/com/hcy/admin/controller/CommonMaintenance/CommonMaintenanceController.java 100644
View File

@ -0,0 +1,111 @@
package com.hcy.admin.controller.CommonMaintenance;
import com.hcy.admin.config.aop.Log;
import com.hcy.admin.service.CommonMaintenance.ICommonMaintenanceService;
import com.hcy.admin.validate.CommonMaintenance.CommonMaintenanceParam;
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceListVo;
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceDetailVo;
import com.hcy.common.core.AjaxResult;
import com.hcy.common.core.PageResult;
import com.hcy.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
/**
* 常见维修结论描述管理
*/
@RestController
@RequestMapping("api/CommonMaintenance")
public class CommonMaintenanceController {
@Resource
ICommonMaintenanceService iCommonMaintenanceService;
/**
* 常见维修结论描述列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<CommonMaintenanceListVo> list = iCommonMaintenanceService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 常见维修结论描述详情
*
* @author hcy
* @param id 主键ID
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
CommonMaintenanceDetailVo detail = iCommonMaintenanceService.detail(id);
return AjaxResult.success(detail);
}
/**
* 常见维修结论描述新增
*
* @author hcy
* @param commonMaintenanceParam 参数
* @return Object
*/
@Log(title = "常见维修结论描述新增")
@PostMapping("/add")
public Object add(@Validated(value = CommonMaintenanceParam.create.class) @RequestBody CommonMaintenanceParam commonMaintenanceParam) {
iCommonMaintenanceService.add(commonMaintenanceParam);
return AjaxResult.success();
}
/**
* 常见维修结论描述编辑
*
* @author hcy
* @param commonMaintenanceParam 参数
* @return Object
*/
@Log(title = "常见维修结论描述编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = CommonMaintenanceParam.update.class) @RequestBody CommonMaintenanceParam commonMaintenanceParam) {
iCommonMaintenanceService.edit(commonMaintenanceParam);
return AjaxResult.success();
}
/**
* 常见维修结论描述删除
*
* @author hcy
* @param commonMaintenanceParam 参数
* @return Object
*/
@Log(title = "常见维修结论描述删除")
@PostMapping("/del")
public Object del(@Validated(value = CommonMaintenanceParam.delete.class) @RequestBody CommonMaintenanceParam commonMaintenanceParam) {
iCommonMaintenanceService.del(Math.toIntExact(commonMaintenanceParam.getId()));
return AjaxResult.success();
}
/**
* 常见故障管理改变状态
*
* @author hcy
* @param commonMaintenanceParam 参数
* @return Object
*/
@Log(title = "常见故障管理改变状态")
@PostMapping("/stateEdit")
public Object stateEdit(@RequestBody CommonMaintenanceParam commonMaintenanceParam) {
iCommonMaintenanceService.stateEdit(commonMaintenanceParam);
return AjaxResult.success();
}
}

111
admin/src/main/java/com/hcy/admin/controller/CommonOverhaul/CommonOverhaulController.java 100644
View File

@ -0,0 +1,111 @@
package com.hcy.admin.controller.CommonOverhaul;
import com.hcy.admin.config.aop.Log;
import com.hcy.admin.service.CommonOverhaul.ICommonOverhaulService;
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulListVo;
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulDetailVo;
import com.hcy.common.core.AjaxResult;
import com.hcy.common.core.PageResult;
import com.hcy.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
/**
* 常见检修结论描述管理
*/
@RestController
@RequestMapping("api/CommonOverhaul")
public class CommonOverhaulController {
@Resource
ICommonOverhaulService iCommonOverhaulService;
/**
* 常见检修结论描述列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<CommonOverhaulListVo> list = iCommonOverhaulService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 常见检修结论描述详情
*
* @author hcy
* @param id 主键ID
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
CommonOverhaulDetailVo detail = iCommonOverhaulService.detail(id);
return AjaxResult.success(detail);
}
/**
* 常见检修结论描述新增
*
* @author hcy
* @param commonOverhaulParam 参数
* @return Object
*/
@Log(title = "常见检修结论描述新增")
@PostMapping("/add")
public Object add(@Validated(value = CommonOverhaulParam.create.class) @RequestBody CommonOverhaulParam commonOverhaulParam) {
iCommonOverhaulService.add(commonOverhaulParam);
return AjaxResult.success();
}
/**
* 常见检修结论描述编辑
*
* @author hcy
* @param commonOverhaulParam 参数
* @return Object
*/
@Log(title = "常见检修结论描述编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = CommonOverhaulParam.update.class) @RequestBody CommonOverhaulParam commonOverhaulParam) {
iCommonOverhaulService.edit(commonOverhaulParam);
return AjaxResult.success();
}
/**
* 常见检修结论描述删除
*
* @author hcy
* @param commonOverhaulParam 参数
* @return Object
*/
@Log(title = "常见检修结论描述删除")
@PostMapping("/del")
public Object del(@Validated(value = CommonOverhaulParam.delete.class) @RequestBody CommonOverhaulParam commonOverhaulParam) {
iCommonOverhaulService.del(Math.toIntExact(commonOverhaulParam.getId()));
return AjaxResult.success();
}
/**
* 常见故障管理改变状态
*
* @author hcy
* @param commonOverhaulParam 参数
* @return Object
*/
@Log(title = "常见故障管理改变状态")
@PostMapping("/stateEdit")
public Object stateEdit(@RequestBody CommonOverhaulParam commonOverhaulParam) {
iCommonOverhaulService.stateEdit(commonOverhaulParam);
return AjaxResult.success();
}
}

110
admin/src/main/java/com/hcy/admin/controller/commonFault/CommonFaultController.java 100644
View File

@ -0,0 +1,110 @@
package com.hcy.admin.controller.commonFault;
import com.hcy.admin.config.aop.Log;
import com.hcy.admin.service.commonFault.ICommonFaultService;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.vo.commonFault.CommonFaultListVo;
import com.hcy.admin.vo.commonFault.CommonFaultDetailVo;
import com.hcy.common.core.AjaxResult;
import com.hcy.common.core.PageResult;
import com.hcy.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
/**
* 常见故障管理管理
*/
@RestController
@RequestMapping("api/commonFault")
public class CommonFaultController {
@Resource
ICommonFaultService iCommonFaultService;
/**
* 常见故障管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<CommonFaultListVo> list = iCommonFaultService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 常见故障管理详情
*
* @author hcy
* @param id 主键ID
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
CommonFaultDetailVo detail = iCommonFaultService.detail(id);
return AjaxResult.success(detail);
}
/**
* 常见故障管理新增
*
* @author hcy
* @param commonFaultParam 参数
* @return Object
*/
@Log(title = "常见故障管理新增")
@PostMapping("/add")
public Object add(@Validated(value = CommonFaultParam.create.class) @RequestBody CommonFaultParam commonFaultParam) {
iCommonFaultService.add(commonFaultParam);
return AjaxResult.success();
}
/**
* 常见故障管理编辑
*
* @author hcy
* @param commonFaultParam 参数
* @return Object
*/
@Log(title = "常见故障管理编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = CommonFaultParam.update.class) @RequestBody CommonFaultParam commonFaultParam) {
iCommonFaultService.edit(commonFaultParam);
return AjaxResult.success();
}
/**
* 常见故障管理删除
*
* @author hcy
* @param commonFaultParam 参数
* @return Object
*/
@Log(title = "常见故障管理删除")
@PostMapping("/del")
public Object del(@Validated(value = CommonFaultParam.delete.class) @RequestBody CommonFaultParam commonFaultParam) {
iCommonFaultService.del(Math.toIntExact(commonFaultParam.getId()));
return AjaxResult.success();
}
/**
* 常见故障管理改变状态
*
* @author hcy
* @param commonFaultParam 参数
* @return Object
*/
@Log(title = "常见故障管理改变状态")
@PostMapping("/stateEdit")
public Object stateEdit(@RequestBody CommonFaultParam commonFaultParam) {
iCommonFaultService.stateEdit(commonFaultParam);
return AjaxResult.success();
}
}

97
admin/src/main/java/com/hcy/admin/controller/plant/PlantController.java 100644
View File

@ -0,0 +1,97 @@
package com.hcy.admin.controller.plant;
import com.hcy.admin.config.aop.Log;
import com.hcy.admin.service.plant.IPlantService;
import com.hcy.admin.validate.plant.PlantParam;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.vo.plant.PlantListVo;
import com.hcy.admin.vo.plant.PlantDetailVo;
import com.hcy.common.core.AjaxResult;
import com.hcy.common.core.PageResult;
import com.hcy.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
/**
* 工厂管理管理
*/
@RestController
@RequestMapping("api/plant")
public class PlantController {
@Resource
IPlantService iPlantService;
/**
* 工厂管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<PlantListVo> list = iPlantService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 工厂管理详情
*
* @author hcy
* @param id 主键ID
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
PlantDetailVo detail = iPlantService.detail(id);
return AjaxResult.success(detail);
}
/**
* 工厂管理新增
*
* @author hcy
* @param plantParam 参数
* @return Object
*/
@Log(title = "工厂管理新增")
@PostMapping("/add")
public Object add(@Validated(value = PlantParam.create.class) @RequestBody PlantParam plantParam) {
iPlantService.add(plantParam);
return AjaxResult.success();
}
/**
* 工厂管理编辑
*
* @author hcy
* @param plantParam 参数
* @return Object
*/
@Log(title = "工厂管理编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = PlantParam.update.class) @RequestBody PlantParam plantParam) {
iPlantService.edit(plantParam);
return AjaxResult.success();
}
/**
* 工厂管理删除
*
* @author hcy
* @param plantParam 参数
* @return Object
*/
@Log(title = "工厂管理删除")
@PostMapping("/del")
public Object del(@Validated(value = PlantParam.delete.class) @RequestBody PlantParam plantParam) {
iPlantService.del(Math.toIntExact(plantParam.getId()));
return AjaxResult.success();
}
}

111
admin/src/main/java/com/hcy/admin/controller/scrapType/ScrapTypeController.java 100644
View File

@ -0,0 +1,111 @@
package com.hcy.admin.controller.scrapType;
import com.hcy.admin.config.aop.Log;
import com.hcy.admin.service.ScrapType.IScrapTypeService;
import com.hcy.admin.validate.ScrapType.ScrapTypeParam;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.vo.ScrapType.ScrapTypeListVo;
import com.hcy.admin.vo.ScrapType.ScrapTypeDetailVo;
import com.hcy.common.core.AjaxResult;
import com.hcy.common.core.PageResult;
import com.hcy.common.validator.annotation.IDMust;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
/**
* 报废类型管理管理
*/
@RestController
@RequestMapping("api/ScrapType")
public class ScrapTypeController {
@Resource
IScrapTypeService iScrapTypeService;
/**
* 报废类型管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return Object
*/
@GetMapping("/list")
public Object list(@Validated PageParam pageParam,
@RequestParam Map<String, String> params) {
PageResult<ScrapTypeListVo> list = iScrapTypeService.list(pageParam, params);
return AjaxResult.success(list);
}
/**
* 报废类型管理详情
*
* @author hcy
* @param id 主键ID
* @return Object
*/
@GetMapping("/detail")
public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
ScrapTypeDetailVo detail = iScrapTypeService.detail(id);
return AjaxResult.success(detail);
}
/**
* 报废类型管理新增
*
* @author hcy
* @param scrapTypeParam 参数
* @return Object
*/
@Log(title = "报废类型管理新增")
@PostMapping("/add")
public Object add(@Validated(value = ScrapTypeParam.create.class) @RequestBody ScrapTypeParam scrapTypeParam) {
iScrapTypeService.add(scrapTypeParam);
return AjaxResult.success();
}
/**
* 报废类型管理编辑
*
* @author hcy
* @param scrapTypeParam 参数
* @return Object
*/
@Log(title = "报废类型管理编辑")
@PostMapping("/edit")
public Object edit(@Validated(value = ScrapTypeParam.update.class) @RequestBody ScrapTypeParam scrapTypeParam) {
iScrapTypeService.edit(scrapTypeParam);
return AjaxResult.success();
}
/**
* 报废类型管理删除
*
* @author hcy
* @param scrapTypeParam 参数
* @return Object
*/
@Log(title = "报废类型管理删除")
@PostMapping("/del")
public Object del(@Validated(value = ScrapTypeParam.delete.class) @RequestBody ScrapTypeParam scrapTypeParam) {
iScrapTypeService.del(Math.toIntExact(scrapTypeParam.getId()));
return AjaxResult.success();
}
/**
* 常见故障管理改变状态
*
* @author hcy
* @param scrapTypeParam 参数
* @return Object
*/
@Log(title = "常见故障管理改变状态")
@PostMapping("/stateEdit")
public Object stateEdit(@RequestBody ScrapTypeParam scrapTypeParam) {
iScrapTypeService.stateEdit(scrapTypeParam);
return AjaxResult.success();
}
}

39
admin/src/main/java/com/hcy/admin/controller/sparePartReceive/SparePartReceiveController.java
View File

@ -95,4 +95,43 @@ public class SparePartReceiveController {
return AjaxResult.success();
}
/**
* 备件领用审核
* @param sparePartStockAuditParam
* @return
*/
@Log(title = "备件领用审核")
@PostMapping("/receiveAudit")
public Object receiveAudit(@RequestBody SparePartStockAuditParam sparePartStockAuditParam) {
iSparePartReceiveService.receiveAudit(sparePartStockAuditParam);
return AjaxResult.success();
}
/**
* 备件领用发送
*
* @author hcy
* @param sparePartStockAuditParam 参数
* @return Object
*/
@Log(title = "备件领用发送")
@PostMapping("/logisticsSending")
public Object logisticsSending(@RequestBody SparePartStockAuditParam sparePartStockAuditParam) {
iSparePartReceiveService.logisticsSending(sparePartStockAuditParam);
return AjaxResult.success();
}
/**
* 备件领用收货
*
* @author hcy
* @param sparePartStockAuditParam 参数
* @return Object
*/
@Log(title = "备件领用收货")
@PostMapping("/receiving")
public Object receiving(@RequestBody SparePartStockAuditParam sparePartStockAuditParam) {
iSparePartReceiveService.receiving(sparePartStockAuditParam);
return AjaxResult.success();
}
}

64
admin/src/main/java/com/hcy/admin/service/CommonMaintenance/ICommonMaintenanceService.java 100644
View File

@ -0,0 +1,64 @@
package com.hcy.admin.service.CommonMaintenance;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.CommonMaintenance.CommonMaintenanceParam;
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceListVo;
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceDetailVo;
import com.hcy.common.core.PageResult;
import java.util.Map;
/**
* 常见维修结论描述服务接口类
*/
public interface ICommonMaintenanceService {
/**
* 常见维修结论描述列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<CommonMaintenanceVo>
*/
PageResult<CommonMaintenanceListVo> list(PageParam pageParam, Map<String, String> params);
/**
* 常见维修结论描述详情
*
* @author hcy
* @param id 主键ID
* @return CommonMaintenance
*/
CommonMaintenanceDetailVo detail(Integer id);
/**
* 常见维修结论描述新增
*
* @author hcy
* @param commonMaintenanceParam 参数
*/
void add(CommonMaintenanceParam commonMaintenanceParam);
/**
* 常见维修结论描述编辑
*
* @author hcy
* @param commonMaintenanceParam 参数
*/
void edit(CommonMaintenanceParam commonMaintenanceParam);
/**
* 常见维修结论描述删除
*
* @author hcy
* @param id 主键ID
*/
void del(Integer id);
/**
* 常见故障管理改变状态
* @param commonMaintenanceParam
*/
void stateEdit(CommonMaintenanceParam commonMaintenanceParam);
}

182
admin/src/main/java/com/hcy/admin/service/CommonMaintenance/impl/CommonMaintenanceServiceImpl.java 100644
View File

@ -0,0 +1,182 @@
package com.hcy.admin.service.CommonMaintenance.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hcy.admin.service.CommonMaintenance.ICommonMaintenanceService;
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.CommonMaintenance.CommonMaintenanceParam;
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceListVo;
import com.hcy.admin.vo.CommonMaintenance.CommonMaintenanceDetailVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.CommonMaintenance.CommonMaintenance;
import com.hcy.common.entity.CommonOverhaul.CommonOverhaul;
import com.hcy.common.enums.commonFault.CommonFaultEnum;
import com.hcy.common.mapper.CommonMaintenance.CommonMaintenanceMapper;
import com.hcy.common.utils.ArrayUtil;
import com.hcy.common.utils.TimeUtil;
import com.hcy.common.utils.UrlUtil;
import com.hcy.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import javax.annotation.Resource;
import java.util.*;
/**
* 常见维修结论描述实现类
*/
@Service
public class CommonMaintenanceServiceImpl implements ICommonMaintenanceService {
@Resource
CommonMaintenanceMapper commonMaintenanceMapper;
/**
* 常见维修结论描述列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<CommonMaintenanceListVo>
*/
@Override
public PageResult<CommonMaintenanceListVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<CommonMaintenance> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
commonMaintenanceMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
"=:accountStatus@account_status:int",
});
IPage<CommonMaintenance> iPage = commonMaintenanceMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<CommonMaintenanceListVo> list = new LinkedList<>();
for(CommonMaintenance item : iPage.getRecords()) {
CommonMaintenanceListVo vo = new CommonMaintenanceListVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 常见维修结论描述详情
*
* @author hcy
* @param id 主键参数
* @return CommonMaintenance
*/
@Override
public CommonMaintenanceDetailVo detail(Integer id) {
CommonMaintenance model = commonMaintenanceMapper.selectOne(
new QueryWrapper<CommonMaintenance>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在");
CommonMaintenanceDetailVo vo = new CommonMaintenanceDetailVo();
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
BeanUtils.copyProperties(model, vo);
return vo;
}
/**
* 常见维修结论描述新增
*
* @author hcy
* @param commonMaintenanceParam 参数
*/
@Override
public void add(CommonMaintenanceParam commonMaintenanceParam) {
CommonMaintenance model = new CommonMaintenance();
model.setName(commonMaintenanceParam.getName());
model.setSort(commonMaintenanceParam.getSort());
model.setDescription(commonMaintenanceParam.getDescription());
model.setAccountStatus(commonMaintenanceParam.getAccountStatus());
model.setCreateTime(System.currentTimeMillis() / 1000);
commonMaintenanceMapper.insert(model);
}
/**
* 常见维修结论描述编辑
*
* @author hcy
* @param commonMaintenanceParam 参数
*/
@Override
public void edit(CommonMaintenanceParam commonMaintenanceParam) {
CommonMaintenance model = commonMaintenanceMapper.selectOne(
new QueryWrapper<CommonMaintenance>()
.eq("id", commonMaintenanceParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setId(commonMaintenanceParam.getId());
model.setName(commonMaintenanceParam.getName());
model.setSort(commonMaintenanceParam.getSort());
model.setDescription(commonMaintenanceParam.getDescription());
model.setAccountStatus(commonMaintenanceParam.getAccountStatus());
commonMaintenanceMapper.updateById(model);
}
/**
* 常见维修结论描述删除
*
* @author hcy
* @param id 主键ID
*/
@Override
public void del(Integer id) {
CommonMaintenance model = commonMaintenanceMapper.selectOne(
new QueryWrapper<CommonMaintenance>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
commonMaintenanceMapper.updateById(model);
}
/**
* 常见故障管理改变状态
*
* @param commonMaintenanceParam
*/
@Override
public void stateEdit(CommonMaintenanceParam commonMaintenanceParam) {
CommonMaintenance model = commonMaintenanceMapper.selectOne(
new QueryWrapper<CommonMaintenance>()
.eq("id", commonMaintenanceParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
}else{
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
}
model.setUpdateTime(System.currentTimeMillis() / 1000);
commonMaintenanceMapper.updateById(model);
}
}

65
admin/src/main/java/com/hcy/admin/service/CommonOverhaul/ICommonOverhaulService.java 100644
View File

@ -0,0 +1,65 @@
package com.hcy.admin.service.CommonOverhaul;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulListVo;
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulDetailVo;
import com.hcy.common.core.PageResult;
import java.util.Map;
/**
* 常见检修结论描述服务接口类
*/
public interface ICommonOverhaulService {
/**
* 常见检修结论描述列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<CommonOverhaulVo>
*/
PageResult<CommonOverhaulListVo> list(PageParam pageParam, Map<String, String> params);
/**
* 常见检修结论描述详情
*
* @author hcy
* @param id 主键ID
* @return CommonOverhaul
*/
CommonOverhaulDetailVo detail(Integer id);
/**
* 常见检修结论描述新增
*
* @author hcy
* @param commonOverhaulParam 参数
*/
void add(CommonOverhaulParam commonOverhaulParam);
/**
* 常见检修结论描述编辑
*
* @author hcy
* @param commonOverhaulParam 参数
*/
void edit(CommonOverhaulParam commonOverhaulParam);
/**
* 常见检修结论描述删除
*
* @author hcy
* @param id 主键ID
*/
void del(Integer id);
/**
* 常见故障管理改变状态
* @param commonOverhaulParam
*/
void stateEdit(CommonOverhaulParam commonOverhaulParam);
}

183
admin/src/main/java/com/hcy/admin/service/CommonOverhaul/impl/CommonOverhaulServiceImpl.java 100644
View File

@ -0,0 +1,183 @@
package com.hcy.admin.service.CommonOverhaul.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hcy.admin.service.CommonOverhaul.ICommonOverhaulService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.CommonOverhaul.CommonOverhaulParam;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulListVo;
import com.hcy.admin.vo.CommonOverhaul.CommonOverhaulDetailVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.CommonOverhaul.CommonOverhaul;
import com.hcy.common.entity.commonFault.CommonFault;
import com.hcy.common.enums.commonFault.CommonFaultEnum;
import com.hcy.common.mapper.CommonOverhaul.CommonOverhaulMapper;
import com.hcy.common.utils.ArrayUtil;
import com.hcy.common.utils.TimeUtil;
import com.hcy.common.utils.UrlUtil;
import com.hcy.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import javax.annotation.Resource;
import java.util.*;
/**
* 常见检修结论描述实现类
*/
@Service
public class CommonOverhaulServiceImpl implements ICommonOverhaulService {
@Resource
CommonOverhaulMapper commonOverhaulMapper;
/**
* 常见检修结论描述列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<CommonOverhaulListVo>
*/
@Override
public PageResult<CommonOverhaulListVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<CommonOverhaul> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
commonOverhaulMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
"=:accountStatus@account_status:int",
});
IPage<CommonOverhaul> iPage = commonOverhaulMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<CommonOverhaulListVo> list = new LinkedList<>();
for(CommonOverhaul item : iPage.getRecords()) {
CommonOverhaulListVo vo = new CommonOverhaulListVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 常见检修结论描述详情
*
* @author hcy
* @param id 主键参数
* @return CommonOverhaul
*/
@Override
public CommonOverhaulDetailVo detail(Integer id) {
CommonOverhaul model = commonOverhaulMapper.selectOne(
new QueryWrapper<CommonOverhaul>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在");
CommonOverhaulDetailVo vo = new CommonOverhaulDetailVo();
BeanUtils.copyProperties(model, vo);
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
return vo;
}
/**
* 常见检修结论描述新增
*
* @author hcy
* @param commonOverhaulParam 参数
*/
@Override
public void add(CommonOverhaulParam commonOverhaulParam) {
CommonOverhaul model = new CommonOverhaul();
model.setName(commonOverhaulParam.getName());
model.setSort(commonOverhaulParam.getSort());
model.setDescription(commonOverhaulParam.getDescription());
model.setAccountStatus(commonOverhaulParam.getAccountStatus());
model.setCreateTime(System.currentTimeMillis() / 1000);
commonOverhaulMapper.insert(model);
}
/**
* 常见检修结论描述编辑
*
* @author hcy
* @param commonOverhaulParam 参数
*/
@Override
public void edit(CommonOverhaulParam commonOverhaulParam) {
CommonOverhaul model = commonOverhaulMapper.selectOne(
new QueryWrapper<CommonOverhaul>()
.eq("id", commonOverhaulParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setId(commonOverhaulParam.getId());
model.setName(commonOverhaulParam.getName());
model.setSort(commonOverhaulParam.getSort());
model.setDescription(commonOverhaulParam.getDescription());
model.setAccountStatus(commonOverhaulParam.getAccountStatus());
model.setUpdateTime(TimeUtil.dateToTimestamp(commonOverhaulParam.getUpdateTime()));
commonOverhaulMapper.updateById(model);
}
/**
* 常见检修结论描述删除
*
* @author hcy
* @param id 主键ID
*/
@Override
public void del(Integer id) {
CommonOverhaul model = commonOverhaulMapper.selectOne(
new QueryWrapper<CommonOverhaul>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
commonOverhaulMapper.updateById(model);
}
/**
* 常见故障管理改变状态
*
* @param commonOverhaulParam
*/
@Override
public void stateEdit(CommonOverhaulParam commonOverhaulParam) {
CommonOverhaul model = commonOverhaulMapper.selectOne(
new QueryWrapper<CommonOverhaul>()
.eq("id", commonOverhaulParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
}else{
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
}
model.setUpdateTime(System.currentTimeMillis() / 1000);
commonOverhaulMapper.updateById(model);
}
}

64
admin/src/main/java/com/hcy/admin/service/ScrapType/IScrapTypeService.java 100644
View File

@ -0,0 +1,64 @@
package com.hcy.admin.service.ScrapType;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.ScrapType.ScrapTypeParam;
import com.hcy.admin.vo.ScrapType.ScrapTypeListVo;
import com.hcy.admin.vo.ScrapType.ScrapTypeDetailVo;
import com.hcy.common.core.PageResult;
import java.util.Map;
/**
* 报废类型管理服务接口类
*/
public interface IScrapTypeService {
/**
* 报废类型管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<ScrapTypeVo>
*/
PageResult<ScrapTypeListVo> list(PageParam pageParam, Map<String, String> params);
/**
* 报废类型管理详情
*
* @author hcy
* @param id 主键ID
* @return ScrapType
*/
ScrapTypeDetailVo detail(Integer id);
/**
* 报废类型管理新增
*
* @author hcy
* @param scrapTypeParam 参数
*/
void add(ScrapTypeParam scrapTypeParam);
/**
* 报废类型管理编辑
*
* @author hcy
* @param scrapTypeParam 参数
*/
void edit(ScrapTypeParam scrapTypeParam);
/**
* 报废类型管理删除
*
* @author hcy
* @param id 主键ID
*/
void del(Integer id);
/**
* 常见故障管理改变状态
* @param scrapTypeParam
*/
void stateEdit(ScrapTypeParam scrapTypeParam);
}

183
admin/src/main/java/com/hcy/admin/service/ScrapType/impl/ScrapTypeServiceImpl.java 100644
View File

@ -0,0 +1,183 @@
package com.hcy.admin.service.ScrapType.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hcy.admin.service.ScrapType.IScrapTypeService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.ScrapType.ScrapTypeParam;
import com.hcy.admin.vo.ScrapType.ScrapTypeListVo;
import com.hcy.admin.vo.ScrapType.ScrapTypeDetailVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.ScrapType.ScrapType;
import com.hcy.common.entity.commonFault.CommonFault;
import com.hcy.common.enums.commonFault.CommonFaultEnum;
import com.hcy.common.mapper.ScrapType.ScrapTypeMapper;
import com.hcy.common.utils.ArrayUtil;
import com.hcy.common.utils.TimeUtil;
import com.hcy.common.utils.UrlUtil;
import com.hcy.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import javax.annotation.Resource;
import java.util.*;
/**
* 报废类型管理实现类
*/
@Service
public class ScrapTypeServiceImpl implements IScrapTypeService {
@Resource
ScrapTypeMapper scrapTypeMapper;
/**
* 报废类型管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<ScrapTypeListVo>
*/
@Override
public PageResult<ScrapTypeListVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<ScrapType> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
scrapTypeMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
"=:accountStatus@account_status:int",
});
IPage<ScrapType> iPage = scrapTypeMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<ScrapTypeListVo> list = new LinkedList<>();
for(ScrapType item : iPage.getRecords()) {
ScrapTypeListVo vo = new ScrapTypeListVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 报废类型管理详情
*
* @author hcy
* @param id 主键参数
* @return ScrapType
*/
@Override
public ScrapTypeDetailVo detail(Integer id) {
ScrapType model = scrapTypeMapper.selectOne(
new QueryWrapper<ScrapType>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在");
ScrapTypeDetailVo vo = new ScrapTypeDetailVo();
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
BeanUtils.copyProperties(model, vo);
return vo;
}
/**
* 报废类型管理新增
*
* @author hcy
* @param scrapTypeParam 参数
*/
@Override
public void add(ScrapTypeParam scrapTypeParam) {
ScrapType model = new ScrapType();
model.setName(scrapTypeParam.getName());
model.setSort(scrapTypeParam.getSort());
model.setDescription(scrapTypeParam.getDescription());
model.setAccountStatus(scrapTypeParam.getAccountStatus());
model.setCreateTime(System.currentTimeMillis() / 1000);
scrapTypeMapper.insert(model);
}
/**
* 报废类型管理编辑
*
* @author hcy
* @param scrapTypeParam 参数
*/
@Override
public void edit(ScrapTypeParam scrapTypeParam) {
ScrapType model = scrapTypeMapper.selectOne(
new QueryWrapper<ScrapType>()
.eq("id", scrapTypeParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setId(scrapTypeParam.getId());
model.setName(scrapTypeParam.getName());
model.setSort(scrapTypeParam.getSort());
model.setDescription(scrapTypeParam.getDescription());
model.setAccountStatus(scrapTypeParam.getAccountStatus());
model.setUpdateTime(System.currentTimeMillis() / 1000);
scrapTypeMapper.updateById(model);
}
/**
* 报废类型管理删除
*
* @author hcy
* @param id 主键ID
*/
@Override
public void del(Integer id) {
ScrapType model = scrapTypeMapper.selectOne(
new QueryWrapper<ScrapType>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
scrapTypeMapper.updateById(model);
}
/**
* 常见故障管理改变状态
*
* @param scrapTypeParam
*/
@Override
public void stateEdit(ScrapTypeParam scrapTypeParam) {
ScrapType model = scrapTypeMapper.selectOne(
new QueryWrapper<ScrapType>()
.eq("id", scrapTypeParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
}else{
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
}
model.setUpdateTime(System.currentTimeMillis() / 1000);
scrapTypeMapper.updateById(model);
}
}

17
admin/src/main/java/com/hcy/admin/service/SparePartReceive/ISparePartReceiveService.java
View File

@ -56,4 +56,21 @@ public interface ISparePartReceiveService {
*/
void del(Integer id);
/**
* 备件领用审核
* @param sparePartStockAuditParam
*/
void receiveAudit(SparePartStockAuditParam sparePartStockAuditParam);
/**
* 备件物流发送
* @param sparePartStockAuditParam
*/
void logisticsSending(SparePartStockAuditParam sparePartStockAuditParam);
/**
* 备件采购收货
* @param sparePartStockAuditParam
*/
void receiving(SparePartStockAuditParam sparePartStockAuditParam);
}

131
admin/src/main/java/com/hcy/admin/service/SparePartReceive/impl/SparePartReceiveServiceImpl.java
View File

@ -5,18 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hcy.admin.AdminThreadLocal;
import com.hcy.admin.service.SparePartReceive.ISparePartReceiveService;
import com.hcy.admin.service.sparePartOutWarehouse.ISparePartOutWarehouseService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo;
import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo;
import com.hcy.admin.vo.sparePartReceive.SparePartReceiveListVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
import com.hcy.common.entity.warehouse.Warehouse;
import com.hcy.common.enums.Audit.AuditStateEnum;
import com.hcy.common.enums.audit.AuditStateEnum;
import com.hcy.common.exception.OperateException;
import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper;
import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
@ -63,6 +62,7 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("receipt_type",1);
queryWrapper.eq("out_in_warehouse_type", 2);
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc("id");
@ -70,9 +70,11 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
"like:receiptNumber@receipt_number:str",
"like:workOrderId@work_order_id:str",
"like:recipient@recipient:str",
"=:deliveryMethod@delivery_method:int",
"datetime:handlingTimeStart-handlingTimeEnd@handling_time:str",
"=:purchaseStatus@purchase_status:int",
});
//领用时间范围，配送方式查询
IPage<SparePartStockAudit> iPage = sparePartStockAuditMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<SparePartReceiveListVo> list = new LinkedList<>();
for(SparePartStockAudit item : iPage.getRecords()) {
@ -193,9 +195,19 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
SparePartStockAudit sparePartStockAudit = sparePartStockAuditMapper.selectOne(qw);
if(sparePartStockAudit == null){
model.setId(1L);
}else{
Long id = sparePartStockAudit.getId() + 1;
SparePartStockAudit idModel = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
if(idModel != null){
model.setId(idModel.getId() + 1);
}else{
model.setId(sparePartStockAudit.getId() + 1);
}
}
model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 出库仓库
model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别 2=员工领料，3=销售出库）
@ -213,14 +225,11 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
model.setDeliveryMethod(sparePartStockAuditParam.getDeliveryMethod()); //配送方式（0=物流快递，1=上门取件，2=送货上门）
model.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus()); //状态 未审核
// 获取当前的用户
Object username = AdminThreadLocal.get("username");
model.setResponsiblePerson((String) username);
model.setHandlingTime(System.currentTimeMillis() / 1000); //经办时间
// 审核状态
model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
//单据类型（0=入库单，1=出库单，2=仓库调拨单）
model.setReceiptType(AuditStateEnum.OUTWAREHOUSE.getStatus());
@ -275,6 +284,9 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
model.setDeliveryMethod(sparePartStockAuditParam.getDeliveryMethod()); //配送方式（0=物流快递，1=上门取件，2=送货上门）
model.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus()); //状态 未审核
//单据类型（0=入库单，1=出库单，2=仓库调拨单）
model.setReceiptType(AuditStateEnum.OUTWAREHOUSE.getStatus());
List<SparePartAudit> sparePartAuditList = sparePartStockAuditParam.getSparePartAuditList();
// 使用StringBuilder来拼接id值
StringBuilder sb = new StringBuilder();
@ -310,16 +322,7 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
insertSparePartAudit.setUpdateTime(System.currentTimeMillis() / 1000);
sparePartAuditMapper.insert(insertSparePartAudit);//插入备件审核信息
}
//如果是已取消状态编辑改成未审核
if(model.getAuditState() == AuditStateEnum.CANCELED.getStatus()){
model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
}
//已审核，但不通过的，重新编辑之后状态也要变成未审核，审核结果改成空
if(model.getAuditState() == AuditStateEnum.AUDITED.getStatus()
&& model.getAuditResult() == AuditStateEnum.NOTPASS.getStatus()){
model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
model.setAuditResult(null);
}
sb.deleteCharAt(sb.length() - 1); // 删除最后一个逗号
model.setSparePartAuditId(String.valueOf(sb));// 备件审核id
model.setUpdateTime(System.currentTimeMillis() / 1000);
@ -347,6 +350,100 @@ public class SparePartReceiveServiceImpl implements ISparePartReceiveService {
sparePartStockAuditMapper.updateById(model);
}
/**
* 备件领用审核
*
* @param sparePartStockAuditParam
*/
@Override
public void receiveAudit(SparePartStockAuditParam sparePartStockAuditParam) {
SparePartStockAudit model = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", sparePartStockAuditParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setPurchaseStatus(sparePartStockAuditParam.getPurchaseStatus()); // 配件领用状态 1=未通过，2=待管理员审核
model.setPurchaseIdea(sparePartStockAuditParam.getPurchaseIdea()); // 采购意见
// 出库时需要判断库存数量是否大于出库数量，大于才允许出库；反之，提示备件库存数量不足
//获取待审核备件信息
List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
new QueryWrapper<SparePartAudit>()
.eq("stock_audit_id", model.getId())
.eq("is_delete", 0)
);
System.out.println("单据类型" + model.getReceiptType());
System.out.println(model.getPurchaseStatus());
if(model.getReceiptType() == AuditStateEnum.OUTWAREHOUSE.getStatus()
&& model.getPurchaseStatus() == AuditStateEnum.CHECKPENDING.getStatus()){
// 通过审核的出库单
//获取备件信息
for (SparePartAudit sparePartAudit : stockAuditId) {
SparePart sparePart = sparePartMapper.selectOne(
new QueryWrapper<SparePart>()
.eq("id", sparePartAudit.getSparePartsId())
.eq("is_delete", 0)
.last("limit 1"));
// 出库时需要判断库存数量是否大于出库数量，大于才允许出库；反之，提示备件库存数量不足
if(sparePart.getQuantity() >= sparePartAudit.getCount()){
model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
}else{
throw new OperateException("备件库存数量不足，请联系客服人员！");
}
sparePartMapper.updateById(sparePart);
}
}
sparePartStockAuditMapper.updateById(model);
}
/**
* 备件物流发送
*
* @param sparePartStockAuditParam
*/
@Override
public void logisticsSending(SparePartStockAuditParam sparePartStockAuditParam) {
SparePartStockAudit model = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", sparePartStockAuditParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setConsigner(sparePartStockAuditParam.getConsigner()); //发货人
model.setConsignerPhone(sparePartStockAuditParam.getConsignerPhone()); //发货人联系电话
model.setShipAddress(sparePartStockAuditParam.getShipAddress()); //发货地址
model.setLogisticsCompany(sparePartStockAuditParam.getLogisticsCompany()); //物流公司
model.setTrackingNumber(sparePartStockAuditParam.getTrackingNumber()); //物流编号
model.setPurchaseStatus(AuditStateEnum.WAITFORRECEIVING.getStatus()); // 采购状态 4=待收货
sparePartStockAuditMapper.updateById(model);
}
/**
* 备件采购收货
*
* @param sparePartStockAuditParam
*/
@Override
public void receiving(SparePartStockAuditParam sparePartStockAuditParam) {
SparePartStockAudit model = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", sparePartStockAuditParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setPurchaseStatus(AuditStateEnum.DONE.getStatus()); // 采购状态 5=已完成
sparePartStockAuditMapper.updateById(model);
}
/**
* 系统自动生成订单号：年月日+6位流水号

65
admin/src/main/java/com/hcy/admin/service/commonFault/ICommonFaultService.java 100644
View File

@ -0,0 +1,65 @@
package com.hcy.admin.service.commonFault;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.vo.commonFault.CommonFaultListVo;
import com.hcy.admin.vo.commonFault.CommonFaultDetailVo;
import com.hcy.common.core.PageResult;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Map;
/**
* 常见故障管理服务接口类
*/
public interface ICommonFaultService {
/**
* 常见故障管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<CommonFaultVo>
*/
PageResult<CommonFaultListVo> list(PageParam pageParam, Map<String, String> params);
/**
* 常见故障管理详情
*
* @author hcy
* @param id 主键ID
* @return CommonFault
*/
CommonFaultDetailVo detail(Integer id);
/**
* 常见故障管理新增
*
* @author hcy
* @param commonFaultParam 参数
*/
void add(CommonFaultParam commonFaultParam);
/**
* 常见故障管理编辑
*
* @author hcy
* @param commonFaultParam 参数
*/
void edit(CommonFaultParam commonFaultParam);
/**
* 常见故障管理删除
*
* @author hcy
* @param id 主键ID
*/
void del(Integer id);
/**
* 常见故障管理改变状态
* @param commonFaultParam
*/
void stateEdit(CommonFaultParam commonFaultParam);
}

182
admin/src/main/java/com/hcy/admin/service/commonFault/impl/CommonFaultServiceImpl.java 100644
View File

@ -0,0 +1,182 @@
package com.hcy.admin.service.commonFault.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hcy.admin.service.commonFault.ICommonFaultService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.commonFault.CommonFaultParam;
import com.hcy.admin.vo.commonFault.CommonFaultListVo;
import com.hcy.admin.vo.commonFault.CommonFaultDetailVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.commonFault.CommonFault;
import com.hcy.common.enums.commonFault.CommonFaultEnum;
import com.hcy.common.mapper.commonFault.CommonFaultMapper;
import com.hcy.common.utils.ArrayUtil;
import com.hcy.common.utils.TimeUtil;
import com.hcy.common.utils.UrlUtil;
import com.hcy.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import javax.annotation.Resource;
import java.util.*;
/**
* 常见故障管理实现类
*/
@Service
public class CommonFaultServiceImpl implements ICommonFaultService {
@Resource
CommonFaultMapper commonFaultMapper;
/**
* 常见故障管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<CommonFaultListVo>
*/
@Override
public PageResult<CommonFaultListVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<CommonFault> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
commonFaultMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
"=:accountStatus@account_status:int",
});
IPage<CommonFault> iPage = commonFaultMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<CommonFaultListVo> list = new LinkedList<>();
for(CommonFault item : iPage.getRecords()) {
CommonFaultListVo vo = new CommonFaultListVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 常见故障管理详情
*
* @author hcy
* @param id 主键参数
* @return CommonFault
*/
@Override
public CommonFaultDetailVo detail(Integer id) {
CommonFault model = commonFaultMapper.selectOne(
new QueryWrapper<CommonFault>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在");
CommonFaultDetailVo vo = new CommonFaultDetailVo();
vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(model.getUpdateTime()));
BeanUtils.copyProperties(model, vo);
return vo;
}
/**
* 常见故障管理新增
*
* @author hcy
* @param commonFaultParam 参数
*/
@Override
public void add(CommonFaultParam commonFaultParam) {
CommonFault model = new CommonFault();
model.setName(commonFaultParam.getName());
model.setSort(commonFaultParam.getSort());
model.setDescription(commonFaultParam.getDescription());
model.setAccountStatus(commonFaultParam.getAccountStatus());
model.setCreateTime(System.currentTimeMillis() / 1000);
commonFaultMapper.insert(model);
}
/**
* 常见故障管理编辑
*
* @author hcy
* @param commonFaultParam 参数
*/
@Override
public void edit(CommonFaultParam commonFaultParam) {
CommonFault model = commonFaultMapper.selectOne(
new QueryWrapper<CommonFault>()
.eq("id", commonFaultParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setId(commonFaultParam.getId());
model.setName(commonFaultParam.getName());
model.setSort(commonFaultParam.getSort());
model.setDescription(commonFaultParam.getDescription());
model.setAccountStatus(commonFaultParam.getAccountStatus());
model.setUpdateTime(System.currentTimeMillis() / 1000);
commonFaultMapper.updateById(model);
}
/**
* 常见故障管理删除
*
* @author hcy
* @param id 主键ID
*/
@Override
public void del(Integer id) {
CommonFault model = commonFaultMapper.selectOne(
new QueryWrapper<CommonFault>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
commonFaultMapper.updateById(model);
}
/**
* 常见故障管理改变状态
*
* @param commonFaultParam
*/
@Override
public void stateEdit(CommonFaultParam commonFaultParam) {
CommonFault model = commonFaultMapper.selectOne(
new QueryWrapper<CommonFault>()
.eq("id", commonFaultParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
if(model.getAccountStatus() == CommonFaultEnum.STARTUSING.getStatus()){
model.setAccountStatus(CommonFaultEnum.BLOCKUP.getStatus());
}else{
model.setAccountStatus(CommonFaultEnum.STARTUSING.getStatus());
}
model.setUpdateTime(System.currentTimeMillis() / 1000);
commonFaultMapper.updateById(model);
}
}

59
admin/src/main/java/com/hcy/admin/service/plant/IPlantService.java 100644
View File

@ -0,0 +1,59 @@
package com.hcy.admin.service.plant;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.plant.PlantParam;
import com.hcy.admin.vo.plant.PlantListVo;
import com.hcy.admin.vo.plant.PlantDetailVo;
import com.hcy.common.core.PageResult;
import java.util.Map;
/**
* 工厂管理服务接口类
*/
public interface IPlantService {
/**
* 工厂管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<PlantVo>
*/
PageResult<PlantListVo> list(PageParam pageParam, Map<String, String> params);
/**
* 工厂管理详情
*
* @author hcy
* @param id 主键ID
* @return Plant
*/
PlantDetailVo detail(Integer id);
/**
* 工厂管理新增
*
* @author hcy
* @param plantParam 参数
*/
void add(PlantParam plantParam);
/**
* 工厂管理编辑
*
* @author hcy
* @param plantParam 参数
*/
void edit(PlantParam plantParam);
/**
* 工厂管理删除
*
* @author hcy
* @param id 主键ID
*/
void del(Integer id);
}

164
admin/src/main/java/com/hcy/admin/service/plant/impl/PlantServiceImpl.java 100644
View File

@ -0,0 +1,164 @@
package com.hcy.admin.service.plant.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hcy.admin.service.plant.IPlantService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.plant.PlantParam;
import com.hcy.admin.vo.plant.PlantListVo;
import com.hcy.admin.vo.plant.PlantDetailVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.plant.Plant;
import com.hcy.common.mapper.plant.PlantMapper;
import com.hcy.common.utils.ArrayUtil;
import com.hcy.common.utils.TimeUtil;
import com.hcy.common.utils.UrlUtil;
import com.hcy.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import javax.annotation.Resource;
import java.util.*;
/**
* 工厂管理实现类
*/
@Service
public class PlantServiceImpl implements IPlantService {
@Resource
PlantMapper plantMapper;
/**
* 工厂管理列表
*
* @author hcy
* @param pageParam 分页参数
* @param params 搜索参数
* @return PageResult<PlantListVo>
*/
@Override
public PageResult<PlantListVo> list(PageParam pageParam, Map<String, String> params) {
Integer page = pageParam.getPageNo();
Integer limit = pageParam.getPageSize();
QueryWrapper<Plant> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
plantMapper.setSearch(queryWrapper, params, new String[]{
"like:name:str",
});
IPage<Plant> iPage = plantMapper.selectPage(new Page<>(page, limit), queryWrapper);
List<PlantListVo> list = new LinkedList<>();
for(Plant item : iPage.getRecords()) {
PlantListVo vo = new PlantListVo();
BeanUtils.copyProperties(item, vo);
vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
list.add(vo);
}
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
* 工厂管理详情
*
* @author hcy
* @param id 主键参数
* @return Plant
*/
@Override
public PlantDetailVo detail(Integer id) {
Plant model = plantMapper.selectOne(
new QueryWrapper<Plant>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在");
PlantDetailVo vo = new PlantDetailVo();
BeanUtils.copyProperties(model, vo);
return vo;
}
/**
* 工厂管理新增
*
* @author hcy
* @param plantParam 参数
*/
@Override
public void add(PlantParam plantParam) {
Plant model = new Plant();
model.setUserId(plantParam.getUserId());
model.setName(plantParam.getName());
model.setNumberUsers(plantParam.getNumberUsers());
model.setSort(plantParam.getSort());
model.setRemark(plantParam.getRemark());
model.setLongitude(plantParam.getLongitude());
model.setDimensionality(plantParam.getDimensionality());
model.setRegion(plantParam.getRegion());
model.setDetailedAddress(plantParam.getDetailedAddress());
model.setCreateTime(System.currentTimeMillis() / 1000);
plantMapper.insert(model);
}
/**
* 工厂管理编辑
*
* @author hcy
* @param plantParam 参数
*/
@Override
public void edit(PlantParam plantParam) {
Plant model = plantMapper.selectOne(
new QueryWrapper<Plant>()
.eq("id", plantParam.getId())
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setId(plantParam.getId());
model.setUserId(plantParam.getUserId());
model.setName(plantParam.getName());
model.setNumberUsers(plantParam.getNumberUsers());
model.setSort(plantParam.getSort());
model.setRemark(plantParam.getRemark());
model.setLongitude(plantParam.getLongitude());
model.setDimensionality(plantParam.getDimensionality());
model.setRegion(plantParam.getRegion());
model.setDetailedAddress(plantParam.getDetailedAddress());
model.setUpdateTime(System.currentTimeMillis() / 1000);
plantMapper.updateById(model);
}
/**
* 工厂管理删除
*
* @author hcy
* @param id 主键ID
*/
@Override
public void del(Integer id) {
Plant model = plantMapper.selectOne(
new QueryWrapper<Plant>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
Assert.notNull(model, "数据不存在!");
model.setIsDelete(1);
model.setDeleteTime(System.currentTimeMillis() / 1000);
plantMapper.updateById(model);
}
}

3
admin/src/main/java/com/hcy/admin/service/sparePartAllot/impl/SpareParAllotServiceImpl.java
View File

@ -7,14 +7,13 @@ import com.hcy.admin.AdminThreadLocal;
import com.hcy.admin.service.sparePartAllot.ISparePartAllotService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo;
import com.hcy.admin.vo.sparePartAllotListVo.SparePartAllotListVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
import com.hcy.common.entity.warehouse.Warehouse;
import com.hcy.common.enums.Audit.AuditStateEnum;
import com.hcy.common.enums.audit.AuditStateEnum;
import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper;
import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;

16
admin/src/main/java/com/hcy/admin/service/sparePartInWarehouse/impl/SparePartInWarehouseServiceImpl.java
View File

@ -8,21 +8,17 @@ import com.hcy.admin.service.sparePartInWarehouse.ISparePartInWarehouseService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
import com.hcy.admin.vo.sparePartInWarehouse.SparePartInWarehouseListVo;
import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditDetailVo;
import com.hcy.common.constant.GlobalConstant;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
import com.hcy.common.entity.user.User;
import com.hcy.common.entity.warehouse.Warehouse;
import com.hcy.common.enums.Audit.AuditStateEnum;
import com.hcy.common.enums.audit.AuditStateEnum;
import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper;
import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
import com.hcy.common.mapper.warehouse.WarehouseMapper;
import com.hcy.common.utils.TimeUtil;
import io.lettuce.core.ScriptOutputType;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@ -168,9 +164,19 @@ public class SparePartInWarehouseServiceImpl implements ISparePartInWarehouseSer
SparePartStockAudit sparePartStockAudit = sparePartStockAuditMapper.selectOne(qw);
if(sparePartStockAudit == null){
model.setId(1L);
}else{
Long id = sparePartStockAudit.getId() + 1;
SparePartStockAudit idModel = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
if(idModel != null){
model.setId(idModel.getId() + 1);
}else{
model.setId(sparePartStockAudit.getId() + 1);
}
}
model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 入库仓库
model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); //入库类别(0=采购入库)

18
admin/src/main/java/com/hcy/admin/service/sparePartOutWarehouse/impl/SparePartOutWarehouseServiceImpl.java
View File

@ -8,13 +8,12 @@ import com.hcy.admin.service.sparePartOutWarehouse.ISparePartOutWarehouseService
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
import com.hcy.admin.vo.SparePartOutWarehouseListVo.SparePartOutWarehouseListVo;
import com.hcy.admin.vo.sparePartInWarehouse.SparePartInWarehouseListVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
import com.hcy.common.entity.warehouse.Warehouse;
import com.hcy.common.enums.Audit.AuditStateEnum;
import com.hcy.common.enums.audit.AuditStateEnum;
import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper;
import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
@ -61,6 +60,7 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("receipt_type",1);
queryWrapper.isNull("purchase_status");
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc("id");
@ -85,7 +85,9 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
.eq("id", item.getWarehouseId())
.eq("is_delete", 0)
.last("limit 1"));
if(warehouse != null){
vo.setWarehouseName(warehouse.getWarehouseName());
}
list.add(vo);
}
@ -117,7 +119,9 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
.eq("id", model.getWarehouseId())
.eq("is_delete", 0)
.last("limit 1"));
if(warehouse != null){
vo.setWarehouseName(warehouse.getWarehouseName());
}
//获取待审核备件信息
List<SparePartAudit> stockAuditId = sparePartAuditMapper.selectList(
@ -163,9 +167,19 @@ public class SparePartOutWarehouseServiceImpl implements ISparePartOutWarehouseS
SparePartStockAudit sparePartStockAudit = sparePartStockAuditMapper.selectOne(qw);
if(sparePartStockAudit == null){
model.setId(1L);
}else{
Long id = sparePartStockAudit.getId() + 1;
SparePartStockAudit idModel = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
if(idModel != null){
model.setId(idModel.getId() + 1);
}else{
model.setId(sparePartStockAudit.getId() + 1);
}
}
model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 出库仓库
model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别 2=员工领料，3=销售出库）

19
admin/src/main/java/com/hcy/admin/service/sparePartPurchase/impl/SparePartPurchaseServiceImpl.java
View File

@ -9,13 +9,12 @@ import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
import com.hcy.admin.vo.SparePartAudit.SparePartAuditListVo;
import com.hcy.admin.vo.sparePartPurchase.SparePartPurchaseListVo;
import com.hcy.admin.vo.sparePartReceive.SparePartReceiveListVo;
import com.hcy.common.core.PageResult;
import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
import com.hcy.common.entity.warehouse.Warehouse;
import com.hcy.common.enums.Audit.AuditStateEnum;
import com.hcy.common.enums.audit.AuditStateEnum;
import com.hcy.common.exception.OperateException;
import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper;
@ -63,6 +62,7 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService {
QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("receipt_type",1);
queryWrapper.eq("out_in_warehouse_type", 3);
queryWrapper.eq("is_delete", 0);
queryWrapper.orderByDesc("id");
@ -203,9 +203,19 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService {
SparePartStockAudit sparePartStockAudit = sparePartStockAuditMapper.selectOne(qw);
if(sparePartStockAudit == null){
model.setId(1L);
}else{
Long id = sparePartStockAudit.getId() + 1;
SparePartStockAudit idModel = sparePartStockAuditMapper.selectOne(
new QueryWrapper<SparePartStockAudit>()
.eq("id", id)
.eq("is_delete", 0)
.last("limit 1"));
if(idModel != null){
model.setId(idModel.getId() + 1);
}else{
model.setId(sparePartStockAudit.getId() + 1);
}
}
model.setWarehouseId(sparePartStockAuditParam.getWarehouseId()); // 出库仓库
model.setOutInWarehouseType(sparePartStockAuditParam.getOutInWarehouseType()); // 出库类别 2=员工领料，3=销售出库）
@ -228,8 +238,6 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService {
model.setPurchaseStatus(AuditStateEnum.UNREVIEWED.getStatus()); //状态 未审核
}
// 获取当前的用户
Object username = AdminThreadLocal.get("username");
model.setResponsiblePerson((String) username); // 经办人
@ -462,7 +470,6 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService {
);
if(model.getReceiptType() == AuditStateEnum.OUTWAREHOUSE.getStatus()
&& model.getPurchaseStatus() == AuditStateEnum.CHECKPENDING.getStatus()){
model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
// 通过审核的出库单
//获取备件信息
for (SparePartAudit sparePartAudit : stockAuditId) {
@ -473,7 +480,7 @@ public class SparePartPurchaseServiceImpl implements ISparePartPurchaseService {
.last("limit 1"));
// 出库时需要判断库存数量是否大于出库数量，大于才允许出库；反之，提示备件库存数量不足
if(sparePart.getQuantity() >= sparePartAudit.getCount()){
model.setAuditState(AuditStateEnum.UNREVIEWED.getStatus());
}else{
throw new OperateException("备件库存数量不足，请联系客服人员！");
}

41
admin/src/main/java/com/hcy/admin/service/sparePartStockAudit/impl/SparePartStockAuditServiceImpl.java
View File

@ -1,15 +1,11 @@
package com.hcy.admin.service.sparePartStockAudit.impl;
import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.query.MPJQueryWrapper;
import com.hcy.admin.service.sparePartStockAudit.ISparePartStockAuditService;
import com.hcy.admin.validate.common.PageParam;
import com.hcy.admin.validate.sparePartStockAudit.SparePartStockAuditParam;
import com.hcy.admin.vo.sparePart.SparePartListVo;
import com.hcy.admin.vo.sparePartInWarehouse.SparePartInWarehouseListVo;
import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditListVo;
import com.hcy.admin.vo.sparePartStockAudit.SparePartStockAuditDetailVo;
import com.hcy.common.core.PageResult;
@ -17,18 +13,14 @@ import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.sparePart.SparePart;
import com.hcy.common.entity.sparePartStockAudit.SparePartStockAudit;
import com.hcy.common.entity.warehouse.Warehouse;
import com.hcy.common.enums.Audit.AuditStateEnum;
import com.hcy.common.enums.audit.AuditStateEnum;
import com.hcy.common.exception.OperateException;
import com.hcy.common.mapper.SparePartAudit.SparePartAuditMapper;
import com.hcy.common.mapper.sparePart.SparePartMapper;
import com.hcy.common.mapper.sparePartStockAudit.SparePartStockAuditMapper;
import com.hcy.common.mapper.warehouse.WarehouseMapper;
import com.hcy.common.utils.ArrayUtil;
import com.hcy.common.utils.TimeUtil;
import com.hcy.common.utils.UrlUtil;
import com.hcy.common.config.GlobalConfig;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.connection.Message;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@ -68,7 +60,11 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi
QueryWrapper<SparePartStockAudit> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0);
queryWrapper.isNull("purchase_status");
queryWrapper.or();
queryWrapper.notIn("purchase_status", 0,1,6);
queryWrapper.orderByDesc("id");
// purchase_status IS NULL OR purchase_status NOT IN (0, 1, 6);
sparePartStockAuditMapper.setSearch(queryWrapper, params, new String[]{
"like:receiptNumber@receipt_number:str",
@ -114,21 +110,21 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi
vo.setExportWarehouseName(exportWarehouseName.getWarehouseName());
}
//采购单状态是待管理员审核才能显示
if(item.getPurchaseStatus() != null && item.getPurchaseStatus() == AuditStateEnum.UNREVIEWED.getStatus()){
System.out.println("采购单状态是未审核不显示");
}else if (item.getPurchaseStatus() != null && item.getPurchaseStatus() == AuditStateEnum.NOTPASSSTATE.getStatus()){
System.out.println("采购单状态是审核未通过不显示");
}else if(item.getPurchaseStatus() != null && item.getPurchaseStatus() == AuditStateEnum.FILLINGOUT.getStatus()){
System.out.println("采购单状态是填写中不显示");
}else {
// //采购/领用单状态是待管理员审核才能显示
// if(item.getPurchaseStatus() != null && item.getPurchaseStatus() == AuditStateEnum.UNREVIEWED.getStatus()){
// System.out.println(item.getId() + "采购/领用状态是未审核不显示");
// }else if (item.getPurchaseStatus() != null && item.getPurchaseStatus() == AuditStateEnum.NOTPASSSTATE.getStatus() && item.getAuditResult() == null){
// System.out.println(item.getId() + "采购/领用状态是审核未通过不显示");
// }else if(item.getPurchaseStatus() != null && item.getPurchaseStatus() == AuditStateEnum.FILLINGOUT.getStatus()){
// System.out.println(item.getId() + "采购/领用状态是填写中不显示");
// }else {
// list.add(vo);
// total = total + 1;
// }
list.add(vo);
total = total + 1;
}
}
return PageResult.iPageHandle(total, iPage.getCurrent(), iPage.getSize(), list);
return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
}
/**
@ -315,6 +311,9 @@ public class SparePartStockAuditServiceImpl implements ISparePartStockAuditServi
model.setId(sparePartStockAuditParam.getId());
model.setAuditResult(sparePartStockAuditParam.getAuditResult()); // 审核结果（0=已通过，1=未通过）
if(sparePartStockAuditParam.getAuditResult() == AuditStateEnum.NOTPASS.getStatus()){
model.setPurchaseStatus(AuditStateEnum.NOTPASSSTATE.getStatus()); //审核未通过
}
model.setAuditState(AuditStateEnum.AUDITED.getStatus()); // 审核状态（0=未审核，1=已审核，2=已取消）
model.setAuditTime(System.currentTimeMillis() / 1000); // 审核时间
model.setAuditIdea(sparePartStockAuditParam.getAuditIdea()); // 审核意见

46
admin/src/main/java/com/hcy/admin/validate/CommonMaintenance/CommonMaintenanceParam.java 100644
View File

@ -0,0 +1,46 @@
package com.hcy.admin.validate.CommonMaintenance;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* 常见维修结论描述参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CommonMaintenanceParam implements Serializable {
private static final long serialVersionUID = 1L;
public interface create{}
public interface update{}
public interface delete{}
private Long id;
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
private String name;
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
private Long sort;
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
private String description;
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
private Integer accountStatus;
private String createTime;
}

47
admin/src/main/java/com/hcy/admin/validate/CommonOverhaul/CommonOverhaulParam.java 100644
View File

@ -0,0 +1,47 @@
package com.hcy.admin.validate.CommonOverhaul;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* 常见检修结论描述参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CommonOverhaulParam implements Serializable {
private static final long serialVersionUID = 1L;
public interface create{}
public interface update{}
public interface delete{}
private Long id;
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
private String name;
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
private Long sort;
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
private String description;
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
private Integer accountStatus;
private String createTime;
private String updateTime;
}

46
admin/src/main/java/com/hcy/admin/validate/ScrapType/ScrapTypeParam.java 100644
View File

@ -0,0 +1,46 @@
package com.hcy.admin.validate.ScrapType;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* 报废类型管理参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ScrapTypeParam implements Serializable {
private static final long serialVersionUID = 1L;
public interface create{}
public interface update{}
public interface delete{}
private Long id;
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
private String name;
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
private Long sort;
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
private String description;
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
private Integer accountStatus;
private String createTime;
}

44
admin/src/main/java/com/hcy/admin/validate/commonFault/CommonFaultParam.java 100644
View File

@ -0,0 +1,44 @@
package com.hcy.admin.validate.commonFault;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* 常见故障管理参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CommonFaultParam implements Serializable {
private static final long serialVersionUID = 1L;
public interface create{}
public interface update{}
public interface delete{}
private Long id;
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
@Length(max = 32, message = "name参数不能超出32个字符", groups = {create.class, update.class})
private String name;
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
private Long sort;
@NotNull(message = "description参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "description参数不能超出255个字符", groups = {create.class, update.class})
private String description;
@NotNull(message = "accountStatus参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "accountStatus参数值不能少于0", groups = {create.class, update.class})
private Integer accountStatus;
}

69
admin/src/main/java/com/hcy/admin/validate/plant/PlantParam.java 100644
View File

@ -0,0 +1,69 @@
package com.hcy.admin.validate.plant;
import com.hcy.common.entity.SparePartAudit.SparePartAudit;
import com.hcy.common.entity.user.User;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import lombok.Data;
import javax.validation.constraints.*;
import java.io.Serializable;
import java.util.List;
/**
* 工厂管理参数
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class PlantParam implements Serializable {
private static final long serialVersionUID = 1L;
public interface create{}
public interface update{}
public interface delete{}
private Long id;
@NotNull(message = "userId参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "userId参数值不能少于0", groups = {create.class, update.class})
private Long userId;
@NotNull(message = "name参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "name参数不能超出255个字符", groups = {create.class, update.class})
private String name;
@NotNull(message = "numberUsers参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "numberUsers参数值不能少于0", groups = {create.class, update.class})
private Long numberUsers;
@NotNull(message = "sort参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "sort参数值不能少于0", groups = {create.class, update.class})
private Long sort;
@NotNull(message = "remark参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "remark参数不能超出255个字符", groups = {create.class, update.class})
private String remark;
@NotNull(message = "longitude参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "longitude参数值不能少于0", groups = {create.class, update.class})
private Long longitude;
@NotNull(message = "dimensionality参数缺失", groups = {create.class, update.class})
@DecimalMin(value = "0", message = "dimensionality参数值不能少于0", groups = {create.class, update.class})
private Long dimensionality;
@NotNull(message = "region参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "region参数不能超出255个字符", groups = {create.class, update.class})
private String region;
@NotNull(message = "detailedAddress参数缺失", groups = {create.class, update.class})
@Length(max = 255, message = "detailedAddress参数不能超出255个字符", groups = {create.class, update.class})
private String detailedAddress;
private String createTime;
private List<User> userList; //待绑定的用户
}

23
admin/src/main/java/com/hcy/admin/vo/CommonMaintenance/CommonMaintenanceDetailVo.java 100644
View File

@ -0,0 +1,23 @@
package com.hcy.admin.vo.CommonMaintenance;
import lombok.Data;
import java.io.Serializable;
/**
* CommonMaintenanceVo
*/
@Data
public class CommonMaintenanceDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

23
admin/src/main/java/com/hcy/admin/vo/CommonMaintenance/CommonMaintenanceListVo.java 100644
View File

@ -0,0 +1,23 @@
package com.hcy.admin.vo.CommonMaintenance;
import lombok.Data;
import java.io.Serializable;
/**
* CommonMaintenanceVo
*/
@Data
public class CommonMaintenanceListVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

23
admin/src/main/java/com/hcy/admin/vo/CommonOverhaul/CommonOverhaulDetailVo.java 100644
View File

@ -0,0 +1,23 @@
package com.hcy.admin.vo.CommonOverhaul;
import lombok.Data;
import java.io.Serializable;
/**
* CommonOverhaulVo
*/
@Data
public class CommonOverhaulDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

23
admin/src/main/java/com/hcy/admin/vo/CommonOverhaul/CommonOverhaulListVo.java 100644
View File

@ -0,0 +1,23 @@
package com.hcy.admin.vo.CommonOverhaul;
import lombok.Data;
import java.io.Serializable;
/**
* CommonOverhaulVo
*/
@Data
public class CommonOverhaulListVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

22
admin/src/main/java/com/hcy/admin/vo/ScrapType/ScrapTypeDetailVo.java 100644
View File

@ -0,0 +1,22 @@
package com.hcy.admin.vo.ScrapType;
import lombok.Data;
import java.io.Serializable;
/**
* ScrapTypeVo
*/
@Data
public class ScrapTypeDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

22
admin/src/main/java/com/hcy/admin/vo/ScrapType/ScrapTypeListVo.java 100644
View File

@ -0,0 +1,22 @@
package com.hcy.admin.vo.ScrapType;
import lombok.Data;
import java.io.Serializable;
/**
* ScrapTypeVo
*/
@Data
public class ScrapTypeListVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

22
admin/src/main/java/com/hcy/admin/vo/commonFault/CommonFaultDetailVo.java 100644
View File

@ -0,0 +1,22 @@
package com.hcy.admin.vo.commonFault;
import lombok.Data;
import java.io.Serializable;
/**
* CommonFaultVo
*/
@Data
public class CommonFaultDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

24
admin/src/main/java/com/hcy/admin/vo/commonFault/CommonFaultListVo.java 100644
View File

@ -0,0 +1,24 @@
package com.hcy.admin.vo.commonFault;
import lombok.Data;
import java.io.Serializable;
/**
* CommonFaultVo
*/
@Data
public class CommonFaultListVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private String createTime; // 创建时间
private String updateTime; // 更新时间
}

31
admin/src/main/java/com/hcy/admin/vo/plant/PlantDetailVo.java 100644
View File

@ -0,0 +1,31 @@
package com.hcy.admin.vo.plant;
import com.hcy.common.entity.user.User;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* PlantVo
*/
@Data
public class PlantDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private Long userId; // 用户id
private String name; // 工厂名称
private Long numberUsers; // 管理员人数
private Long sort; // 排序
private String remark; // 备注
private Long longitude; // 经度
private Long dimensionality; // 维度
private String region; // 所属区域
private String detailedAddress; // 详细地址
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private List<User> userList; //待绑定的用户
}

26
admin/src/main/java/com/hcy/admin/vo/plant/PlantListVo.java 100644
View File

@ -0,0 +1,26 @@
package com.hcy.admin.vo.plant;
import com.hcy.common.entity.user.User;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* PlantVo
*/
@Data
public class PlantListVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id; // 主键id
private Long userId; // 用户id
private String name; // 工厂名称
private Long numberUsers; // 管理员人数
private Long sort; // 排序
private String remark; // 备注
private String createTime; // 创建时间
private List<User> userList; //待绑定的用户
}

3
admin/src/main/java/com/hcy/admin/vo/sparePartReceive/SparePartReceiveListVo.java
View File

@ -17,6 +17,7 @@ public class SparePartReceiveListVo implements Serializable {
private Long id; // 主键id
private String receiptNumber; // 单据编号
private Integer receiptType; // 单据类型（0=入库单，1=出库单，2=仓库调拨单）
private Long warehouseId; // 所属仓库
private String consignee; // 收货单位（人员）
private String phone; // 联系电话
@ -48,4 +49,6 @@ public class SparePartReceiveListVo implements Serializable {
private String trackingNumber; //物流编号
private Integer deliveryMethod; //配送方式（0=物流快递，1=上门取件，2=送货上门）
private String recipientAndPhone; //领用员工/联系电话
private String handlingTimeStart;
private String handlingTimeEnd;
}

28
common/src/main/java/com/hcy/common/entity/CommonMaintenance/CommonMaintenance.java 100644
View File

@ -0,0 +1,28 @@
package com.hcy.common.entity.CommonMaintenance;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 常见维修结论描述实体
*/
@Data
public class CommonMaintenance implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private Integer isDelete; // 是否删除: [0=否, 1=是]
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

28
common/src/main/java/com/hcy/common/entity/CommonOverhaul/CommonOverhaul.java 100644
View File

@ -0,0 +1,28 @@
package com.hcy.common.entity.CommonOverhaul;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 常见检修结论描述实体
*/
@Data
public class CommonOverhaul implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private Integer isDelete; // 是否删除: [0=否, 1=是]
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

28
common/src/main/java/com/hcy/common/entity/ScrapType/ScrapType.java 100644
View File

@ -0,0 +1,28 @@
package com.hcy.common.entity.ScrapType;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 报废类型管理实体
*/
@Data
public class ScrapType implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态（0=启用，1=停用）
private Integer isDelete; // 是否删除: [0=否, 1=是]
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

28
common/src/main/java/com/hcy/common/entity/commonFault/CommonFault.java 100644
View File

@ -0,0 +1,28 @@
package com.hcy.common.entity.commonFault;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 常见故障管理实体
*/
@Data
public class CommonFault implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Long id; // 主键id
private String name; // 名称
private Long sort; // 显示排序
private String description; // 描述
private Integer accountStatus; // 状态
private Integer isDelete; // 是否删除: [0=否, 1=是]
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

33
common/src/main/java/com/hcy/common/entity/plant/Plant.java 100644
View File

@ -0,0 +1,33 @@
package com.hcy.common.entity.plant;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
/**
* 工厂管理实体
*/
@Data
public class Plant implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value="id", type= IdType.AUTO)
private Long id; // 主键id
private Long userId; // 用户id
private String name; // 工厂名称
private Long numberUsers; // 管理员人数
private Long sort; // 排序
private String remark; // 备注
private Long longitude; // 经度
private Long dimensionality; // 维度
private String region; // 所属区域
private String detailedAddress; // 详细地址
private Integer isDelete; // 是否删除: [0=否, 1=是]
private Long createTime; // 创建时间
private Long updateTime; // 更新时间
private Long deleteTime; // 删除时间
}

3
common/src/main/java/com/hcy/common/enums/Audit/AuditStateEnum.java → common/src/main/java/com/hcy/common/enums/audit/AuditStateEnum.java
View File

@ -1,7 +1,6 @@
package com.hcy.common.enums.Audit;
package com.hcy.common.enums.audit;
import com.google.common.collect.Maps;
import com.hcy.common.enums.coupon.UserCouponStatusEnum;
import java.util.Map;

52
common/src/main/java/com/hcy/common/enums/commonFault/CommonFaultEnum.java 100644
View File

@ -0,0 +1,52 @@
package com.hcy.common.enums.commonFault;
import com.google.common.collect.Maps;
import java.util.Map;
/**
* 常见问题状态
* @author dabin
*/
public enum CommonFaultEnum {
STARTUSING(0, "启用"),
BLOCKUP(1, "停用");
private final int status;
private final String desc;
CommonFaultEnum(int status, String desc) {
this.status = status;
this.desc = desc;
}
/**
* 获取状态码
*
* @return int
* @author dabin
*/
public int getStatus() {
return this.status;
}
/**
* 获取提示
*
* @return String
* @author dabin
*/
public String getDesc() {
return this.desc;
}
public static Map<Integer, String> getMap() {
Map<Integer, String> map = Maps.newHashMap();
for (CommonFaultEnum auditStateEnum : CommonFaultEnum.values()) {
map.put(auditStateEnum.status, auditStateEnum.desc);
}
return map;
}
}

13
common/src/main/java/com/hcy/common/mapper/CommonMaintenance/CommonMaintenanceMapper.java 100644
View File

@ -0,0 +1,13 @@
package com.hcy.common.mapper.CommonMaintenance;
import com.hcy.common.core.basics.IBaseMapper;
import com.hcy.common.entity.CommonMaintenance.CommonMaintenance;
import org.apache.ibatis.annotations.Mapper;
/**
* 常见维修结论描述Mapper
*/
@Mapper
public interface CommonMaintenanceMapper extends IBaseMapper<CommonMaintenance> {
}

13
common/src/main/java/com/hcy/common/mapper/CommonOverhaul/CommonOverhaulMapper.java 100644
View File

@ -0,0 +1,13 @@
package com.hcy.common.mapper.CommonOverhaul;
import com.hcy.common.core.basics.IBaseMapper;
import com.hcy.common.entity.CommonOverhaul.CommonOverhaul;
import org.apache.ibatis.annotations.Mapper;
/**
* 常见检修结论描述Mapper
*/
@Mapper
public interface CommonOverhaulMapper extends IBaseMapper<CommonOverhaul> {
}

13
common/src/main/java/com/hcy/common/mapper/ScrapType/ScrapTypeMapper.java 100644
View File

@ -0,0 +1,13 @@
package com.hcy.common.mapper.ScrapType;
import com.hcy.common.core.basics.IBaseMapper;
import com.hcy.common.entity.ScrapType.ScrapType;
import org.apache.ibatis.annotations.Mapper;
/**
* 报废类型管理Mapper
*/
@Mapper
public interface ScrapTypeMapper extends IBaseMapper<ScrapType> {
}

13
common/src/main/java/com/hcy/common/mapper/commonFault/CommonFaultMapper.java 100644
View File

@ -0,0 +1,13 @@
package com.hcy.common.mapper.commonFault;
import com.hcy.common.core.basics.IBaseMapper;
import com.hcy.common.entity.commonFault.CommonFault;
import org.apache.ibatis.annotations.Mapper;
/**
* 常见故障管理Mapper
*/
@Mapper
public interface CommonFaultMapper extends IBaseMapper<CommonFault> {
}

13
common/src/main/java/com/hcy/common/mapper/plant/PlantMapper.java 100644
View File

@ -0,0 +1,13 @@
package com.hcy.common.mapper.plant;
import com.hcy.common.core.basics.IBaseMapper;
import com.hcy.common.entity.plant.Plant;
import org.apache.ibatis.annotations.Mapper;
/**
* 工厂管理Mapper
*/
@Mapper
public interface PlantMapper extends IBaseMapper<Plant> {
}