Merge remote-tracking branch 'origin/master'
夜笙歌
2 years ago
commit
51817a09c6
@ -0,0 +1,18 @@
|
||||
package com.hw.common.core.constant;
|
||||
|
||||
/**
|
||||
* @Description:生产部分常量定义
|
||||
* @ProjectName:HwMes
|
||||
* @Author:xins
|
||||
* @Date:2024-01-26 11:02
|
||||
* @Version:1.0
|
||||
*/
|
||||
public class MesConstants {
|
||||
|
||||
/*条码类型*/
|
||||
public static final String MES_BARCODE_TYPE_RAW = "1";//原材料
|
||||
public static final String MES_BARCODE_TYPE_SEMI = "2";//半成品
|
||||
public static final String MES_BARCODE_TYPE_PRODUCT = "3";//成品
|
||||
public static final String MES_BARCODE_TYPE_BACKPLATE = "4";//背板
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.hw.common.core.constant;
|
||||
|
||||
/**
|
||||
* @Description:生产部分常量定义
|
||||
* @ProjectName:HwMes
|
||||
* @Author:xins
|
||||
* @Date:2024-01-26 11:02
|
||||
* @Version:1.0
|
||||
*/
|
||||
public class QmsConstants {
|
||||
|
||||
/*检验规则明细目标类型*/
|
||||
public static final String QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MATERIAL = "1";//物料
|
||||
|
||||
|
||||
/*检验项目项目属性*/
|
||||
public static final String QMS_CHECK_PROJECT_PROPERTY_QUALITATIVE = "1";//定性
|
||||
|
||||
/*检验方式*/
|
||||
public static final String QMS_CHECK_MODE = "1";//全检
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package com.hw.mes.controller;
|
||||
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.mes.domain.MesMaterialBom;
|
||||
import com.hw.mes.service.IMesMaterialBomService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料BOM信息Controller
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2024-01-30
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api")
|
||||
public class MesApiController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IMesMaterialBomService mesMaterialBomService;
|
||||
|
||||
/**
|
||||
* 查询物料BOM信息列表
|
||||
*/
|
||||
// @RequiresPermissions("mes:materialBom:list")
|
||||
@GetMapping("/getMaterialBoms")
|
||||
public AjaxResult getMaterialBoms(MesMaterialBom mesMaterialBom)
|
||||
{
|
||||
List<MesMaterialBom> list = mesMaterialBomService.selectMesMaterialBomJoinList(mesMaterialBom);
|
||||
return success(list);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,105 @@
|
||||
package com.hw.qms.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.hw.common.log.annotation.Log;
|
||||
import com.hw.common.log.enums.BusinessType;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.qms.domain.QmsCheckProject;
|
||||
import com.hw.qms.service.IQmsCheckProjectService;
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.utils.poi.ExcelUtil;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 检验项目Controller
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/checkproject")
|
||||
public class QmsCheckProjectController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IQmsCheckProjectService qmsCheckProjectService;
|
||||
|
||||
/**
|
||||
* 查询检验项目列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkproject:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
startPage();
|
||||
List<QmsCheckProject> list = qmsCheckProjectService.selectQmsCheckProjectList(qmsCheckProject);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出检验项目列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkproject:export")
|
||||
@Log(title = "检验项目", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
List<QmsCheckProject> list = qmsCheckProjectService.selectQmsCheckProjectList(qmsCheckProject);
|
||||
ExcelUtil<QmsCheckProject> util = new ExcelUtil<QmsCheckProject>(QmsCheckProject.class);
|
||||
util.exportExcel(response, list, "检验项目数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取检验项目详细信息
|
||||
*/
|
||||
@RequiresPermissions("qms:checkproject:query")
|
||||
@GetMapping(value = "/{checkProjectId}")
|
||||
public AjaxResult getInfo(@PathVariable("checkProjectId") Long checkProjectId)
|
||||
{
|
||||
return success(qmsCheckProjectService.selectQmsCheckProjectByCheckProjectId(checkProjectId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验项目
|
||||
*/
|
||||
@RequiresPermissions("qms:checkproject:add")
|
||||
@Log(title = "检验项目", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
return toAjax(qmsCheckProjectService.insertQmsCheckProject(qmsCheckProject));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验项目
|
||||
*/
|
||||
@RequiresPermissions("qms:checkproject:edit")
|
||||
@Log(title = "检验项目", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
return toAjax(qmsCheckProjectService.updateQmsCheckProject(qmsCheckProject));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验项目
|
||||
*/
|
||||
@RequiresPermissions("qms:checkproject:remove")
|
||||
@Log(title = "检验项目", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{checkProjectIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] checkProjectIds)
|
||||
{
|
||||
return toAjax(qmsCheckProjectService.deleteQmsCheckProjectByCheckProjectIds(checkProjectIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,105 @@
|
||||
package com.hw.qms.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.hw.common.log.annotation.Log;
|
||||
import com.hw.common.log.enums.BusinessType;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.qms.domain.QmsCheckResult;
|
||||
import com.hw.qms.service.IQmsCheckResultService;
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.utils.poi.ExcelUtil;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 质检结果Controller
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/checkresult")
|
||||
public class QmsCheckResultController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IQmsCheckResultService qmsCheckResultService;
|
||||
|
||||
/**
|
||||
* 查询质检结果列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresult:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
startPage();
|
||||
List<QmsCheckResult> list = qmsCheckResultService.selectQmsCheckResultList(qmsCheckResult);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出质检结果列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresult:export")
|
||||
@Log(title = "质检结果", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
List<QmsCheckResult> list = qmsCheckResultService.selectQmsCheckResultList(qmsCheckResult);
|
||||
ExcelUtil<QmsCheckResult> util = new ExcelUtil<QmsCheckResult>(QmsCheckResult.class);
|
||||
util.exportExcel(response, list, "质检结果数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取质检结果详细信息
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresult:query")
|
||||
@GetMapping(value = "/{checkResultId}")
|
||||
public AjaxResult getInfo(@PathVariable("checkResultId") Long checkResultId)
|
||||
{
|
||||
return success(qmsCheckResultService.selectQmsCheckResultByCheckResultId(checkResultId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检结果
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresult:add")
|
||||
@Log(title = "质检结果", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
return toAjax(qmsCheckResultService.insertQmsCheckResult(qmsCheckResult));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质检结果
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresult:edit")
|
||||
@Log(title = "质检结果", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
return toAjax(qmsCheckResultService.updateQmsCheckResult(qmsCheckResult));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除质检结果
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresult:remove")
|
||||
@Log(title = "质检结果", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{checkResultIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] checkResultIds)
|
||||
{
|
||||
return toAjax(qmsCheckResultService.deleteQmsCheckResultByCheckResultIds(checkResultIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,105 @@
|
||||
package com.hw.qms.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.hw.common.log.annotation.Log;
|
||||
import com.hw.common.log.enums.BusinessType;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
import com.hw.qms.service.IQmsCheckResultDetailService;
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.utils.poi.ExcelUtil;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 质检结果详情Controller
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/checkresultdetail")
|
||||
public class QmsCheckResultDetailController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IQmsCheckResultDetailService qmsCheckResultDetailService;
|
||||
|
||||
/**
|
||||
* 查询质检结果详情列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresultdetail:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(QmsCheckResultDetail qmsCheckResultDetail)
|
||||
{
|
||||
startPage();
|
||||
List<QmsCheckResultDetail> list = qmsCheckResultDetailService.selectQmsCheckResultDetailList(qmsCheckResultDetail);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出质检结果详情列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresultdetail:export")
|
||||
@Log(title = "质检结果详情", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, QmsCheckResultDetail qmsCheckResultDetail)
|
||||
{
|
||||
List<QmsCheckResultDetail> list = qmsCheckResultDetailService.selectQmsCheckResultDetailList(qmsCheckResultDetail);
|
||||
ExcelUtil<QmsCheckResultDetail> util = new ExcelUtil<QmsCheckResultDetail>(QmsCheckResultDetail.class);
|
||||
util.exportExcel(response, list, "质检结果详情数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取质检结果详情详细信息
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresultdetail:query")
|
||||
@GetMapping(value = "/{checkResultDetailId}")
|
||||
public AjaxResult getInfo(@PathVariable("checkResultDetailId") Long checkResultDetailId)
|
||||
{
|
||||
return success(qmsCheckResultDetailService.selectQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检结果详情
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresultdetail:add")
|
||||
@Log(title = "质检结果详情", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody QmsCheckResultDetail qmsCheckResultDetail)
|
||||
{
|
||||
return toAjax(qmsCheckResultDetailService.insertQmsCheckResultDetail(qmsCheckResultDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质检结果详情
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresultdetail:edit")
|
||||
@Log(title = "质检结果详情", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody QmsCheckResultDetail qmsCheckResultDetail)
|
||||
{
|
||||
return toAjax(qmsCheckResultDetailService.updateQmsCheckResultDetail(qmsCheckResultDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除质检结果详情
|
||||
*/
|
||||
@RequiresPermissions("qms:checkresultdetail:remove")
|
||||
@Log(title = "质检结果详情", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{checkResultDetailIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] checkResultDetailIds)
|
||||
{
|
||||
return toAjax(qmsCheckResultDetailService.deleteQmsCheckResultDetailByCheckResultDetailIds(checkResultDetailIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,105 @@
|
||||
package com.hw.qms.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.hw.common.log.annotation.Log;
|
||||
import com.hw.common.log.enums.BusinessType;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
import com.hw.qms.service.IQmsCheckRuleProjectService;
|
||||
import com.hw.common.core.web.controller.BaseController;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.utils.poi.ExcelUtil;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 检验规则项目Controller
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/checkruleproject")
|
||||
public class QmsCheckRuleProjectController extends BaseController
|
||||
{
|
||||
@Autowired
|
||||
private IQmsCheckRuleProjectService qmsCheckRuleProjectService;
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkruleproject:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(QmsCheckRuleProject qmsCheckRuleProject)
|
||||
{
|
||||
startPage();
|
||||
List<QmsCheckRuleProject> list = qmsCheckRuleProjectService.selectQmsCheckRuleProjectList(qmsCheckRuleProject);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出检验规则项目列表
|
||||
*/
|
||||
@RequiresPermissions("qms:checkruleproject:export")
|
||||
@Log(title = "检验规则项目", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, QmsCheckRuleProject qmsCheckRuleProject)
|
||||
{
|
||||
List<QmsCheckRuleProject> list = qmsCheckRuleProjectService.selectQmsCheckRuleProjectList(qmsCheckRuleProject);
|
||||
ExcelUtil<QmsCheckRuleProject> util = new ExcelUtil<QmsCheckRuleProject>(QmsCheckRuleProject.class);
|
||||
util.exportExcel(response, list, "检验规则项目数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取检验规则项目详细信息
|
||||
*/
|
||||
@RequiresPermissions("qms:checkruleproject:query")
|
||||
@GetMapping(value = "/{checkRuleId}")
|
||||
public AjaxResult getInfo(@PathVariable("checkRuleId") Long checkRuleId)
|
||||
{
|
||||
return success(qmsCheckRuleProjectService.selectQmsCheckRuleProjectByCheckRuleId(checkRuleId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验规则项目
|
||||
*/
|
||||
@RequiresPermissions("qms:checkruleproject:add")
|
||||
@Log(title = "检验规则项目", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody QmsCheckRuleProject qmsCheckRuleProject)
|
||||
{
|
||||
return toAjax(qmsCheckRuleProjectService.insertQmsCheckRuleProject(qmsCheckRuleProject));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验规则项目
|
||||
*/
|
||||
@RequiresPermissions("qms:checkruleproject:edit")
|
||||
@Log(title = "检验规则项目", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody QmsCheckRuleProject qmsCheckRuleProject)
|
||||
{
|
||||
return toAjax(qmsCheckRuleProjectService.updateQmsCheckRuleProject(qmsCheckRuleProject));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验规则项目
|
||||
*/
|
||||
@RequiresPermissions("qms:checkruleproject:remove")
|
||||
@Log(title = "检验规则项目", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{checkRuleIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] checkRuleIds)
|
||||
{
|
||||
return toAjax(qmsCheckRuleProjectService.deleteQmsCheckRuleProjectByCheckRuleIds(checkRuleIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
package com.hw.qms.controller;
|
||||
|
||||
import com.hw.common.core.exception.ServiceException;
|
||||
import com.hw.common.core.web.domain.AjaxResult;
|
||||
import com.hw.common.core.web.page.TableDataInfo;
|
||||
import com.hw.common.security.annotation.RequiresPermissions;
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
import com.hw.qms.domain.QmsCheckRule;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
import com.hw.qms.domain.vo.QmsMaterialCheckVo;
|
||||
import com.hw.qms.service.IMesBaseBarcodeInfoService;
|
||||
import com.hw.qms.service.IQmsCheckRuleProjectService;
|
||||
import com.hw.qms.service.IQmsCheckRuleService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description:PDA接口
|
||||
* @ProjectName:HwMes
|
||||
* @Author:xins
|
||||
* @Date:2024-01-26 10:18
|
||||
* @Version:1.0
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/qms/mobile")
|
||||
public class QmsMobileController {
|
||||
|
||||
@Autowired
|
||||
private IQmsCheckRuleProjectService qmsCheckRuleProjectService;
|
||||
@Autowired
|
||||
private IMesBaseBarcodeInfoService mesBaseBarcodeInfoService;
|
||||
|
||||
/**
|
||||
* 获取质检结果
|
||||
*/
|
||||
// @RequiresPermissions("qms:checkrule:list")
|
||||
@GetMapping("/getCheckResult")
|
||||
public AjaxResult getCheckResult(QmsMaterialCheckVo qmsMaterialCheckVo) {
|
||||
String materialBarcode = qmsMaterialCheckVo.getMaterialBarcode();
|
||||
MesBaseBarcodeInfo baseBarcodeInfo = mesBaseBarcodeInfoService.selectMesBaseBarcodeInfoByBarcodeInfo(materialBarcode);
|
||||
if (baseBarcodeInfo == null) {
|
||||
throw new ServiceException("此物料条码系统中不存在");
|
||||
}
|
||||
|
||||
|
||||
Long materialId = baseBarcodeInfo.getMaterialId();
|
||||
|
||||
List<QmsCheckRuleProject> checkRuleProjects = qmsCheckRuleProjectService.getCheckRuleProjects(materialId);
|
||||
return null;
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,142 @@
|
||||
package com.hw.qms.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.hw.common.core.annotation.Excel;
|
||||
import com.hw.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 检验规则维护对象 qms_check_rule
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public class QmsCheckRule extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 检验规则id */
|
||||
private Long checkRuleId;
|
||||
|
||||
/** 检验规则名称 */
|
||||
@Excel(name = "检验规则名称")
|
||||
private String checkRuleName;
|
||||
|
||||
/** 检验规则类型(1来料检验,3成品检验,4工序检验) */
|
||||
@Excel(name = "检验规则类型(1来料检验,3成品检验,4工序检验)")
|
||||
private String checkRuleType;
|
||||
|
||||
/** 目标类型(1:原材料类型,2:半成品类型,3:成品类型,4:原材料,5:半成品,6:成品,7:工序);先支持类型 */
|
||||
@Excel(name = "目标类型(1:原材料类型,2:半成品类型,3:成品类型,4:原材料,5:半成品,6:成品,7:工序);先支持类型")
|
||||
private String targetType;
|
||||
|
||||
/** 检验方式(1,全检2,抽检);这是按批次检验物料的检验方式 */
|
||||
@Excel(name = "检验方式(1,全检2,抽检);这是按批次检验物料的检验方式")
|
||||
private String checkMode;
|
||||
|
||||
/** 抽检比例 */
|
||||
@Excel(name = "抽检比例")
|
||||
private BigDecimal checkSample;
|
||||
|
||||
/** 状态(0禁用,1启用) */
|
||||
@Excel(name = "状态(0禁用,1启用)")
|
||||
private String checkRuleStatus;
|
||||
|
||||
/** 检验规则项目信息 */
|
||||
private List<QmsCheckRuleProject> qmsCheckRuleProjectList;
|
||||
|
||||
public void setCheckRuleId(Long checkRuleId)
|
||||
{
|
||||
this.checkRuleId = checkRuleId;
|
||||
}
|
||||
|
||||
public Long getCheckRuleId()
|
||||
{
|
||||
return checkRuleId;
|
||||
}
|
||||
public void setCheckRuleName(String checkRuleName)
|
||||
{
|
||||
this.checkRuleName = checkRuleName;
|
||||
}
|
||||
|
||||
public String getCheckRuleName()
|
||||
{
|
||||
return checkRuleName;
|
||||
}
|
||||
public void setCheckRuleType(String checkRuleType)
|
||||
{
|
||||
this.checkRuleType = checkRuleType;
|
||||
}
|
||||
|
||||
public String getCheckRuleType()
|
||||
{
|
||||
return checkRuleType;
|
||||
}
|
||||
public void setTargetType(String targetType)
|
||||
{
|
||||
this.targetType = targetType;
|
||||
}
|
||||
|
||||
public String getTargetType()
|
||||
{
|
||||
return targetType;
|
||||
}
|
||||
public void setCheckMode(String checkMode)
|
||||
{
|
||||
this.checkMode = checkMode;
|
||||
}
|
||||
|
||||
public String getCheckMode()
|
||||
{
|
||||
return checkMode;
|
||||
}
|
||||
public void setCheckSample(BigDecimal checkSample)
|
||||
{
|
||||
this.checkSample = checkSample;
|
||||
}
|
||||
|
||||
public BigDecimal getCheckSample()
|
||||
{
|
||||
return checkSample;
|
||||
}
|
||||
public void setCheckRuleStatus(String checkRuleStatus)
|
||||
{
|
||||
this.checkRuleStatus = checkRuleStatus;
|
||||
}
|
||||
|
||||
public String getCheckRuleStatus()
|
||||
{
|
||||
return checkRuleStatus;
|
||||
}
|
||||
|
||||
public List<QmsCheckRuleProject> getQmsCheckRuleProjectList()
|
||||
{
|
||||
return qmsCheckRuleProjectList;
|
||||
}
|
||||
|
||||
public void setQmsCheckRuleProjectList(List<QmsCheckRuleProject> qmsCheckRuleProjectList)
|
||||
{
|
||||
this.qmsCheckRuleProjectList = qmsCheckRuleProjectList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("checkRuleId", getCheckRuleId())
|
||||
.append("checkRuleName", getCheckRuleName())
|
||||
.append("checkRuleType", getCheckRuleType())
|
||||
.append("targetType", getTargetType())
|
||||
.append("checkMode", getCheckMode())
|
||||
.append("checkSample", getCheckSample())
|
||||
.append("checkRuleStatus", getCheckRuleStatus())
|
||||
.append("remark", getRemark())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("qmsCheckRuleProjectList", getQmsCheckRuleProjectList())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package com.hw.qms.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* @Description: 物料检验VO
|
||||
* @ClassName: QmsMaterialCheckVo
|
||||
* @Author : xins
|
||||
* @Date :2024-01-26 10:37
|
||||
* @Version :1.0
|
||||
*/
|
||||
@Data
|
||||
public class QmsMaterialCheckVo {
|
||||
|
||||
//物料条码
|
||||
@NotBlank(message="物料条码必须输入")
|
||||
private String materialBarcode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 条码信息Mapper接口
|
||||
*
|
||||
* @author xs
|
||||
* @date 2023-12-20
|
||||
*/
|
||||
public interface MesBaseBarcodeInfoMapper
|
||||
{
|
||||
/**
|
||||
* 查询条码信息
|
||||
*
|
||||
* @param barcodeInfo 条码信息UI
|
||||
* @return 条码信息
|
||||
*/
|
||||
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo);
|
||||
|
||||
|
||||
/**
|
||||
* 查询条码信息
|
||||
*
|
||||
* @param barcodeId 条码信息主键
|
||||
* @return 条码信息
|
||||
*/
|
||||
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId);
|
||||
|
||||
/**
|
||||
* 查询条码信息列表
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 条码信息集合
|
||||
*/
|
||||
public List<MesBaseBarcodeInfo> selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo);
|
||||
|
||||
/**
|
||||
* 新增条码信息
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo);
|
||||
|
||||
/**
|
||||
* 修改条码信息
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo);
|
||||
|
||||
/**
|
||||
* 删除条码信息
|
||||
*
|
||||
* @param barcodeId 条码信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId);
|
||||
|
||||
/**
|
||||
* 批量删除条码信息
|
||||
*
|
||||
* @param barcodeIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds);
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import com.hw.qms.domain.MesBaseMaterialInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料信息Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2023-12-21
|
||||
*/
|
||||
public interface MesBaseMaterialInfoMapper
|
||||
{
|
||||
/**
|
||||
* 查询物料信息
|
||||
*
|
||||
* @param materialId 物料信息主键
|
||||
* @return 物料信息
|
||||
*/
|
||||
public MesBaseMaterialInfo selectMesBaseMaterialInfoByMaterialId(Long materialId);
|
||||
|
||||
/**
|
||||
* 查询物料信息列表
|
||||
*
|
||||
* @param mesBaseMaterialInfo 物料信息
|
||||
* @return 物料信息集合
|
||||
*/
|
||||
public List<MesBaseMaterialInfo> selectMesBaseMaterialInfoList(MesBaseMaterialInfo mesBaseMaterialInfo);
|
||||
|
||||
/**
|
||||
* 新增物料信息
|
||||
*
|
||||
* @param mesBaseMaterialInfo 物料信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo);
|
||||
|
||||
/**
|
||||
* 修改物料信息
|
||||
*
|
||||
* @param mesBaseMaterialInfo 物料信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo);
|
||||
|
||||
/**
|
||||
* 删除物料信息
|
||||
*
|
||||
* @param materialId 物料信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseMaterialInfoByMaterialId(Long materialId);
|
||||
|
||||
/**
|
||||
* 批量删除物料信息
|
||||
*
|
||||
* @param materialIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseMaterialInfoByMaterialIds(Long[] materialIds);
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询物料信息列表
|
||||
*
|
||||
* @param materialIds 物料信息ID列表
|
||||
* @return 物料信息集合
|
||||
*/
|
||||
public List<MesBaseMaterialInfo> selectMesBaseMaterialInfoListByMaterialIds(Long[] materialIds);
|
||||
|
||||
|
||||
/**
|
||||
* 查询物料信息列表,提供给仓储配置物料列表使用
|
||||
*
|
||||
* @param mesBaseMaterialInfo 物料信息
|
||||
* @return 物料信息集合
|
||||
*/
|
||||
public List<MesBaseMaterialInfo> selectMaterialInfos4AllocateCheckRule(MesBaseMaterialInfo mesBaseMaterialInfo);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckProject;
|
||||
|
||||
/**
|
||||
* 检验项目Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface QmsCheckProjectMapper
|
||||
{
|
||||
/**
|
||||
* 查询检验项目
|
||||
*
|
||||
* @param checkProjectId 检验项目主键
|
||||
* @return 检验项目
|
||||
*/
|
||||
public QmsCheckProject selectQmsCheckProjectByCheckProjectId(Long checkProjectId);
|
||||
|
||||
/**
|
||||
* 查询检验项目列表
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 检验项目集合
|
||||
*/
|
||||
public List<QmsCheckProject> selectQmsCheckProjectList(QmsCheckProject qmsCheckProject);
|
||||
|
||||
/**
|
||||
* 新增检验项目
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckProject(QmsCheckProject qmsCheckProject);
|
||||
|
||||
/**
|
||||
* 修改检验项目
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckProject(QmsCheckProject qmsCheckProject);
|
||||
|
||||
/**
|
||||
* 删除检验项目
|
||||
*
|
||||
* @param checkProjectId 检验项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckProjectByCheckProjectId(Long checkProjectId);
|
||||
|
||||
/**
|
||||
* 批量删除检验项目
|
||||
*
|
||||
* @param checkProjectIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckProjectByCheckProjectIds(Long[] checkProjectIds);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验项目列表,提供给检验规则查询未分配项目使用
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 检验项目集合
|
||||
*/
|
||||
public List<QmsCheckProject> selectQmsCheckProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
import com.hw.qms.domain.QmsCheckResultDetailProject;
|
||||
|
||||
/**
|
||||
* 质检结果详情Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface QmsCheckResultDetailMapper
|
||||
{
|
||||
/**
|
||||
* 查询质检结果详情
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情主键
|
||||
* @return 质检结果详情
|
||||
*/
|
||||
public QmsCheckResultDetail selectQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId);
|
||||
|
||||
/**
|
||||
* 查询质检结果详情列表
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 质检结果详情集合
|
||||
*/
|
||||
public List<QmsCheckResultDetail> selectQmsCheckResultDetailList(QmsCheckResultDetail qmsCheckResultDetail);
|
||||
|
||||
/**
|
||||
* 新增质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail);
|
||||
|
||||
/**
|
||||
* 修改质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail);
|
||||
|
||||
/**
|
||||
* 删除质检结果详情
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId);
|
||||
|
||||
/**
|
||||
* 批量删除质检结果详情
|
||||
*
|
||||
* @param checkResultDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailByCheckResultDetailIds(Long[] checkResultDetailIds);
|
||||
|
||||
/**
|
||||
* 批量删除质检结果详情项目信息
|
||||
*
|
||||
* @param checkResultDetailIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailProjectByCheckResultDetailIds(Long[] checkResultDetailIds);
|
||||
|
||||
/**
|
||||
* 批量新增质检结果详情项目信息
|
||||
*
|
||||
* @param qmsCheckResultDetailProjectList 质检结果详情项目信息列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int batchQmsCheckResultDetailProject(List<QmsCheckResultDetailProject> qmsCheckResultDetailProjectList);
|
||||
|
||||
|
||||
/**
|
||||
* 通过质检结果详情主键删除质检结果详情项目信息信息
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailProjectByCheckResultDetailId(Long checkResultDetailId);
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询质检结果详情
|
||||
*
|
||||
* @param materialBarcode 物料条码
|
||||
* @return 质检结果详情
|
||||
*/
|
||||
public QmsCheckResultDetail selectQmsCheckResultDetailByMaterialBarcode(String materialBarcode);
|
||||
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckResult;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
|
||||
/**
|
||||
* 质检结果Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface QmsCheckResultMapper
|
||||
{
|
||||
/**
|
||||
* 查询质检结果
|
||||
*
|
||||
* @param checkResultId 质检结果主键
|
||||
* @return 质检结果
|
||||
*/
|
||||
public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId);
|
||||
|
||||
/**
|
||||
* 查询质检结果列表
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 质检结果集合
|
||||
*/
|
||||
public List<QmsCheckResult> selectQmsCheckResultList(QmsCheckResult qmsCheckResult);
|
||||
|
||||
/**
|
||||
* 新增质检结果
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckResult(QmsCheckResult qmsCheckResult);
|
||||
|
||||
/**
|
||||
* 修改质检结果
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckResult(QmsCheckResult qmsCheckResult);
|
||||
|
||||
/**
|
||||
* 删除质检结果
|
||||
*
|
||||
* @param checkResultId 质检结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultByCheckResultId(Long checkResultId);
|
||||
|
||||
/**
|
||||
* 批量删除质检结果
|
||||
*
|
||||
* @param checkResultIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds);
|
||||
|
||||
/**
|
||||
* 批量删除质检结果详情
|
||||
*
|
||||
* @param checkResultIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailByCheckResultIds(Long[] checkResultIds);
|
||||
|
||||
/**
|
||||
* 批量新增质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetailList 质检结果详情列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int batchQmsCheckResultDetail(List<QmsCheckResultDetail> qmsCheckResultDetailList);
|
||||
|
||||
|
||||
/**
|
||||
* 通过质检结果主键删除质检结果详情信息
|
||||
*
|
||||
* @param checkResultId 质检结果ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailByCheckResultId(Long checkResultId);
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckRuleDetail;
|
||||
|
||||
/**
|
||||
* 检验规则明细Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-26
|
||||
*/
|
||||
public interface QmsCheckRuleDetailMapper
|
||||
{
|
||||
/**
|
||||
* 查询检验规则明细
|
||||
*
|
||||
* @param checkRuleId 检验规则明细主键
|
||||
* @return 检验规则明细
|
||||
*/
|
||||
public QmsCheckRuleDetail selectQmsCheckRuleDetailByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 查询检验规则明细列表
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 检验规则明细集合
|
||||
*/
|
||||
public List<QmsCheckRuleDetail> selectQmsCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 新增检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 修改检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 删除检验规则明细
|
||||
*
|
||||
* @param checkRuleId 检验规则明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleDetailByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则明细
|
||||
*
|
||||
* @param checkRuleIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleDetailByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验规则明细列表,Join material
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 检验规则明细集合
|
||||
*/
|
||||
public List<QmsCheckRuleDetail> selectQmsCheckRuleDetailJoinList(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除检验规则明细
|
||||
*
|
||||
* @param checkRuleDetails 需要删除的数据列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleDetails(List<QmsCheckRuleDetail> checkRuleDetails);
|
||||
}
|
||||
@ -0,0 +1,98 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckRule;
|
||||
import com.hw.qms.domain.QmsCheckRuleDetail;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
|
||||
/**
|
||||
* 检验规则维护Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-26
|
||||
*/
|
||||
public interface QmsCheckRuleMapper
|
||||
{
|
||||
/**
|
||||
* 查询检验规则维护
|
||||
*
|
||||
* @param checkRuleId 检验规则维护主键
|
||||
* @return 检验规则维护
|
||||
*/
|
||||
public QmsCheckRule selectQmsCheckRuleByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 查询检验规则维护列表
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 检验规则维护集合
|
||||
*/
|
||||
public List<QmsCheckRule> selectQmsCheckRuleList(QmsCheckRule qmsCheckRule);
|
||||
|
||||
/**
|
||||
* 新增检验规则维护
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckRule(QmsCheckRule qmsCheckRule);
|
||||
|
||||
/**
|
||||
* 修改检验规则维护
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckRule(QmsCheckRule qmsCheckRule);
|
||||
|
||||
/**
|
||||
* 删除检验规则维护
|
||||
*
|
||||
* @param checkRuleId 检验规则维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则维护
|
||||
*
|
||||
* @param checkRuleIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
/**
|
||||
* 批量新增检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetailList 检验规则明细列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int batchQmsCheckRuleDetail(List<QmsCheckRuleDetail> qmsCheckRuleDetailList);
|
||||
|
||||
/**
|
||||
* 通过检验规则维护主键删除检验规则项目信息
|
||||
*
|
||||
* @param checkRuleId 检验规则维护ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 批量新增检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProjectList 检验规则项目列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int batchQmsCheckRuleProject(List<QmsCheckRuleProject> qmsCheckRuleProjectList);
|
||||
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
package com.hw.qms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
|
||||
/**
|
||||
* 检验规则项目Mapper接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface QmsCheckRuleProjectMapper
|
||||
{
|
||||
/**
|
||||
* 查询检验规则项目
|
||||
*
|
||||
* @param checkRuleId 检验规则项目主键
|
||||
* @return 检验规则项目
|
||||
*/
|
||||
public QmsCheckRuleProject selectQmsCheckRuleProjectByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目集合
|
||||
*/
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectList(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 新增检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 修改检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 删除检验规则项目
|
||||
*
|
||||
* @param checkRuleId 检验规则项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
/**
|
||||
* 根据检验规则明细的target查询检验规则项目列表
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目集合
|
||||
*/
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectListByTarget(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleProjects 需要删除的数据列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjects(List<QmsCheckRuleProject> checkRuleProjects);
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目集合
|
||||
*/
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectJoinList(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 条码信息Service接口
|
||||
*
|
||||
* @author xs
|
||||
* @date 2023-12-20
|
||||
*/
|
||||
public interface IMesBaseBarcodeInfoService
|
||||
{
|
||||
/**
|
||||
* 查询条码信息
|
||||
*
|
||||
* @param barcodeInfo 条码信息UID
|
||||
* @return 条码信息
|
||||
*/
|
||||
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo);
|
||||
|
||||
|
||||
/**
|
||||
* 查询条码信息
|
||||
*
|
||||
* @param barcodeId 条码信息主键
|
||||
* @return 条码信息
|
||||
*/
|
||||
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId);
|
||||
|
||||
/**
|
||||
* 查询条码信息列表
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 条码信息集合
|
||||
*/
|
||||
public List<MesBaseBarcodeInfo> selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo);
|
||||
|
||||
/**
|
||||
* 新增条码信息
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo);
|
||||
|
||||
/**
|
||||
* 修改条码信息
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo);
|
||||
|
||||
/**
|
||||
* 批量删除条码信息
|
||||
*
|
||||
* @param barcodeIds 需要删除的条码信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds);
|
||||
|
||||
/**
|
||||
* 删除条码信息信息
|
||||
*
|
||||
* @param barcodeId 条码信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId);
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckProject;
|
||||
|
||||
/**
|
||||
* 检验项目Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface IQmsCheckProjectService
|
||||
{
|
||||
/**
|
||||
* 查询检验项目
|
||||
*
|
||||
* @param checkProjectId 检验项目主键
|
||||
* @return 检验项目
|
||||
*/
|
||||
public QmsCheckProject selectQmsCheckProjectByCheckProjectId(Long checkProjectId);
|
||||
|
||||
/**
|
||||
* 查询检验项目列表
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 检验项目集合
|
||||
*/
|
||||
public List<QmsCheckProject> selectQmsCheckProjectList(QmsCheckProject qmsCheckProject);
|
||||
|
||||
/**
|
||||
* 新增检验项目
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckProject(QmsCheckProject qmsCheckProject);
|
||||
|
||||
/**
|
||||
* 修改检验项目
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckProject(QmsCheckProject qmsCheckProject);
|
||||
|
||||
/**
|
||||
* 批量删除检验项目
|
||||
*
|
||||
* @param checkProjectIds 需要删除的检验项目主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckProjectByCheckProjectIds(Long[] checkProjectIds);
|
||||
|
||||
/**
|
||||
* 删除检验项目信息
|
||||
*
|
||||
* @param checkProjectId 检验项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckProjectByCheckProjectId(Long checkProjectId);
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验项目列表,提供给检验规则查询未分配项目使用
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 检验项目
|
||||
*/
|
||||
public List<QmsCheckProject> selectQmsCheckProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject);
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
|
||||
/**
|
||||
* 质检结果详情Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface IQmsCheckResultDetailService
|
||||
{
|
||||
/**
|
||||
* 查询质检结果详情
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情主键
|
||||
* @return 质检结果详情
|
||||
*/
|
||||
public QmsCheckResultDetail selectQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId);
|
||||
|
||||
/**
|
||||
* 查询质检结果详情列表
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 质检结果详情集合
|
||||
*/
|
||||
public List<QmsCheckResultDetail> selectQmsCheckResultDetailList(QmsCheckResultDetail qmsCheckResultDetail);
|
||||
|
||||
/**
|
||||
* 新增质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail);
|
||||
|
||||
/**
|
||||
* 修改质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail);
|
||||
|
||||
/**
|
||||
* 批量删除质检结果详情
|
||||
*
|
||||
* @param checkResultDetailIds 需要删除的质检结果详情主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailByCheckResultDetailIds(Long[] checkResultDetailIds);
|
||||
|
||||
/**
|
||||
* 删除质检结果详情信息
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId);
|
||||
|
||||
/**
|
||||
* 获取质检结果详情
|
||||
* @param materialBarcode 物料条码
|
||||
* @return
|
||||
*/
|
||||
public QmsCheckResultDetail getCheckResultDetail(String materialBarcode);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckResult;
|
||||
|
||||
/**
|
||||
* 质检结果Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface IQmsCheckResultService
|
||||
{
|
||||
/**
|
||||
* 查询质检结果
|
||||
*
|
||||
* @param checkResultId 质检结果主键
|
||||
* @return 质检结果
|
||||
*/
|
||||
public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId);
|
||||
|
||||
/**
|
||||
* 查询质检结果列表
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 质检结果集合
|
||||
*/
|
||||
public List<QmsCheckResult> selectQmsCheckResultList(QmsCheckResult qmsCheckResult);
|
||||
|
||||
/**
|
||||
* 新增质检结果
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckResult(QmsCheckResult qmsCheckResult);
|
||||
|
||||
/**
|
||||
* 修改质检结果
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckResult(QmsCheckResult qmsCheckResult);
|
||||
|
||||
/**
|
||||
* 批量删除质检结果
|
||||
*
|
||||
* @param checkResultIds 需要删除的质检结果主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds);
|
||||
|
||||
/**
|
||||
* 删除质检结果信息
|
||||
*
|
||||
* @param checkResultId 质检结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckResultByCheckResultId(Long checkResultId);
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckRuleDetail;
|
||||
|
||||
/**
|
||||
* 检验规则明细Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-26
|
||||
*/
|
||||
public interface IQmsCheckRuleDetailService
|
||||
{
|
||||
/**
|
||||
* 查询检验规则明细
|
||||
*
|
||||
* @param checkRuleId 检验规则明细主键
|
||||
* @return 检验规则明细
|
||||
*/
|
||||
public QmsCheckRuleDetail selectQmsCheckRuleDetailByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 查询检验规则明细列表
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 检验规则明细集合
|
||||
*/
|
||||
public List<QmsCheckRuleDetail> selectQmsCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 新增检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 修改检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则明细
|
||||
*
|
||||
* @param checkRuleIds 需要删除的检验规则明细主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleDetailByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
/**
|
||||
* 删除检验规则明细信息
|
||||
*
|
||||
* @param checkRuleId 检验规则明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleDetailByCheckRuleId(Long checkRuleId);
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验规则明细列表,Join material
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 检验规则明细
|
||||
*/
|
||||
public List<QmsCheckRuleDetail> selectQmsCheckRuleDetailJoinList(QmsCheckRuleDetail qmsCheckRuleDetail);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则明细
|
||||
*
|
||||
* @param checkRuleDetailList 需要删除的检验规则明细列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleDetails(List<QmsCheckRuleDetail> checkRuleDetailList);
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
|
||||
/**
|
||||
* 检验规则项目Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
public interface IQmsCheckRuleProjectService
|
||||
{
|
||||
/**
|
||||
* 查询检验规则项目
|
||||
*
|
||||
* @param checkRuleId 检验规则项目主键
|
||||
* @return 检验规则项目
|
||||
*/
|
||||
public QmsCheckRuleProject selectQmsCheckRuleProjectByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目集合
|
||||
*/
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectList(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 新增检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 修改检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleIds 需要删除的检验规则项目主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
/**
|
||||
* 删除检验规则项目信息
|
||||
*
|
||||
* @param checkRuleId 检验规则项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 获取检验规则项目
|
||||
* @param materialId 物料ID
|
||||
* @return
|
||||
*/
|
||||
public List<QmsCheckRuleProject> getCheckRuleProjects(Long materialId);
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表,Join checkproject
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目
|
||||
*/
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectJoinList(QmsCheckRuleProject qmsCheckRuleProject);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleProjectList 需要删除的检验规则项目列表
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleProjects(List<QmsCheckRuleProject> checkRuleProjectList);
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
package com.hw.qms.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.hw.qms.domain.QmsCheckRule;
|
||||
import com.hw.qms.domain.QmsCheckRuleDetail;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
|
||||
/**
|
||||
* 检验规则维护Service接口
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-26
|
||||
*/
|
||||
public interface IQmsCheckRuleService
|
||||
{
|
||||
/**
|
||||
* 查询检验规则维护
|
||||
*
|
||||
* @param checkRuleId 检验规则维护主键
|
||||
* @return 检验规则维护
|
||||
*/
|
||||
public QmsCheckRule selectQmsCheckRuleByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 查询检验规则维护列表
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 检验规则维护集合
|
||||
*/
|
||||
public List<QmsCheckRule> selectQmsCheckRuleList(QmsCheckRule qmsCheckRule);
|
||||
|
||||
/**
|
||||
* 新增检验规则维护
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertQmsCheckRule(QmsCheckRule qmsCheckRule);
|
||||
|
||||
/**
|
||||
* 修改检验规则维护
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateQmsCheckRule(QmsCheckRule qmsCheckRule);
|
||||
|
||||
/**
|
||||
* 批量删除检验规则维护
|
||||
*
|
||||
* @param checkRuleIds 需要删除的检验规则维护主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleByCheckRuleIds(Long[] checkRuleIds);
|
||||
|
||||
/**
|
||||
* 删除检验规则维护信息
|
||||
*
|
||||
* @param checkRuleId 检验规则维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteQmsCheckRuleByCheckRuleId(Long checkRuleId);
|
||||
|
||||
/**
|
||||
* 批量插入检验规则明细
|
||||
* @param checkRuleDetailList
|
||||
*/
|
||||
public int batchInsertCheckRuleDetail(List<QmsCheckRuleDetail> checkRuleDetailList);
|
||||
|
||||
|
||||
/**
|
||||
* 批量插入检验规则项目
|
||||
* @param checkRuleProjectList
|
||||
*/
|
||||
public int batchInsertCheckRuleProject(List<QmsCheckRuleProject> checkRuleProjectList);
|
||||
}
|
||||
@ -0,0 +1,110 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import com.hw.common.core.utils.DateUtils;
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
import com.hw.qms.mapper.MesBaseBarcodeInfoMapper;
|
||||
import com.hw.qms.service.IMesBaseBarcodeInfoService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 条码信息Service业务层处理
|
||||
*
|
||||
* @author xs
|
||||
* @date 2023-12-20
|
||||
*/
|
||||
@Service
|
||||
public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
|
||||
{
|
||||
@Autowired
|
||||
private MesBaseBarcodeInfoMapper mesBaseBarcodeInfoMapper;
|
||||
|
||||
/**
|
||||
* 查询条码信息
|
||||
*
|
||||
* @param barcodeInfo 条码信息UID
|
||||
* @return 条码信息
|
||||
*/
|
||||
@Override
|
||||
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo)
|
||||
{
|
||||
return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeInfo(barcodeInfo);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询条码信息
|
||||
*
|
||||
* @param barcodeId 条码信息主键
|
||||
* @return 条码信息
|
||||
*/
|
||||
@Override
|
||||
public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId)
|
||||
{
|
||||
return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeId(barcodeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询条码信息列表
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 条码信息
|
||||
*/
|
||||
@Override
|
||||
public List<MesBaseBarcodeInfo> selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo)
|
||||
{
|
||||
return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoList(mesBaseBarcodeInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增条码信息
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo)
|
||||
{
|
||||
mesBaseBarcodeInfo.setCreateTime(DateUtils.getNowDate());
|
||||
return mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(mesBaseBarcodeInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改条码信息
|
||||
*
|
||||
* @param mesBaseBarcodeInfo 条码信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo)
|
||||
{
|
||||
mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate());
|
||||
return mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除条码信息
|
||||
*
|
||||
* @param barcodeIds 需要删除的条码信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds)
|
||||
{
|
||||
return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeIds(barcodeIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除条码信息信息
|
||||
*
|
||||
* @param barcodeId 条码信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId)
|
||||
{
|
||||
return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeId(barcodeId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hw.common.core.constant.QmsConstants;
|
||||
import com.hw.common.core.utils.DateUtils;
|
||||
import com.hw.common.security.utils.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.hw.qms.mapper.QmsCheckProjectMapper;
|
||||
import com.hw.qms.domain.QmsCheckProject;
|
||||
import com.hw.qms.service.IQmsCheckProjectService;
|
||||
|
||||
/**
|
||||
* 检验项目Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@Service
|
||||
public class QmsCheckProjectServiceImpl implements IQmsCheckProjectService
|
||||
{
|
||||
@Autowired
|
||||
private QmsCheckProjectMapper qmsCheckProjectMapper;
|
||||
|
||||
/**
|
||||
* 查询检验项目
|
||||
*
|
||||
* @param checkProjectId 检验项目主键
|
||||
* @return 检验项目
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckProject selectQmsCheckProjectByCheckProjectId(Long checkProjectId)
|
||||
{
|
||||
return qmsCheckProjectMapper.selectQmsCheckProjectByCheckProjectId(checkProjectId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验项目列表
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 检验项目
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckProject> selectQmsCheckProjectList(QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
return qmsCheckProjectMapper.selectQmsCheckProjectList(qmsCheckProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验项目
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertQmsCheckProject(QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
qmsCheckProject.setCreateBy(SecurityUtils.getUsername());
|
||||
qmsCheckProject.setCreateTime(DateUtils.getNowDate());
|
||||
return qmsCheckProjectMapper.insertQmsCheckProject(qmsCheckProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验项目
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateQmsCheckProject(QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
String checkProjectProperty = qmsCheckProject.getCheckProjectProperty();
|
||||
if(checkProjectProperty.equals(QmsConstants.QMS_CHECK_PROJECT_PROPERTY_QUALITATIVE)){
|
||||
qmsCheckProject.setStandardValue(null);
|
||||
qmsCheckProject.setUpperDiff(null);
|
||||
qmsCheckProject.setDownDiff(null);
|
||||
}
|
||||
|
||||
qmsCheckProject.setUpdateBy(SecurityUtils.getUsername());
|
||||
qmsCheckProject.setUpdateTime(DateUtils.getNowDate());
|
||||
return qmsCheckProjectMapper.updateQmsCheckProject(qmsCheckProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验项目
|
||||
*
|
||||
* @param checkProjectIds 需要删除的检验项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckProjectByCheckProjectIds(Long[] checkProjectIds)
|
||||
{
|
||||
return qmsCheckProjectMapper.deleteQmsCheckProjectByCheckProjectIds(checkProjectIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验项目信息
|
||||
*
|
||||
* @param checkProjectId 检验项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckProjectByCheckProjectId(Long checkProjectId)
|
||||
{
|
||||
return qmsCheckProjectMapper.deleteQmsCheckProjectByCheckProjectId(checkProjectId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验项目列表,提供给检验规则查询未分配项目使用
|
||||
*
|
||||
* @param qmsCheckProject 检验项目
|
||||
* @return 检验项目
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckProject> selectQmsCheckProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject)
|
||||
{
|
||||
return qmsCheckProjectMapper.selectQmsCheckProjects4AllocateCheckRule(qmsCheckProject);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,144 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hw.common.core.constant.QmsConstants;
|
||||
import com.hw.common.core.utils.DateUtils;
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
import com.hw.qms.domain.vo.QmsMaterialCheckVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import com.hw.common.core.utils.StringUtils;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.hw.qms.domain.QmsCheckResultDetailProject;
|
||||
import com.hw.qms.mapper.QmsCheckResultDetailMapper;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
import com.hw.qms.service.IQmsCheckResultDetailService;
|
||||
|
||||
/**
|
||||
* 质检结果详情Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@Service
|
||||
public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailService {
|
||||
@Autowired
|
||||
private QmsCheckResultDetailMapper qmsCheckResultDetailMapper;
|
||||
|
||||
/**
|
||||
* 查询质检结果详情
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情主键
|
||||
* @return 质检结果详情
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckResultDetail selectQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId) {
|
||||
return qmsCheckResultDetailMapper.selectQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询质检结果详情列表
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 质检结果详情
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckResultDetail> selectQmsCheckResultDetailList(QmsCheckResultDetail qmsCheckResultDetail) {
|
||||
return qmsCheckResultDetailMapper.selectQmsCheckResultDetailList(qmsCheckResultDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail) {
|
||||
qmsCheckResultDetail.setCreateTime(DateUtils.getNowDate());
|
||||
int rows = qmsCheckResultDetailMapper.insertQmsCheckResultDetail(qmsCheckResultDetail);
|
||||
insertQmsCheckResultDetailProject(qmsCheckResultDetail);
|
||||
return rows;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质检结果详情
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail) {
|
||||
qmsCheckResultDetail.setUpdateTime(DateUtils.getNowDate());
|
||||
qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailId(qmsCheckResultDetail.getCheckResultDetailId());
|
||||
insertQmsCheckResultDetailProject(qmsCheckResultDetail);
|
||||
return qmsCheckResultDetailMapper.updateQmsCheckResultDetail(qmsCheckResultDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除质检结果详情
|
||||
*
|
||||
* @param checkResultDetailIds 需要删除的质检结果详情主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int deleteQmsCheckResultDetailByCheckResultDetailIds(Long[] checkResultDetailIds) {
|
||||
qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailIds(checkResultDetailIds);
|
||||
return qmsCheckResultDetailMapper.deleteQmsCheckResultDetailByCheckResultDetailIds(checkResultDetailIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除质检结果详情信息
|
||||
*
|
||||
* @param checkResultDetailId 质检结果详情主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int deleteQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId) {
|
||||
qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailId(checkResultDetailId);
|
||||
return qmsCheckResultDetailMapper.deleteQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检结果详情项目信息信息
|
||||
*
|
||||
* @param qmsCheckResultDetail 质检结果详情对象
|
||||
*/
|
||||
public void insertQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) {
|
||||
List<QmsCheckResultDetailProject> qmsCheckResultDetailProjectList = qmsCheckResultDetail.getQmsCheckResultDetailProjectList();
|
||||
Long checkResultDetailId = qmsCheckResultDetail.getCheckResultDetailId();
|
||||
if (StringUtils.isNotNull(qmsCheckResultDetailProjectList)) {
|
||||
List<QmsCheckResultDetailProject> list = new ArrayList<QmsCheckResultDetailProject>();
|
||||
for (QmsCheckResultDetailProject qmsCheckResultDetailProject : qmsCheckResultDetailProjectList) {
|
||||
qmsCheckResultDetailProject.setCheckResultDetailId(checkResultDetailId);
|
||||
list.add(qmsCheckResultDetailProject);
|
||||
}
|
||||
if (list.size() > 0) {
|
||||
qmsCheckResultDetailMapper.batchQmsCheckResultDetailProject(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取质检结果详情
|
||||
* @param materialBarcode 物料条码
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckResultDetail getCheckResultDetail(String materialBarcode) {
|
||||
//现获取质检结果with质检项目结果详情信息
|
||||
QmsCheckResultDetail checkResultDetail = qmsCheckResultDetailMapper.selectQmsCheckResultDetailByMaterialBarcode(materialBarcode);
|
||||
return checkResultDetail;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,144 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hw.common.core.constant.QmsConstants;
|
||||
import com.hw.common.core.utils.DateUtils;
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
import com.hw.qms.domain.vo.QmsMaterialCheckVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.ArrayList;
|
||||
import com.hw.common.core.utils.StringUtils;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
import com.hw.qms.mapper.QmsCheckResultMapper;
|
||||
import com.hw.qms.domain.QmsCheckResult;
|
||||
import com.hw.qms.service.IQmsCheckResultService;
|
||||
|
||||
/**
|
||||
* 质检结果Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@Service
|
||||
public class QmsCheckResultServiceImpl implements IQmsCheckResultService
|
||||
{
|
||||
@Autowired
|
||||
private QmsCheckResultMapper qmsCheckResultMapper;
|
||||
|
||||
/**
|
||||
* 查询质检结果
|
||||
*
|
||||
* @param checkResultId 质检结果主键
|
||||
* @return 质检结果
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId)
|
||||
{
|
||||
return qmsCheckResultMapper.selectQmsCheckResultByCheckResultId(checkResultId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询质检结果列表
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 质检结果
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckResult> selectQmsCheckResultList(QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
return qmsCheckResultMapper.selectQmsCheckResultList(qmsCheckResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检结果
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int insertQmsCheckResult(QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
qmsCheckResult.setCreateTime(DateUtils.getNowDate());
|
||||
int rows = qmsCheckResultMapper.insertQmsCheckResult(qmsCheckResult);
|
||||
insertQmsCheckResultDetail(qmsCheckResult);
|
||||
return rows;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改质检结果
|
||||
*
|
||||
* @param qmsCheckResult 质检结果
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int updateQmsCheckResult(QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
qmsCheckResult.setUpdateTime(DateUtils.getNowDate());
|
||||
qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultId(qmsCheckResult.getCheckResultId());
|
||||
insertQmsCheckResultDetail(qmsCheckResult);
|
||||
return qmsCheckResultMapper.updateQmsCheckResult(qmsCheckResult);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除质检结果
|
||||
*
|
||||
* @param checkResultIds 需要删除的质检结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds)
|
||||
{
|
||||
qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultIds(checkResultIds);
|
||||
return qmsCheckResultMapper.deleteQmsCheckResultByCheckResultIds(checkResultIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除质检结果信息
|
||||
*
|
||||
* @param checkResultId 质检结果主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int deleteQmsCheckResultByCheckResultId(Long checkResultId)
|
||||
{
|
||||
qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultId(checkResultId);
|
||||
return qmsCheckResultMapper.deleteQmsCheckResultByCheckResultId(checkResultId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增质检结果详情信息
|
||||
*
|
||||
* @param qmsCheckResult 质检结果对象
|
||||
*/
|
||||
public void insertQmsCheckResultDetail(QmsCheckResult qmsCheckResult)
|
||||
{
|
||||
List<QmsCheckResultDetail> qmsCheckResultDetailList = qmsCheckResult.getQmsCheckResultDetailList();
|
||||
Long checkResultId = qmsCheckResult.getCheckResultId();
|
||||
if (StringUtils.isNotNull(qmsCheckResultDetailList))
|
||||
{
|
||||
List<QmsCheckResultDetail> list = new ArrayList<QmsCheckResultDetail>();
|
||||
for (QmsCheckResultDetail qmsCheckResultDetail : qmsCheckResultDetailList)
|
||||
{
|
||||
qmsCheckResultDetail.setCheckResultId(checkResultId);
|
||||
list.add(qmsCheckResultDetail);
|
||||
}
|
||||
if (list.size() > 0)
|
||||
{
|
||||
qmsCheckResultMapper.batchQmsCheckResultDetail(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,129 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.hw.qms.mapper.QmsCheckRuleDetailMapper;
|
||||
import com.hw.qms.domain.QmsCheckRuleDetail;
|
||||
import com.hw.qms.service.IQmsCheckRuleDetailService;
|
||||
|
||||
/**
|
||||
* 检验规则明细Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-26
|
||||
*/
|
||||
@Service
|
||||
public class QmsCheckRuleDetailServiceImpl implements IQmsCheckRuleDetailService
|
||||
{
|
||||
@Autowired
|
||||
private QmsCheckRuleDetailMapper qmsCheckRuleDetailMapper;
|
||||
|
||||
/**
|
||||
* 查询检验规则明细
|
||||
*
|
||||
* @param checkRuleId 检验规则明细主键
|
||||
* @return 检验规则明细
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckRuleDetail selectQmsCheckRuleDetailByCheckRuleId(Long checkRuleId)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.selectQmsCheckRuleDetailByCheckRuleId(checkRuleId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验规则明细列表
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 检验规则明细
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckRuleDetail> selectQmsCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.selectQmsCheckRuleDetailList(qmsCheckRuleDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.insertQmsCheckRuleDetail(qmsCheckRuleDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验规则明细
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.updateQmsCheckRuleDetail(qmsCheckRuleDetail);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验规则明细
|
||||
*
|
||||
* @param checkRuleIds 需要删除的检验规则明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckRuleDetailByCheckRuleIds(Long[] checkRuleIds)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.deleteQmsCheckRuleDetailByCheckRuleIds(checkRuleIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验规则明细信息
|
||||
*
|
||||
* @param checkRuleId 检验规则明细主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckRuleDetailByCheckRuleId(Long checkRuleId)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.deleteQmsCheckRuleDetailByCheckRuleId(checkRuleId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验规则明细列表,Join material
|
||||
*
|
||||
* @param qmsCheckRuleDetail 检验规则明细
|
||||
* @return 检验规则明细
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckRuleDetail> selectQmsCheckRuleDetailJoinList(QmsCheckRuleDetail qmsCheckRuleDetail)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.selectQmsCheckRuleDetailJoinList(qmsCheckRuleDetail);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除检验规则明细
|
||||
*
|
||||
* @param checkRuleDetailList 需要删除的检验规则明细列表
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckRuleDetails(List<QmsCheckRuleDetail> checkRuleDetailList)
|
||||
{
|
||||
return qmsCheckRuleDetailMapper.deleteQmsCheckRuleDetails(checkRuleDetailList);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,134 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hw.common.core.constant.QmsConstants;
|
||||
import com.hw.qms.domain.MesBaseBarcodeInfo;
|
||||
import com.hw.qms.domain.QmsCheckResultDetail;
|
||||
import com.hw.qms.domain.QmsCheckRuleDetail;
|
||||
import com.hw.qms.domain.vo.QmsMaterialCheckVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.hw.qms.mapper.QmsCheckRuleProjectMapper;
|
||||
import com.hw.qms.domain.QmsCheckRuleProject;
|
||||
import com.hw.qms.service.IQmsCheckRuleProjectService;
|
||||
|
||||
/**
|
||||
* 检验规则项目Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
@Service
|
||||
public class QmsCheckRuleProjectServiceImpl implements IQmsCheckRuleProjectService {
|
||||
@Autowired
|
||||
private QmsCheckRuleProjectMapper qmsCheckRuleProjectMapper;
|
||||
|
||||
/**
|
||||
* 查询检验规则项目
|
||||
*
|
||||
* @param checkRuleId 检验规则项目主键
|
||||
* @return 检验规则项目
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckRuleProject selectQmsCheckRuleProjectByCheckRuleId(Long checkRuleId) {
|
||||
return qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectByCheckRuleId(checkRuleId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectList(QmsCheckRuleProject qmsCheckRuleProject) {
|
||||
return qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectList(qmsCheckRuleProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject) {
|
||||
return qmsCheckRuleProjectMapper.insertQmsCheckRuleProject(qmsCheckRuleProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验规则项目
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject) {
|
||||
return qmsCheckRuleProjectMapper.updateQmsCheckRuleProject(qmsCheckRuleProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleIds 需要删除的检验规则项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds) {
|
||||
return qmsCheckRuleProjectMapper.deleteQmsCheckRuleProjectByCheckRuleIds(checkRuleIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验规则项目信息
|
||||
*
|
||||
* @param checkRuleId 检验规则项目主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId) {
|
||||
return qmsCheckRuleProjectMapper.deleteQmsCheckRuleProjectByCheckRuleId(checkRuleId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取检验规则项目
|
||||
* @param materialId 物料ID
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckRuleProject> getCheckRuleProjects(Long materialId) {
|
||||
QmsCheckRuleProject queryCheckRuleProject = new QmsCheckRuleProject();
|
||||
queryCheckRuleProject.setTargetType(QmsConstants.QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MATERIAL);
|
||||
queryCheckRuleProject.setTargetId(materialId);
|
||||
|
||||
List<QmsCheckRuleProject> checkRuleProjects = qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectListByTarget(queryCheckRuleProject);
|
||||
|
||||
return checkRuleProjects;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验规则项目列表,Join checkproject
|
||||
*
|
||||
* @param qmsCheckRuleProject 检验规则项目
|
||||
* @return 检验规则项目
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckRuleProject> selectQmsCheckRuleProjectJoinList(QmsCheckRuleProject qmsCheckRuleProject) {
|
||||
return qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectJoinList(qmsCheckRuleProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验规则项目
|
||||
*
|
||||
* @param checkRuleProjectList 需要删除的检验规则项目列表
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteQmsCheckRuleProjects(List<QmsCheckRuleProject> checkRuleProjectList)
|
||||
{
|
||||
return qmsCheckRuleProjectMapper.deleteQmsCheckRuleProjects(checkRuleProjectList);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,171 @@
|
||||
package com.hw.qms.service.impl;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.hw.common.core.constant.QmsConstants;
|
||||
import com.hw.common.core.constant.WmsConstants;
|
||||
import com.hw.common.core.utils.DateUtils;
|
||||
import com.hw.common.security.utils.SecurityUtils;
|
||||
import com.hw.qms.domain.*;
|
||||
import com.hw.qms.domain.vo.QmsMaterialCheckVo;
|
||||
import com.hw.qms.mapper.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import com.hw.common.core.utils.StringUtils;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.hw.qms.service.IQmsCheckRuleService;
|
||||
|
||||
/**
|
||||
* 检验规则维护Service业务层处理
|
||||
*
|
||||
* @author xins
|
||||
* @date 2024-01-25
|
||||
*/
|
||||
@Service
|
||||
public class QmsCheckRuleServiceImpl implements IQmsCheckRuleService {
|
||||
@Autowired
|
||||
private QmsCheckRuleMapper qmsCheckRuleMapper;
|
||||
|
||||
@Autowired
|
||||
private QmsCheckResultDetailMapper qmsCheckResultDetailMapper;
|
||||
|
||||
|
||||
/**
|
||||
* 查询检验规则维护
|
||||
*
|
||||
* @param checkRuleId 检验规则维护主键
|
||||
* @return 检验规则维护
|
||||
*/
|
||||
@Override
|
||||
public QmsCheckRule selectQmsCheckRuleByCheckRuleId(Long checkRuleId) {
|
||||
return qmsCheckRuleMapper.selectQmsCheckRuleByCheckRuleId(checkRuleId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询检验规则维护列表
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 检验规则维护
|
||||
*/
|
||||
@Override
|
||||
public List<QmsCheckRule> selectQmsCheckRuleList(QmsCheckRule qmsCheckRule) {
|
||||
return qmsCheckRuleMapper.selectQmsCheckRuleList(qmsCheckRule);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增检验规则维护
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int insertQmsCheckRule(QmsCheckRule qmsCheckRule) {
|
||||
qmsCheckRule.setCreateBy(SecurityUtils.getUsername());
|
||||
qmsCheckRule.setCreateTime(DateUtils.getNowDate());
|
||||
if (qmsCheckRule.getCheckMode().equals(QmsConstants.QMS_CHECK_MODE)) {
|
||||
qmsCheckRule.setCheckSample(null);
|
||||
}
|
||||
|
||||
int rows = qmsCheckRuleMapper.insertQmsCheckRule(qmsCheckRule);
|
||||
insertQmsCheckRuleProject(qmsCheckRule);
|
||||
return rows;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改检验规则维护
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int updateQmsCheckRule(QmsCheckRule qmsCheckRule) {
|
||||
qmsCheckRule.setUpdateBy(SecurityUtils.getUsername());
|
||||
qmsCheckRule.setUpdateTime(DateUtils.getNowDate());
|
||||
if (qmsCheckRule.getCheckMode().equals(QmsConstants.QMS_CHECK_MODE)) {
|
||||
qmsCheckRule.setCheckSample(null);
|
||||
}
|
||||
qmsCheckRuleMapper.deleteQmsCheckRuleProjectByCheckRuleId(qmsCheckRule.getCheckRuleId());
|
||||
insertQmsCheckRuleProject(qmsCheckRule);
|
||||
return qmsCheckRuleMapper.updateQmsCheckRule(qmsCheckRule);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除检验规则维护
|
||||
*
|
||||
* @param checkRuleIds 需要删除的检验规则维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int deleteQmsCheckRuleByCheckRuleIds(Long[] checkRuleIds) {
|
||||
qmsCheckRuleMapper.deleteQmsCheckRuleProjectByCheckRuleIds(checkRuleIds);
|
||||
return qmsCheckRuleMapper.deleteQmsCheckRuleByCheckRuleIds(checkRuleIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除检验规则维护信息
|
||||
*
|
||||
* @param checkRuleId 检验规则维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Transactional
|
||||
@Override
|
||||
public int deleteQmsCheckRuleByCheckRuleId(Long checkRuleId) {
|
||||
qmsCheckRuleMapper.deleteQmsCheckRuleProjectByCheckRuleId(checkRuleId);
|
||||
return qmsCheckRuleMapper.deleteQmsCheckRuleByCheckRuleId(checkRuleId);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 新增检验规则项目信息
|
||||
*
|
||||
* @param qmsCheckRule 检验规则维护对象
|
||||
*/
|
||||
public void insertQmsCheckRuleProject(QmsCheckRule qmsCheckRule)
|
||||
{
|
||||
List<QmsCheckRuleProject> qmsCheckRuleProjectList = qmsCheckRule.getQmsCheckRuleProjectList();
|
||||
Long checkRuleId = qmsCheckRule.getCheckRuleId();
|
||||
if (StringUtils.isNotNull(qmsCheckRuleProjectList))
|
||||
{
|
||||
List<QmsCheckRuleProject> list = new ArrayList<QmsCheckRuleProject>();
|
||||
for (QmsCheckRuleProject qmsCheckRuleProject : qmsCheckRuleProjectList)
|
||||
{
|
||||
qmsCheckRuleProject.setCheckRuleId(checkRuleId);
|
||||
list.add(qmsCheckRuleProject);
|
||||
}
|
||||
if (list.size() > 0)
|
||||
{
|
||||
qmsCheckRuleMapper.batchQmsCheckRuleProject(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量插入检验规则明细
|
||||
* @param checkRuleDetailList
|
||||
*/
|
||||
@Override
|
||||
public int batchInsertCheckRuleDetail(List<QmsCheckRuleDetail> checkRuleDetailList) {
|
||||
return qmsCheckRuleMapper.batchQmsCheckRuleDetail(checkRuleDetailList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量插入检验规则项目
|
||||
* @param checkRuleProjectList
|
||||
*/
|
||||
@Override
|
||||
public int batchInsertCheckRuleProject(List<QmsCheckRuleProject> checkRuleProjectList) {
|
||||
return qmsCheckRuleMapper.batchQmsCheckRuleProject(checkRuleProjectList);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询检验项目列表
|
||||
export function listCheckproject(query) {
|
||||
return request({
|
||||
url: '/qms/checkproject/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询检验项目详细
|
||||
export function getCheckproject(checkProjectId) {
|
||||
return request({
|
||||
url: '/qms/checkproject/' + checkProjectId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增检验项目
|
||||
export function addCheckproject(data) {
|
||||
return request({
|
||||
url: '/qms/checkproject',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改检验项目
|
||||
export function updateCheckproject(data) {
|
||||
return request({
|
||||
url: '/qms/checkproject',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除检验项目
|
||||
export function delCheckproject(checkProjectId) {
|
||||
return request({
|
||||
url: '/qms/checkproject/' + checkProjectId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询检验规则维护列表
|
||||
export function listCheckrule(query) {
|
||||
return request({
|
||||
url: '/qms/checkrule/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询检验规则维护详细
|
||||
export function getCheckrule(checkRuleId) {
|
||||
return request({
|
||||
url: '/qms/checkrule/' + checkRuleId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增检验规则维护
|
||||
export function addCheckrule(data) {
|
||||
return request({
|
||||
url: '/qms/checkrule',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改检验规则维护
|
||||
export function updateCheckrule(data) {
|
||||
return request({
|
||||
url: '/qms/checkrule',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除检验规则维护
|
||||
export function delCheckrule(checkRuleId) {
|
||||
return request({
|
||||
url: '/qms/checkrule/' + checkRuleId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 查询检验项目
|
||||
export function getCheckProjects() {
|
||||
return request({
|
||||
url: '/qms/checkrule/getCheckProjects',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// 查询检验规则未配置物料信息列表
|
||||
export function selectMaterialInfos4AllocateCheckRule(query) {
|
||||
return request({
|
||||
url: '/qms/checkrule/selectMaterialInfos4AllocateCheckRule',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询已选择规则明细(物料)
|
||||
export function selectCheckRuleDetailList(query) {
|
||||
return request({
|
||||
url: '/qms/checkrule/selectCheckRuleDetailList',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 配置检验规则明细（物料）
|
||||
export function allocateCheckRuleDetails(data) {
|
||||
return request({
|
||||
url: '/qms/checkrule/allocateCheckRuleDetails',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除检验规则配置的物料信息
|
||||
export function unallocateCheckRuleDetails(data) {
|
||||
return request({
|
||||
url: '/qms/checkrule/unallocateCheckRuleDetails',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询转库记录列表
|
||||
export function listTransfer(query) {
|
||||
return request({
|
||||
url: '/wms/transfer/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询转库记录详细
|
||||
export function getTransfer(transferId) {
|
||||
return request({
|
||||
url: '/wms/transfer/' + transferId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增转库记录
|
||||
export function addTransfer(data) {
|
||||
return request({
|
||||
url: '/wms/transfer',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改转库记录
|
||||
export function updateTransfer(data) {
|
||||
return request({
|
||||
url: '/wms/transfer',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除转库记录
|
||||
export function delTransfer(transferId) {
|
||||
return request({
|
||||
url: '/wms/transfer/' + transferId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
@ -0,0 +1,318 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<h4 class="form-header h4">规则信息</h4>
|
||||
<el-form ref="checkRuleForm" :model="checkRuleForm" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="8" :offset="2">
|
||||
<el-form-item label="规则名称" prop="warehouseCode">
|
||||
<el-input v-model="checkRuleForm.checkRuleName" disabled/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="11">
|
||||
<h4 class="form-header h4">已选物料</h4>
|
||||
<el-form :model="allocateMaterialQueryParams" ref="allocateMaterialQueryForm" size="small" :inline="true" v-show="showSearch"
|
||||
label-width="68px">
|
||||
<el-form-item label="物料编码" prop="materialCode">
|
||||
<el-input
|
||||
v-model="allocateMaterialQueryParams.materialCode"
|
||||
placeholder="请输入物料编码"
|
||||
style="width:140px;"
|
||||
clearable
|
||||
@keyup.enter.native="handleAllocateMaterialQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="物料名称" prop="materialName">
|
||||
<el-input
|
||||
v-model="allocateMaterialQueryParams.materialName"
|
||||
placeholder="请输入物料名称"
|
||||
style="width:140px;"
|
||||
clearable
|
||||
@keyup.enter.native="handleAllocateMaterialQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleAllocateMaterialQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetAllocateMaterialQuery">重置</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
@click="handleUnallocateMaterials"
|
||||
v-hasPermi="['wms:wmswarehouse:add']"
|
||||
>删除
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table v-loading="allocateMaterialLoading" :data="allocateMaterialList" @selection-change="handleAllocateMaterialSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="物料编码" align="center" prop="materialCode"/>
|
||||
<el-table-column label="物料名称" align="center" prop="materialName"/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="allocateMaterialTotal>0"
|
||||
:total="allocateMaterialTotal"
|
||||
:page.sync="allocateMaterialQueryParams.pageNum"
|
||||
:limit.sync="allocateMaterialQueryParams.pageSize"
|
||||
@pagination="getAllocateMaterialList"
|
||||
/>
|
||||
</el-col>
|
||||
|
||||
|
||||
<el-col :span="11" style="margin-left:10px;">
|
||||
<h4 class="form-header h4">可选物料</h4>
|
||||
<el-form :model="materialQueryParams" ref="materialQueryForm" size="small" :inline="true" v-show="showSearch"
|
||||
label-width="68px">
|
||||
<el-form-item label="物料编码" prop="materialCode">
|
||||
<el-input
|
||||
v-model="materialQueryParams.materialCode"
|
||||
placeholder="请输入物料编码"
|
||||
style="width:140px;"
|
||||
clearable
|
||||
@keyup.enter.native="handleMaterialQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="物料名称" prop="materialName">
|
||||
<el-input
|
||||
v-model="materialQueryParams.materialName"
|
||||
placeholder="请输入物料名称"
|
||||
style="width:140px;"
|
||||
clearable
|
||||
@keyup.enter.native="handleMaterialQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleMaterialQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetMaterialQuery">重置</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled = "allocateMaterialBtnDisable"
|
||||
@click="submitForm"
|
||||
v-hasPermi="['wms:wmswarehouse:add']"
|
||||
>保存
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
<el-table v-loading="materialLoading" :data="materialinfoList" @selection-change="handleMaterialSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="物料编码" align="center" prop="materialCode"/>
|
||||
<el-table-column label="物料名称" align="center" prop="materialName"/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="materialTotal>0"
|
||||
:total="materialTotal"
|
||||
:page.sync="materialQueryParams.pageNum"
|
||||
:limit.sync="materialQueryParams.pageSize"
|
||||
@pagination="getMaterialList"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
selectCheckRuleDetailList,selectMaterialInfos4AllocateCheckRule,allocateCheckRuleDetails,unallocateCheckRuleDetails
|
||||
} from "@/api/qms/checkrule";
|
||||
|
||||
export default {
|
||||
name: "AllocateMaterialinfo",
|
||||
data() {
|
||||
return {
|
||||
// 已选物料遮罩层
|
||||
allocateMaterialLoading: true,
|
||||
// 可选物料遮罩层
|
||||
materialLoading: true,
|
||||
// 已选物料选中数组
|
||||
allocateMaterialIds: [],
|
||||
//可选物料选中数组
|
||||
materialIds:[],
|
||||
// 已选物料非单个禁用
|
||||
allocateMaterialSingle: true,
|
||||
// 已选物料非多个禁用
|
||||
allocateMaterialMultiple: true,
|
||||
// 可选物料非单个禁用
|
||||
materialSingle: true,
|
||||
// 可选物料非多个禁用
|
||||
materialMultiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 已选物料总条数
|
||||
allocateMaterialTotal: 0,
|
||||
//可选物料总条数
|
||||
materialTotal:0,
|
||||
// 已选物料信息表格数据
|
||||
allocateMaterialList: [],
|
||||
// 可选物料信息表格数据
|
||||
materialinfoList: [],
|
||||
//仓库信息
|
||||
checkRuleForm: {},
|
||||
|
||||
allocateMaterialBtnDisable:true,
|
||||
|
||||
// 已选物料信息查询参数
|
||||
allocateMaterialQueryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
materialCode: null,
|
||||
materialName: null,
|
||||
materialCategories: null,
|
||||
materialSubclass: null,
|
||||
materialTypeId: null,
|
||||
batchFlag: null,
|
||||
materialUnitId: null,
|
||||
materialUnit: null,
|
||||
warehouseId: null
|
||||
},
|
||||
|
||||
// 可选物料信息查询参数
|
||||
materialQueryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
materialCode: null,
|
||||
materialName: null,
|
||||
materialCategories: null,
|
||||
materialSubclass: null,
|
||||
materialTypeId: null,
|
||||
batchFlag: null,
|
||||
materialUnitId: null,
|
||||
materialUnit: null,
|
||||
warehouseId: null
|
||||
},
|
||||
|
||||
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.allocateMaterialBtnDisable = false;
|
||||
const checkRuleId = this.$route.params && this.$route.params.checkRuleId;
|
||||
this.allocateMaterialQueryParams.checkRuleId = checkRuleId;
|
||||
this.materialQueryParams.checkRuleId = checkRuleId;
|
||||
this.checkRuleForm.checkRuleName = this.$route.query && this.$route.query.checkRuleName;
|
||||
this.getAllocateMaterialList();
|
||||
this.getMaterialList();
|
||||
|
||||
},
|
||||
methods: {
|
||||
/** 查询已选物料信息列表 */
|
||||
getAllocateMaterialList() {
|
||||
this.allocateMaterialLoading = true;
|
||||
selectCheckRuleDetailList(this.allocateMaterialQueryParams).then(response => {
|
||||
this.allocateMaterialList = response.rows;
|
||||
this.allocateMaterialTotal = response.total;
|
||||
this.allocateMaterialLoading = false;
|
||||
});
|
||||
},
|
||||
|
||||
/** 查询可选物料信息列表 */
|
||||
getMaterialList() {
|
||||
this.materialLoading = true;
|
||||
selectMaterialInfos4AllocateCheckRule(this.materialQueryParams).then(response => {
|
||||
this.materialinfoList = response.rows;
|
||||
this.materialTotal = response.total;
|
||||
this.materialLoading = false;
|
||||
});
|
||||
},
|
||||
|
||||
/** 已选物料搜索按钮操作 */
|
||||
handleAllocateMaterialQuery() {
|
||||
this.allocateMaterialQueryParams.pageNum = 1;
|
||||
this.getAllocateMaterialList();
|
||||
},
|
||||
/** 已选物料重置按钮操作 */
|
||||
resetAllocateMaterialQuery() {
|
||||
this.resetForm("allocateMaterialQueryForm");
|
||||
this.handleAllocateMaterialQuery();
|
||||
},
|
||||
// 已选物料多选框选中数据
|
||||
handleAllocateMaterialSelectionChange(selection) {
|
||||
this.allocateMaterialIds = selection.map(item => item.targetId)
|
||||
this.allocateMaterialCodes = selection.map(item => item.materialCode)
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
||||
|
||||
/** 可选物料搜索按钮操作 */
|
||||
handleMaterialQuery() {
|
||||
this.materialQueryParams.pageNum = 1;
|
||||
this.getMaterialList();
|
||||
},
|
||||
/** 可选物料重置按钮操作 */
|
||||
resetMaterialQuery() {
|
||||
this.resetForm("materialQueryForm");
|
||||
this.handleMaterialQuery();
|
||||
},
|
||||
// 可选物料多选框选中数据
|
||||
handleMaterialSelectionChange(selection) {
|
||||
this.materialIds = selection.map(item => item.materialId)
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
||||
handleUnallocateMaterials(){
|
||||
const checkRuleMaterialIds = this.allocateMaterialIds;
|
||||
const allocateMaterialCodes = this.allocateMaterialCodes;
|
||||
const checkRuleId = this.allocateMaterialQueryParams.checkRuleId;
|
||||
let qmsCheckRuleDetailList = [];
|
||||
checkRuleMaterialIds.forEach(function(materialId){
|
||||
let obj = {"checkRuleId": checkRuleId, "targetType":"1","targetId": materialId};
|
||||
qmsCheckRuleDetailList.push(obj);
|
||||
})
|
||||
|
||||
this.$modal.confirm('是否确认删除物料编码为"' + allocateMaterialCodes + '"的数据项？').then(function() {
|
||||
return unallocateCheckRuleDetails(qmsCheckRuleDetailList);
|
||||
}).then(() => {
|
||||
this.getAllocateMaterialList();
|
||||
this.getMaterialList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
},
|
||||
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.allocateMaterialBtnDisable = true;
|
||||
const checkRuleId = this.allocateMaterialQueryParams.checkRuleId;
|
||||
const materialIds = this.materialIds;
|
||||
let qmsCheckRuleDetailList = [];
|
||||
materialIds.forEach(function(materialId){
|
||||
let obj = {"checkRuleId": checkRuleId, "targetType":"1","targetId": materialId};
|
||||
qmsCheckRuleDetailList.push(obj);
|
||||
})
|
||||
|
||||
allocateCheckRuleDetails(qmsCheckRuleDetailList).then((response) => {
|
||||
this.$modal.msgSuccess("保存成功");
|
||||
this.getAllocateMaterialList();
|
||||
this.getMaterialList();
|
||||
this.allocateMaterialBtnDisable = false;
|
||||
}).catch(() => {
|
||||
this.getAllocateMaterialList();
|
||||
this.getMaterialList();
|
||||
this.allocateMaterialBtnDisable = false;
|
||||
});
|
||||
},
|
||||
/** 关闭按钮 */
|
||||
close() {
|
||||
const obj = { path: "/system/user" };
|
||||
this.$tab.closeOpenPage(obj);
|
||||
},
|
||||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue