feat(qms): 拷贝mes的物料、物料类型、工序、工位到qms
parent
9c967b7841
commit
5995918c08
@ -0,0 +1,119 @@
|
||||
package org.dromara.qms.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.qms.domain.bo.BaseMaterialInfoBo;
|
||||
import org.dromara.qms.domain.vo.BaseMaterialInfoVo;
|
||||
import org.dromara.qms.service.IBaseMaterialInfoService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料信息
|
||||
* 前端访问路由地址为:/qms/baseMaterialInfo
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/baseMaterialInfo")
|
||||
public class BaseMaterialInfoController extends BaseController {
|
||||
|
||||
private final IBaseMaterialInfoService baseMaterialInfoService;
|
||||
|
||||
|
||||
/**
|
||||
* 查询物料信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseMaterialInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BaseMaterialInfoVo> list(BaseMaterialInfoBo bo, PageQuery pageQuery) {
|
||||
return baseMaterialInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出物料信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseMaterialInfo:export")
|
||||
@Log(title = "物料信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BaseMaterialInfoBo bo, HttpServletResponse response) {
|
||||
List<BaseMaterialInfoVo> list = baseMaterialInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "物料信息", BaseMaterialInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取物料信息详细信息
|
||||
*
|
||||
* @param materialId 主键
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseMaterialInfo:query")
|
||||
@GetMapping("/{materialId}")
|
||||
public R<BaseMaterialInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long materialId) {
|
||||
return R.ok(baseMaterialInfoService.queryById(materialId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增物料信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseMaterialInfo:add")
|
||||
@Log(title = "物料信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseMaterialInfoBo bo) {
|
||||
return toAjax(baseMaterialInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物料信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseMaterialInfo:edit")
|
||||
@Log(title = "物料信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseMaterialInfoBo bo) {
|
||||
return toAjax(baseMaterialInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除物料信息
|
||||
*
|
||||
* @param materialIds 主键串
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseMaterialInfo:remove")
|
||||
@Log(title = "物料信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{materialIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] materialIds) {
|
||||
return toAjax(baseMaterialInfoService.deleteWithValidByIds(List.of(materialIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询物料信息列表
|
||||
*/
|
||||
|
||||
@GetMapping("getBaseMaterialInfoList")
|
||||
public R<List<BaseMaterialInfoVo>> getBaseMaterialInfoList(BaseMaterialInfoBo bo) {
|
||||
List<BaseMaterialInfoVo> list = baseMaterialInfoService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,118 @@
|
||||
package org.dromara.qms.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.qms.domain.bo.BaseSupplierInfoBo;
|
||||
import org.dromara.qms.domain.vo.BaseSupplierInfoVo;
|
||||
import org.dromara.qms.service.IBaseSupplierInfoService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 供应商信息
|
||||
* 前端访问路由地址为:/qms/baseSupplierInfo
|
||||
*
|
||||
* @author ZangCH
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/baseSupplierInfo")
|
||||
public class BaseSupplierInfoController extends BaseController {
|
||||
|
||||
private final IBaseSupplierInfoService baseSupplierInfoService;
|
||||
|
||||
/**
|
||||
* 查询供应商信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseSupplierInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<BaseSupplierInfoVo> list(BaseSupplierInfoBo bo, PageQuery pageQuery) {
|
||||
return baseSupplierInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出供应商信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseSupplierInfo:export")
|
||||
@Log(title = "供应商信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(BaseSupplierInfoBo bo, HttpServletResponse response) {
|
||||
List<BaseSupplierInfoVo> list = baseSupplierInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "供应商信息", BaseSupplierInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取供应商信息详细信息
|
||||
*
|
||||
* @param supplierId 主键
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseSupplierInfo:query")
|
||||
@GetMapping("/{supplierId}")
|
||||
public R<BaseSupplierInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long supplierId) {
|
||||
return R.ok(baseSupplierInfoService.queryById(supplierId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增供应商信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseSupplierInfo:add")
|
||||
@Log(title = "供应商信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody BaseSupplierInfoBo bo) {
|
||||
return toAjax(baseSupplierInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改供应商信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseSupplierInfo:edit")
|
||||
@Log(title = "供应商信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody BaseSupplierInfoBo bo) {
|
||||
return toAjax(baseSupplierInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除供应商信息
|
||||
*
|
||||
* @param supplierIds 主键串
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseSupplierInfo:remove")
|
||||
@Log(title = "供应商信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{supplierIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] supplierIds) {
|
||||
return toAjax(baseSupplierInfoService.deleteWithValidByIds(List.of(supplierIds), true));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 下拉框查询供应商信息列表
|
||||
*/
|
||||
|
||||
@GetMapping("getBaseSupplierInfoList")
|
||||
public R<List<BaseSupplierInfoVo>> getBaseSupplierInfolist(BaseSupplierInfoBo bo) {
|
||||
List<BaseSupplierInfoVo> list = baseSupplierInfoService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,127 @@
|
||||
package org.dromara.qms.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.qms.domain.bo.ProdBaseProcessInfoBo;
|
||||
import org.dromara.qms.domain.vo.ProdBaseProcessInfoVo;
|
||||
import org.dromara.qms.service.IProdBaseProcessInfoService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工序信息
|
||||
* 前端访问路由地址为:/qms/baseProcessInfo
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/baseProcessInfo")
|
||||
public class ProdBaseProcessInfoController extends BaseController {
|
||||
|
||||
private final IProdBaseProcessInfoService prodBaseProcessInfoService;
|
||||
|
||||
/**
|
||||
* 查询工序信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdBaseProcessInfoVo> list(ProdBaseProcessInfoBo bo, PageQuery pageQuery) {
|
||||
return prodBaseProcessInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工序信息下拉框列表
|
||||
*/
|
||||
@GetMapping("/getProcessInfoList")
|
||||
public R<List<ProdBaseProcessInfoVo>> getProcessInfoList(ProdBaseProcessInfoBo bo) {
|
||||
List<ProdBaseProcessInfoVo> list = prodBaseProcessInfoService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工序信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:export")
|
||||
@Log(title = "工序信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdBaseProcessInfoBo bo, HttpServletResponse response) {
|
||||
List<ProdBaseProcessInfoVo> list = prodBaseProcessInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "工序信息", ProdBaseProcessInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工序信息详细信息
|
||||
*
|
||||
* @param processId 主键
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:query")
|
||||
@GetMapping("/{processId}")
|
||||
public R<ProdBaseProcessInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long processId) {
|
||||
return R.ok(prodBaseProcessInfoService.queryById(processId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:add")
|
||||
@Log(title = "工序信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseProcessInfoBo bo) {
|
||||
return toAjax(prodBaseProcessInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:edit")
|
||||
@Log(title = "工序信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/edit")
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseProcessInfoBo bo) {
|
||||
return toAjax(prodBaseProcessInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:edit")
|
||||
@Log(title = "工序信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping("/editUser")
|
||||
public R<Void> editUser(@Validated(EditGroup.class) @RequestBody ProdBaseProcessInfoBo bo) {
|
||||
return toAjax(prodBaseProcessInfoService.updateByBoUser(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工序信息
|
||||
*
|
||||
* @param processIds 主键串
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseProcessInfo:remove")
|
||||
@Log(title = "工序信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{processIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] processIds) {
|
||||
return toAjax(prodBaseProcessInfoService.deleteWithValidByIds(List.of(processIds), true));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,117 @@
|
||||
package org.dromara.qms.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.NotEmpty;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.qms.domain.bo.ProdBaseStationInfoBo;
|
||||
import org.dromara.qms.domain.vo.ProdBaseStationInfoVo;
|
||||
import org.dromara.qms.service.IProdBaseStationInfoService;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工位信息
|
||||
* 前端访问路由地址为:/qms/baseStationInfo
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/baseStationInfo")
|
||||
public class ProdBaseStationInfoController extends BaseController {
|
||||
|
||||
private final IProdBaseStationInfoService prodBaseStationInfoService;
|
||||
|
||||
/**
|
||||
* 查询工位信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseStationInfo:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ProdBaseStationInfoVo> list(ProdBaseStationInfoBo bo, PageQuery pageQuery) {
|
||||
return prodBaseStationInfoService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工位信息下拉框列表
|
||||
*/
|
||||
@GetMapping("/getStationInfoList")
|
||||
public R<List<ProdBaseStationInfoVo>> getStationInfoList(ProdBaseStationInfoBo bo) {
|
||||
List<ProdBaseStationInfoVo> list = prodBaseStationInfoService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工位信息列表
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseStationInfo:export")
|
||||
@Log(title = "工位信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(ProdBaseStationInfoBo bo, HttpServletResponse response) {
|
||||
List<ProdBaseStationInfoVo> list = prodBaseStationInfoService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "工位信息", ProdBaseStationInfoVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工位信息详细信息
|
||||
*
|
||||
* @param stationId 主键
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseStationInfo:query")
|
||||
@GetMapping("/{stationId}")
|
||||
public R<ProdBaseStationInfoVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long stationId) {
|
||||
return R.ok(prodBaseStationInfoService.queryById(stationId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工位信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseStationInfo:add")
|
||||
@Log(title = "工位信息", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody ProdBaseStationInfoBo bo) {
|
||||
return toAjax(prodBaseStationInfoService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工位信息
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseStationInfo:edit")
|
||||
@Log(title = "工位信息", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProdBaseStationInfoBo bo) {
|
||||
return toAjax(prodBaseStationInfoService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工位信息
|
||||
*
|
||||
* @param stationIds 主键串
|
||||
*/
|
||||
//@SaCheckPermission("mes:baseStationInfo:remove")
|
||||
@Log(title = "工位信息", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{stationIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] stationIds) {
|
||||
return toAjax(prodBaseStationInfoService.deleteWithValidByIds(List.of(stationIds), true));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.qms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.qms.domain.BaseMaterialType;
|
||||
import org.dromara.qms.domain.vo.BaseMaterialTypeVo;
|
||||
|
||||
/**
|
||||
* 物料类型信息Mapper接口
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
public interface BaseMaterialTypeMapper extends BaseMapperPlus<BaseMaterialType, BaseMaterialTypeVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.qms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.qms.domain.BaseSupplierInfo;
|
||||
import org.dromara.qms.domain.vo.BaseSupplierInfoVo;
|
||||
|
||||
/**
|
||||
* 供应商信息Mapper接口
|
||||
*
|
||||
* @author ZangCH
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
public interface BaseSupplierInfoMapper extends BaseMapperPlus<BaseSupplierInfo, BaseSupplierInfoVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
package org.dromara.qms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.qms.domain.ProdBaseProcessInfo;
|
||||
import org.dromara.qms.domain.bo.ProdBaseProcessInfoBo;
|
||||
|
||||
import org.dromara.qms.domain.vo.ProdBaseProcessInfoVo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工序信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
public interface ProdBaseProcessInfoMapper extends BaseMapperPlus<ProdBaseProcessInfo, ProdBaseProcessInfoVo> {
|
||||
|
||||
/**
|
||||
* 查询工序信息
|
||||
*
|
||||
* @param processId 工序信息主键
|
||||
* @return 工序信息
|
||||
*/
|
||||
public ProdBaseProcessInfo selectProdBaseProcessInfoByProcessId(Long processId);
|
||||
|
||||
/**
|
||||
* 获取工序用户信息详细信息
|
||||
* @param processId 工序信息主键
|
||||
* @return 工序信息
|
||||
*/
|
||||
public ProdBaseProcessInfo selectProdBaseProcessInfoUserByProcessId(Long processId);
|
||||
|
||||
/**
|
||||
* 查询工序信息列表
|
||||
*
|
||||
* @param prodBaseProcessInfo 工序信息
|
||||
* @return 工序信息集合
|
||||
*/
|
||||
public List<ProdBaseProcessInfo> selectProdBaseProcessInfoList(ProdBaseProcessInfoBo prodBaseProcessInfo);
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*
|
||||
* @param prodBaseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertProdBaseProcessInfo(ProdBaseProcessInfoBo prodBaseProcessInfo);
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*
|
||||
* @param prodBaseProcessInfo 工序信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateProdBaseProcessInfo(ProdBaseProcessInfoBo prodBaseProcessInfo);
|
||||
|
||||
/**
|
||||
* 删除工序信息
|
||||
*
|
||||
* @param processId 工序信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProdBaseProcessInfoByProcessId(Long processId);
|
||||
|
||||
/**
|
||||
* 批量删除工序信息
|
||||
*
|
||||
* @param processIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProdBaseProcessInfoByProcessIds(Long[] processIds);
|
||||
|
||||
/**
|
||||
* 批量删除工序关联产线
|
||||
*
|
||||
* @param processIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProdBaseProcessProdlineByProcessIds(Long[] processIds);
|
||||
|
||||
/**
|
||||
* 批量新增工序关联产线
|
||||
*
|
||||
* @param prodBaseProcessProdlineList 工序关联产线列表
|
||||
* @return 结果
|
||||
*/
|
||||
// public int batchProdBaseProcessProdline(List<ProdBaseProcessProdLineBo> prodBaseProcessProdlineList);
|
||||
|
||||
|
||||
/**
|
||||
* 通过工序信息主键删除工序关联产线信息
|
||||
*
|
||||
* @param processId 工序信息ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteProdBaseProcessProdlineByProcessId(Long processId);
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package org.dromara.qms.mapper;
|
||||
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.dromara.qms.domain.ProdBaseStationInfo;
|
||||
import org.dromara.qms.domain.vo.ProdBaseStationInfoVo;
|
||||
|
||||
/**
|
||||
* 工位信息Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
public interface ProdBaseStationInfoMapper extends BaseMapperPlus<ProdBaseStationInfo, ProdBaseStationInfoVo> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package org.dromara.qms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.qms.domain.bo.BaseMaterialInfoBo;
|
||||
import org.dromara.qms.domain.vo.BaseMaterialInfoVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料信息Service接口
|
||||
*
|
||||
* @author zangch
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
public interface IBaseMaterialInfoService {
|
||||
|
||||
/**
|
||||
* 查询物料信息
|
||||
*
|
||||
* @param materialId 主键
|
||||
* @return 物料信息
|
||||
*/
|
||||
BaseMaterialInfoVo queryById(Long materialId);
|
||||
|
||||
/**
|
||||
* 分页查询物料信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 物料信息分页列表
|
||||
*/
|
||||
TableDataInfo<BaseMaterialInfoVo> queryPageList(BaseMaterialInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的物料信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 物料信息列表
|
||||
*/
|
||||
List<BaseMaterialInfoVo> queryList(BaseMaterialInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增物料信息
|
||||
*
|
||||
* @param bo 物料信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(BaseMaterialInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改物料信息
|
||||
*
|
||||
* @param bo 物料信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(BaseMaterialInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除物料信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package org.dromara.qms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.qms.domain.bo.BaseSupplierInfoBo;
|
||||
import org.dromara.qms.domain.vo.BaseSupplierInfoVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 供应商信息Service接口
|
||||
*
|
||||
* @author ZangCH
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
public interface IBaseSupplierInfoService {
|
||||
|
||||
/**
|
||||
* 查询供应商信息
|
||||
*
|
||||
* @param supplierId 主键
|
||||
* @return 供应商信息
|
||||
*/
|
||||
BaseSupplierInfoVo queryById(Long supplierId);
|
||||
|
||||
/**
|
||||
* 分页查询供应商信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 供应商信息分页列表
|
||||
*/
|
||||
TableDataInfo<BaseSupplierInfoVo> queryPageList(BaseSupplierInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的供应商信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 供应商信息列表
|
||||
*/
|
||||
List<BaseSupplierInfoVo> queryList(BaseSupplierInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增供应商信息
|
||||
*
|
||||
* @param bo 供应商信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(BaseSupplierInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改供应商信息
|
||||
*
|
||||
* @param bo 供应商信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(BaseSupplierInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除供应商信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
package org.dromara.qms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.qms.domain.bo.ProdBaseProcessInfoBo;
|
||||
import org.dromara.qms.domain.vo.ProdBaseProcessInfoVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工序信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
public interface IProdBaseProcessInfoService {
|
||||
|
||||
/**
|
||||
* 查询工序信息
|
||||
*
|
||||
* @param processId 主键
|
||||
* @return 工序信息
|
||||
*/
|
||||
ProdBaseProcessInfoVo queryById(Long processId);
|
||||
|
||||
/**
|
||||
* 分页查询工序信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 工序信息分页列表
|
||||
*/
|
||||
TableDataInfo<ProdBaseProcessInfoVo> queryPageList(ProdBaseProcessInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的工序信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 工序信息列表
|
||||
*/
|
||||
List<ProdBaseProcessInfoVo> queryList(ProdBaseProcessInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增工序信息
|
||||
*
|
||||
* @param bo 工序信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdBaseProcessInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改工序信息
|
||||
*
|
||||
* @param bo 工序信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdBaseProcessInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改工序信息关联用户
|
||||
*
|
||||
* @param bo 工序信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBoUser(ProdBaseProcessInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除工序信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package org.dromara.qms.service;
|
||||
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.qms.domain.bo.ProdBaseStationInfoBo;
|
||||
import org.dromara.qms.domain.vo.ProdBaseStationInfoVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工位信息Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
public interface IProdBaseStationInfoService {
|
||||
|
||||
/**
|
||||
* 查询工位信息
|
||||
*
|
||||
* @param stationId 主键
|
||||
* @return 工位信息
|
||||
*/
|
||||
ProdBaseStationInfoVo queryById(Long stationId);
|
||||
|
||||
/**
|
||||
* 分页查询工位信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 工位信息分页列表
|
||||
*/
|
||||
TableDataInfo<ProdBaseStationInfoVo> queryPageList(ProdBaseStationInfoBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的工位信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 工位信息列表
|
||||
*/
|
||||
List<ProdBaseStationInfoVo> queryList(ProdBaseStationInfoBo bo);
|
||||
|
||||
/**
|
||||
* 新增工位信息
|
||||
*
|
||||
* @param bo 工位信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(ProdBaseStationInfoBo bo);
|
||||
|
||||
/**
|
||||
* 修改工位信息
|
||||
*
|
||||
* @param bo 工位信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(ProdBaseStationInfoBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除工位信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,150 @@
|
||||
package org.dromara.qms.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.exception.ServiceException;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.qms.domain.BaseSupplierInfo;
|
||||
import org.dromara.qms.domain.bo.BaseSupplierInfoBo;
|
||||
import org.dromara.qms.domain.vo.BaseSupplierInfoVo;
|
||||
import org.dromara.qms.mapper.BaseSupplierInfoMapper;
|
||||
import org.dromara.qms.service.IBaseSupplierInfoService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 供应商信息Service业务层处理
|
||||
*
|
||||
* @author ZangCH
|
||||
* @date 2025-01-07
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class BaseSupplierInfoServiceImpl implements IBaseSupplierInfoService {
|
||||
|
||||
private final BaseSupplierInfoMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询供应商信息
|
||||
*
|
||||
* @param supplierId 主键
|
||||
* @return 供应商信息
|
||||
*/
|
||||
@Override
|
||||
public BaseSupplierInfoVo queryById(Long supplierId){
|
||||
return baseMapper.selectVoById(supplierId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询供应商信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 供应商信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<BaseSupplierInfoVo> queryPageList(BaseSupplierInfoBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<BaseSupplierInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<BaseSupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的供应商信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 供应商信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<BaseSupplierInfoVo> queryList(BaseSupplierInfoBo bo) {
|
||||
MPJLambdaWrapper<BaseSupplierInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<BaseSupplierInfo> buildQueryWrapper(BaseSupplierInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<BaseSupplierInfo> lqw = JoinWrappers.lambda(BaseSupplierInfo.class)
|
||||
.selectAll(BaseSupplierInfo.class)
|
||||
.eq(bo.getSupplierId() != null, BaseSupplierInfo::getSupplierId, bo.getSupplierId())
|
||||
.eq(StringUtils.isNotBlank(bo.getSupplierCode()), BaseSupplierInfo::getSupplierCode, bo.getSupplierCode())
|
||||
.like(StringUtils.isNotBlank(bo.getSupplierName()), BaseSupplierInfo::getSupplierName, bo.getSupplierName())
|
||||
.eq(bo.getErpId() != null, BaseSupplierInfo::getErpId, bo.getErpId())
|
||||
.eq(StringUtils.isNotBlank(bo.getSupplierStatus()), BaseSupplierInfo::getSupplierStatus, bo.getSupplierStatus())
|
||||
.between(params.get("beginAuditDate") != null && params.get("endAuditDate") != null,
|
||||
BaseSupplierInfo::getAuditDate ,params.get("beginAuditDate"), params.get("endAuditDate"))
|
||||
.between(params.get("beginErpModifyDate") != null && params.get("endErpModifyDate") != null,
|
||||
BaseSupplierInfo::getErpModifyDate ,params.get("beginErpModifyDate"), params.get("endErpModifyDate"))
|
||||
.orderByDesc(BaseSupplierInfo::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增供应商信息
|
||||
*
|
||||
* @param bo 供应商信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(BaseSupplierInfoBo bo) {
|
||||
BaseSupplierInfo add = MapstructUtils.convert(bo, BaseSupplierInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setSupplierId(add.getSupplierId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改供应商信息
|
||||
*
|
||||
* @param bo 供应商信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(BaseSupplierInfoBo bo) {
|
||||
BaseSupplierInfo update = MapstructUtils.convert(bo, BaseSupplierInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(BaseSupplierInfo entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
//校验编码是否重复
|
||||
if (StringUtils.isNotBlank(entity.getSupplierCode())) {
|
||||
BaseSupplierInfoBo query = new BaseSupplierInfoBo();
|
||||
query.setSupplierCode(entity.getSupplierCode());
|
||||
MPJLambdaWrapper<BaseSupplierInfo> lqw = buildQueryWrapper(query);
|
||||
BaseSupplierInfo baseSupplierInfo = baseMapper.selectOne(lqw);
|
||||
if (baseSupplierInfo != null && !baseSupplierInfo.getSupplierId().equals(entity.getSupplierId())) {
|
||||
throw new ServiceException("编码已存在");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除供应商信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,169 @@
|
||||
package org.dromara.qms.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.qms.domain.bo.ProdBaseStationInfoBo;
|
||||
import org.dromara.qms.domain.vo.ProdBaseStationInfoVo;
|
||||
import org.dromara.qms.mapper.ProdBaseStationInfoMapper;
|
||||
import org.dromara.qms.service.IProdBaseStationInfoService;
|
||||
import org.dromara.qms.domain.ProdBaseProcessInfo;
|
||||
import org.dromara.qms.domain.ProdBaseStationInfo;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 工位信息Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-01-06
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class ProdBaseStationInfoServiceImpl implements IProdBaseStationInfoService {
|
||||
|
||||
private final ProdBaseStationInfoMapper baseMapper;
|
||||
|
||||
// private final ProdBaseStationMaterialtypeMapper stationMaterialtypeMapper;
|
||||
|
||||
|
||||
/**
|
||||
* 查询工位信息
|
||||
*
|
||||
* @param stationId 主键
|
||||
* @return 工位信息
|
||||
*/
|
||||
@Override
|
||||
public ProdBaseStationInfoVo queryById(Long stationId) {
|
||||
ProdBaseStationInfoBo bo = new ProdBaseStationInfoBo();
|
||||
bo.setStationId(stationId);
|
||||
MPJLambdaWrapper<ProdBaseStationInfo> lqw = buildQueryWrapper(bo);
|
||||
ProdBaseStationInfoVo prodBaseStationInfoVo = baseMapper.selectVoOne(lqw);
|
||||
//机台关联工序
|
||||
// MPJLambdaWrapper<ProdBaseStationMaterialtype> lqwRelation = JoinWrappers.lambda(ProdBaseStationMaterialtype.class)
|
||||
// .selectAll(ProdBaseStationMaterialtype.class)
|
||||
// .eq(bo.getStationId() != null, ProdBaseStationMaterialtype::getStationId, bo.getStationId())
|
||||
// .orderByAsc(ProdBaseStationMaterialtype::getCreateTime);
|
||||
// List<ProdBaseStationMaterialtype> prodBaseStationMaterialtypeList = stationMaterialtypeMapper.selectList(lqwRelation);
|
||||
// prodBaseStationInfoVo.setProdBaseStationMaterialtypeList(prodBaseStationMaterialtypeList);
|
||||
return prodBaseStationInfoVo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询工位信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 工位信息分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<ProdBaseStationInfoVo> queryPageList(ProdBaseStationInfoBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<ProdBaseStationInfo> lqw = buildQueryWrapper(bo);
|
||||
Page<ProdBaseStationInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的工位信息列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 工位信息列表
|
||||
*/
|
||||
@Override
|
||||
public List<ProdBaseStationInfoVo> queryList(ProdBaseStationInfoBo bo) {
|
||||
MPJLambdaWrapper<ProdBaseStationInfo> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<ProdBaseStationInfo> buildQueryWrapper(ProdBaseStationInfoBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<ProdBaseStationInfo> lqw = JoinWrappers.lambda(ProdBaseStationInfo.class)
|
||||
.selectAll(ProdBaseStationInfo.class)
|
||||
.select(ProdBaseProcessInfo::getProcessName)
|
||||
// .select(ProdBaseMachineInfo::getMachineName)
|
||||
.leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdBaseStationInfo::getProcessId)
|
||||
// .leftJoin(ProdBaseMachineInfo.class, ProdBaseMachineInfo::getMachineId, ProdBaseStationInfo::getMachineId)
|
||||
.eq(bo.getStationId() != null, ProdBaseStationInfo::getStationId, bo.getStationId())
|
||||
.eq(StringUtils.isNotBlank(bo.getStationCode()), ProdBaseStationInfo::getStationCode, bo.getStationCode())
|
||||
.like(StringUtils.isNotBlank(bo.getStationName()), ProdBaseStationInfo::getStationName, bo.getStationName())
|
||||
.eq(StringUtils.isNotBlank(bo.getStationType()), ProdBaseStationInfo::getStationType, bo.getStationType())
|
||||
.eq(bo.getProcessId() != null, ProdBaseStationInfo::getProcessId, bo.getProcessId())
|
||||
.eq(bo.getMachineId() != null, ProdBaseStationInfo::getMachineId, bo.getMachineId())
|
||||
.like(StringUtils.isNotBlank(bo.getAgvCode()), ProdBaseStationInfo::getAgvCode, bo.getAgvCode())
|
||||
.like(StringUtils.isNotBlank(bo.getIpAddress()), ProdBaseStationInfo::getIpAddress, bo.getIpAddress())
|
||||
.eq(StringUtils.isNotBlank(bo.getActiveFlag()), ProdBaseStationInfo::getActiveFlag, bo.getActiveFlag())
|
||||
.orderByAsc(ProdBaseStationInfo::getCreateTime);
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工位信息
|
||||
*
|
||||
* @param bo 工位信息
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(ProdBaseStationInfoBo bo) {
|
||||
ProdBaseStationInfo add = MapstructUtils.convert(bo, ProdBaseStationInfo.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setStationId(add.getStationId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工位信息
|
||||
*
|
||||
* @param bo 工位信息
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(ProdBaseStationInfoBo bo) {
|
||||
ProdBaseStationInfo update = MapstructUtils.convert(bo, ProdBaseStationInfo.class);
|
||||
validEntityBeforeSave(update);
|
||||
// List<ProdBaseStationMaterialtype> prodBaseStationMaterialtypeList = bo.getProdBaseStationMaterialtypeList();
|
||||
// if (!prodBaseStationMaterialtypeList.isEmpty()) {
|
||||
// LambdaQueryWrapper<ProdBaseStationMaterialtype> lqw = Wrappers.lambdaQuery();
|
||||
// lqw.eq(StringUtils.isNotNull(bo.getStationId()), ProdBaseStationMaterialtype::getStationId, bo.getStationId());
|
||||
// stationMaterialtypeMapper.delete(lqw);
|
||||
// for (ProdBaseStationMaterialtype stationMaterialType : prodBaseStationMaterialtypeList) {
|
||||
// stationMaterialtypeMapper.insert(stationMaterialType);
|
||||
// }
|
||||
// }
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(ProdBaseStationInfo entity) {
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验并批量删除工位信息信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (isValid) {
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.qms.mapper.BaseMaterialInfoMapper">
|
||||
|
||||
<select id="queryByMaterialCode" resultType="org.dromara.pda.api.model.BaseMaterial">
|
||||
select material_code,material_name from base_material_info where material_code = #{materialCode}
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="selectMaterialJoinList" parameterType="BaseMaterialInfoBo" resultType="BaseMaterialInfoVo">
|
||||
select
|
||||
bmi.material_id,
|
||||
bmi.material_code,
|
||||
bmi.material_name,
|
||||
bmi.material_category_id,
|
||||
bmi.material_type_id,
|
||||
bmi.material_spec,
|
||||
bmi.material_unit_id,
|
||||
bmi.material_unit,
|
||||
bmt.matrial_type_code as material_type_code,
|
||||
bmt.matrial_type_name as material_type_name
|
||||
from base_material_info bmi
|
||||
left join base_material_type bmt on bmi.material_type_id = bmt.matrial_type_id
|
||||
<where>
|
||||
<if test="materialCode != null and materialCode != ''">and bmi.material_code like concat('%', #{materialCode},
|
||||
'%')
|
||||
</if>
|
||||
<if test="materialName != null and materialName != ''">and bmi.material_name like concat('%', #{materialName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="materialTypeId != null ">and bmi.material_type_id = #{materialTypeId}</if>
|
||||
</where>
|
||||
order by bmi.material_id desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.qms.mapper.BaseMaterialTypeMapper">
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.qms.mapper.BaseSupplierInfoMapper">
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,189 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.qms.mapper.ProdBaseProcessInfoMapper">
|
||||
|
||||
<resultMap type="ProdBaseProcessInfo" id="ProdBaseProcessInfoResult">
|
||||
<result property="processId" column="process_id"/>
|
||||
<result property="processCode" column="process_code"/>
|
||||
<result property="processName" column="process_name"/>
|
||||
<result property="processType" column="process_type"/>
|
||||
<result property="processFloor" column="process_floor"/>
|
||||
<result property="finalProcessFlag" column="final_process_flag"/>
|
||||
<result property="displayFlag" column="display_flag"/>
|
||||
<result property="productionTime" column="production_time"/>
|
||||
<result property="activeFlag" column="active_flag"/>
|
||||
<result property="remark" column="remark"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<!-- <resultMap id="ProdBaseProcessInfoProdBaseProcessProdlineResult" type="ProdBaseProcessInfo"-->
|
||||
<!-- extends="ProdBaseProcessInfoResult">-->
|
||||
<!-- <collection property="prodBaseProcessProdlineList" notNullColumn="sub_process_id" javaType="java.util.List"-->
|
||||
<!-- resultMap="ProdBaseProcessProdlineResult"/>-->
|
||||
<!-- </resultMap>-->
|
||||
|
||||
<!-- <resultMap type="ProdBaseProcessProdline" id="ProdBaseProcessProdlineResult">-->
|
||||
<!-- <result property="processId" column="sub_process_id"/>-->
|
||||
<!-- <result property="prodlineId" column="sub_prod_line_id"/>-->
|
||||
<!-- <result property="createBy" column="sub_create_by"/>-->
|
||||
<!-- <result property="createTime" column="sub_create_time"/>-->
|
||||
<!-- </resultMap>-->
|
||||
|
||||
<!-- <resultMap id="ProdBaseProcessInfoProdBaseProcessUserResult" type="ProdBaseProcessInfo"
|
||||
extends="ProdBaseProcessInfoResult">
|
||||
<collection property="prodBaseProcessUserList" notNullColumn="sub_process_id" javaType="java.util.List"
|
||||
resultMap="ProdBaseProcessUserResult"/>
|
||||
</resultMap> -->
|
||||
|
||||
<!-- <resultMap type="ProdBaseProcessUser" id="ProdBaseProcessUserResult">
|
||||
<result property="processId" column="sub_process_id"/>
|
||||
<result property="userId" column="sub_user_id"/>
|
||||
<result property="userName" column="sub_user_name"/>
|
||||
<result property="createBy" column="sub_create_by"/>
|
||||
<result property="createTime" column="sub_create_time"/>
|
||||
</resultMap> -->
|
||||
|
||||
<sql id="selectProdBaseProcessInfoVo">
|
||||
select process_id,
|
||||
process_code,
|
||||
process_name,
|
||||
process_type,
|
||||
process_floor,
|
||||
production_time,
|
||||
active_flag,
|
||||
remark,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
update_time,
|
||||
tenant_id
|
||||
from prod_base_process_info
|
||||
</sql>
|
||||
|
||||
<select id="selectProdBaseProcessInfoList" parameterType="ProdBaseProcessInfo" resultMap="ProdBaseProcessInfoResult">
|
||||
<include refid="selectProdBaseProcessInfoVo"/>
|
||||
<where>
|
||||
<if test="processCode != null and processCode != ''">and process_code = #{processCode}</if>
|
||||
<if test="processName != null and processName != ''">and process_name like concat('%', #{processName},
|
||||
'%')
|
||||
</if>
|
||||
<if test="processType != null and processType != ''">and process_type = #{processType}</if>
|
||||
<if test="productionTime != null ">and production_time = #{productionTime}</if>
|
||||
<if test="displayFlag != null and displayFlag != ''">and display_flag = #{displayFlag}</if>
|
||||
|
||||
<if test="activeFlag != null and activeFlag != ''">and active_flag = #{activeFlag}</if>
|
||||
<if test="remark != null and remark != ''">and remark = #{remark}</if>
|
||||
<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId}</if>
|
||||
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<!-- <select id="selectProdBaseProcessInfoByProcessId" parameterType="Long"-->
|
||||
<!-- resultMap="ProdBaseProcessInfoProdBaseProcessProdlineResult">-->
|
||||
<!-- select a.process_id,-->
|
||||
<!-- a.process_code,-->
|
||||
<!-- a.process_name,-->
|
||||
<!-- a.process_type,-->
|
||||
<!-- a.process_floor,-->
|
||||
<!-- a.production_time,-->
|
||||
<!-- a.active_flag,-->
|
||||
<!-- a.remark,-->
|
||||
<!-- a.create_by,-->
|
||||
<!-- a.create_time,-->
|
||||
<!-- a.update_by,-->
|
||||
<!-- a.update_time,-->
|
||||
<!-- a.tenant_id,-->
|
||||
<!-- b.process_id as sub_process_id,-->
|
||||
<!-- b.prod_line_id as sub_prod_line_id,-->
|
||||
<!-- b.create_by as sub_create_by,-->
|
||||
<!-- b.create_time as sub_create_time-->
|
||||
<!-- from prod_base_process_info a-->
|
||||
<!-- left join prod_base_process_prod_line b on b.process_id = a.process_id-->
|
||||
<!-- where a.process_id = #{processId}-->
|
||||
<!-- </select>-->
|
||||
|
||||
|
||||
|
||||
<insert id="insertProdBaseProcessInfo" parameterType="ProdBaseProcessInfo" useGeneratedKeys="true"
|
||||
keyProperty="processId">
|
||||
insert into prod_base_process_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="processCode != null">process_code,</if>
|
||||
<if test="processName != null and processName != ''">process_name,</if>
|
||||
<if test="processType != null and processType != ''">process_type,</if>
|
||||
<if test="processFloor != null and processFloor != ''">process_floor,</if>
|
||||
<if test="productionTime != null">production_time,</if>
|
||||
<if test="activeFlag != null and activeFlag != ''">active_flag,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="tenantId != null">tenant_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="processCode != null">#{processCode},</if>
|
||||
<if test="processName != null and processName != ''">#{processName},</if>
|
||||
<if test="processType != null and processType != ''">#{processType},</if>
|
||||
<if test="processFloor != null and processFloor != ''">#{processFloor},</if>
|
||||
<if test="productionTime != null">#{productionTime},</if>
|
||||
<if test="activeFlag != null and activeFlag != ''">#{activeFlag},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="tenantId != null">#{tenantId},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateProdBaseProcessInfo" parameterType="ProdBaseProcessInfo">
|
||||
update prod_base_process_info
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="processCode != null">process_code = #{processCode},</if>
|
||||
<if test="processName != null and processName != ''">process_name = #{processName},</if>
|
||||
<if test="processType != null and processType != ''">process_type = #{processType},</if>
|
||||
<if test="processFloor != null and processFloor != ''">process_floor = #{processFloor},</if>
|
||||
<if test="productionTime != null">production_time = #{productionTime},</if>
|
||||
<if test="activeFlag != null and activeFlag != ''">active_flag = #{activeFlag},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="tenantId != null ">tenant_id = #{tenantId},</if>
|
||||
</trim>
|
||||
where process_id = #{processId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteProdBaseProcessInfoByProcessId" parameterType="Long">
|
||||
delete
|
||||
from prod_base_process_info
|
||||
where process_id = #{processId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteProdBaseProcessInfoByProcessIds" parameterType="String">
|
||||
delete from prod_base_process_info where process_id in
|
||||
<foreach item="processId" collection="array" open="(" separator="," close=")">
|
||||
#{processId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteProdBaseProcessProdlineByProcessIds" parameterType="String">
|
||||
delete from prod_base_process_prod_line where process_id in
|
||||
<foreach item="processId" collection="array" open="(" separator="," close=")">
|
||||
#{processId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteProdBaseProcessProdlineByProcessId" parameterType="Long">
|
||||
delete
|
||||
from prod_base_process_prod_line
|
||||
where process_id = #{processId}
|
||||
</delete>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.qms.mapper.ProdBaseStationInfoMapper">
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue