wilson
/
xujie-sys
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

十二

java8
yfy 3 years ago
parent
8261931f54
commit
80765d07a1
7 changed files with 1011 additions and 1612 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 557
      src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
  2. 20
      src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
  3. 12
      src/main/java/com/xujie/sys/modules/pms/data/QcItemData.java
  4. 143
      src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
  5. 857
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
  6. 76
      src/main/java/com/xujie/sys/modules/pms/service/QcService.java
  7. 958
      src/main/resources/mapper/pms/QcMapper.xml

557
src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
View File

@ -6,7 +6,6 @@ import com.xujie.sys.modules.pms.data.*;
import com.xujie.sys.modules.pms.data.QcMasterInformationData;
import com.xujie.sys.modules.pms.entity.DetailTree;
import com.xujie.sys.modules.pms.entity.vo.CheckSubDetailValueVo;
import com.xujie.sys.modules.pms.mapper.QcMapper;
import com.xujie.sys.modules.pms.service.EamService;
import com.xujie.sys.modules.pms.service.QcService;
import com.xujie.sys.modules.pms.util.ResponseData;
@ -31,9 +30,6 @@ public class QcController {
@Autowired
private EamService eamService;
@Autowired
private QcMapper qcMapper;
// ======================= 检验方法API =======================
/**
@ -43,19 +39,10 @@ public class QcController {
* @param: [data]
* @return: java.util.Map<java.lang.String,java.lang.Object>
**/
@PostMapping("/qcCheckOutMethodSearch")
@ResponseBody
public Map<String, Object> qcCheckOutMethodSearch(@RequestBody QcMethodData data){
Map<String, Object> map = new HashMap<>();
try {
List<QcMethodData> row = qcService.qcCheckOutMethodSearch(data);
map.put("rows", row);
map.put("success", true);
} catch (Exception e) {
map.put("success", false);
map.put("msg", e.getMessage());
}
return map;
@PostMapping("/qcMethodSearch")
public R qcMethodSearch(@RequestBody QcMethodData data){
List<QcMethodData> list = qcService.qcMethodSearch(data);
return R.ok().put("rows", list);
}
/**
@ -65,17 +52,10 @@ public class QcController {
* @param: [data]
* @return: com.xujie.sys.modules.pms.util.ResponseData
**/
@PostMapping(value="/qcCheckOutMethodSave")
@ResponseBody
public ResponseData qcCheckOutMethodSave(@RequestBody QcMethodData data){
ResponseData responseData = new ResponseData();
try {
responseData = qcService.qcCheckOutMethodSave(data);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
@PostMapping(value="/qcMethodSave")
public R qcMethodSave(@RequestBody QcMethodData data){
qcService.qcMethodSave(data);
return R.ok();
}
/**
@ -85,17 +65,10 @@ public class QcController {
* @param: [data]
* @return: com.xujie.sys.modules.pms.util.ResponseData
**/
@PostMapping(value="/qcCheckOutMethodUpdate")
@ResponseBody
public ResponseData qcCheckOutMethodUpdate(@RequestBody QcMethodData data){
ResponseData responseData = new ResponseData();
try {
responseData = qcService.qcCheckOutMethodUpdate(data);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
@PostMapping(value="/qcMethodUpdate")
public R qcMethodUpdate(@RequestBody QcMethodData data){
qcService.qcMethodUpdate(data);
return R.ok();
}
/**
@ -105,41 +78,26 @@ public class QcController {
* @param: [data]
* @return: com.xujie.sys.modules.pms.util.ResponseData
**/
@PostMapping(value="/qcCheckOutMethodDelete")
@PostMapping(value="/qcMethodDelete")
@ResponseBody
public ResponseData qcCheckOutMethodDelete(@RequestBody QcMethodData data){
ResponseData responseData = new ResponseData();
try {
responseData = qcService.qcCheckOutMethodDelete(data);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
public R qcMethodDelete(@RequestBody QcMethodData data){
qcService.qcMethodDelete(data);
return R.ok();
}
// ======================= 检验项目API =======================
/**
* @description: 根据条件查询检验项目
* @description: 查询检验项目
* @author: fengyuan_yang
* @date: 2023/3/20 17:03
* @param: [data]
* @return: java.lang.Object
**/
@PostMapping(value="/qcCheckOutItemSearch")
@ResponseBody
public Object qcCheckOutItemSearch(@RequestBody QcCheckOutItemData data){
Map<String, Object> map = new HashMap<>();
try {
List<QcCheckOutItemData> row = qcService.qcCheckOutItemSearch(data);
map.put("rows", row);
map.put("success", true);
} catch (Exception e) {
map.put("success", false);
map.put("msg", e.getMessage());
}
return map;
@PostMapping(value="/qcItemSearch")
public R qcItemSearch(@RequestBody QcItemData data){
List<QcItemData> list = qcService.qcItemSearch(data);
return R.ok().put("rows", list);
}
/**
@ -149,17 +107,10 @@ public class QcController {
* @param: [data]
* @return: java.lang.Object
**/
@PostMapping(value="/qcCheckOutItemSave")
@ResponseBody
public Object qcCheckOutItemSave(@RequestBody QcCheckOutItemData data){
ResponseData responseData = new ResponseData();
try {
responseData = qcService.qcCheckOutItemSave(data);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
@PostMapping(value="/qcItemSave")
public R qcItemSave(@RequestBody QcItemData data){
qcService.qcItemSave(data);
return R.ok();
}
/**
@ -169,17 +120,11 @@ public class QcController {
* @param: [data]
* @return: java.lang.Object
**/
@PostMapping(value="/qcCheckOutItemUpdate")
@PostMapping(value="/qcItemUpdate")
@ResponseBody
public Object qcCheckOutItemUpdate(@RequestBody QcCheckOutItemData data){
ResponseData responseData = new ResponseData();
try {
responseData = qcService.qcCheckOutItemUpdate(data);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
public R qcItemUpdate(@RequestBody QcItemData data){
qcService.qcItemUpdate(data);
return R.ok();
}
/**
@ -189,30 +134,11 @@ public class QcController {
* @param: [data]
* @return: java.lang.Object
**/
@PostMapping(value="/qcCheckOutItemDelete")
@PostMapping(value="/qcItemDelete")
@ResponseBody
public Object qcCheckOutItemDelete(@RequestBody QcCheckOutItemData data){
ResponseData responseData = new ResponseData();
try {
responseData = qcService.qcCheckOutItemDelete(data);
} catch (Exception e) {
responseData.setCode("400");
responseData.setMsg(e.getMessage());
}
return responseData;
}
/**
* @description: 搜索工单列表
* @author: fengyuan_yang
* @date: 2023/4/6 9:26
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/workOrderSearch")
public R workOrderSearch(@RequestBody ShopOrderData data){
List<ShopOrderData> list = qcService.workOrderSearch(data);
return R.ok().put("rows",list);
public R qcItemDelete(@RequestBody QcItemData data){
qcService.qcItemDelete(data);
return R.ok();
}
/**
@ -228,154 +154,8 @@ public class QcController {
return R.ok();
}
// ======================= 根据分类设置检验模板API =======================
/**
* @description: 条件查询检验模板
* @author: fengyuan_yang
* @date: 2023/3/21 14:26
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping(value="/qcCheckOutModelSearch")
public R qcCheckOutModelSearch(@RequestBody QcModelFamilyData data){
PageUtils page = qcService.qcFamilyModelSearch(data);
return R.ok().put("page", page);
}
/**
* @description: 新增检验模板
* @author: fengyuan_yang
* @date: 2023/3/21 14:27
* @param: [inData]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcCheckOutModelSave")
public R qcCheckOutModelSave(@RequestBody QcModelFamilyData data){
qcService.qcCheckOutModelSave(data);
return R.ok();
}
/**
* @description: 修改检验模板
* @author: fengyuan_yang
* @date: 2023/3/21 14:39
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcCheckOutModelUpdate")
public R qcCheckOutModelUpdate(@RequestBody QcModelFamilyData data){
qcService.qcCheckOutModelUpdate(data);
return R.ok();
}
/**
* @description: 删除检验模板
* @author: fengyuan_yang
* @date: 2023/3/21 14:50
* @param: [inData]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcCheckOutModelDelete")
public R qcCheckOutModelDelete(@RequestBody QcModelFamilyData data){
qcService.qcCheckOutModelDelete(data);
return R.ok();
}
/**
* @description: 查询模板里的项目详情
* @author: fengyuan_yang
* @date: 2023/3/21 15:14
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping(value="/searchModalDetails")
public R searchModalDetails(@RequestBody EamPropertiesModelDetailData data){
List<EamPropertiesModelDetailData> list = qcService.searchModalDetails(data);
return R.ok().put("rows", list);
}
/**
* @description: 新增模板里的项目详情
* @author: fengyuan_yang
* @date: 2023/3/21 21:51
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/saveModalDetails")
public R saveModalDetails(@RequestBody EamPropertiesModelDetailData data){
eamService.saveModalDetails(data);
return R.ok();
}
/**
* @description: 删除模板里的项目详情
* @author: fengyuan_yang
* @date: 2023/3/21 22:09
* @param: [inData]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/deleteModalDetails")
public R deleteModalDetails(@RequestBody EamPropertiesModelDetailData inData){
eamService.deleteModalDetails(inData);
return R.ok();
}
// ======================= 根据物料设置检验模板API =======================
/**
* @description: 查询物料模板
* @author: fengyuan_yang
* @date: 2023/4/3 16:46
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping(value="/qcPartModelSearch")
public R qcPartModelSearch(@RequestBody QcModelPartData data){
PageUtils page = qcService.qcPartModelSearch(data);
return R.ok().put("page", page);
}
/**
* @description: 新增物料属性
* @author: fengyuan_yang
* @date: 2023/4/3 17:27
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcPartModelSave")
public R qcPartModelSave(@RequestBody QcModelPartData data){
qcService.qcPartModelSave(data);
return R.ok();
}
/**
* @description: 修改模板
* @author: fengyuan_yang
* @date: 2023/4/3 21:38
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcPartModelUpdate")
public R qcPartModelUpdate(@RequestBody QcModelPartData data){
qcService.qcPartModelUpdate(data);
return R.ok();
}
/**
* @description: 修改模板
* @author: fengyuan_yang
* @date: 2023/4/3 21:43
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcPartModelDelete")
public R qcPartModelDelete(@RequestBody QcModelPartData data){
qcService.qcPartModelDelete(data);
return R.ok();
}
/**
* @description: 快速获取模板列表
* @author: fengyuan_yang
@ -392,150 +172,6 @@ public class QcController {
return R.ok().put("row1", row1).put("row2", row2);
}
// ======================= 检验录入API =======================
/**
* @description: 查询检验记录
* @author: fengyuan_yang
* @date: 2023/3/28 10:25
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping(value="/qcInspectionInformationSearch")
public R qcInspectionInformationSearch(@RequestBody QcInspectionRecordsData data){
PageUtils page = qcService.qcInspectionInformationSearch(data);
return R.ok().put("page", page);
}
/**
* @description: 模板信息
* @author: fengyuan_yang
* @date: 2023/3/28 13:08
* @param: [inData]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/modalCodeBlur")
public R modalCodeBlur(@RequestBody EamPropertiesModelHeaderData inData){
List<EamPropertiesModelHeaderData> resultList = eamService.modalCodeBlur(inData);
return R.ok().put("rows", resultList).put("total",resultList.size());
}
/**
* @description: 新增检验记录
* @author: fengyuan_yang
* @date: 2023/3/28 15:39
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/qcInspectionInformationSave")
public R qcInspectionInformationSave(@RequestBody QcMasterInformationData data){
qcService.qcInspectionInformationSave(data);
return R.ok();
}
/**
* @description: 查询主记录信息
* @author: fengyuan_yang
* @date: 2023/3/28 17:44
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/masterInformationSearch")
public R masterInformationSearch(@RequestBody QcInspectionRecordsData data){
List<QcMasterInformationData> resultList = qcService.masterInformationSearch(data);
return R.ok().put("rows", resultList);
}
/**
* @description: 查询明细记录信息
* @author: fengyuan_yang
* @date: 2023/3/29 16:04
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/detailInformationSearch")
public R detailInformationSearch(@RequestBody QcInspectionRecordsData data){
List<QcDetailInformationData> resultList = qcService.detailInformationSearch(data);
return R.ok().put("rows", resultList);
}
/**
* @description: 新增主信息值
* @author: fengyuan_yang
* @date: 2023/3/28 21:57
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/saveMasterInformationValue")
public R saveMasterInformationValue(@RequestBody List<QcMasterInformationData> data){
qcService.saveMasterInformationValue(data);
return R.ok();
}
/**
* @description: 明细信息的分类级联
* @author: fengyuan_yang
* @date: 2023/3/29 14:29
* @param: [data]
* @return: java.util.List<com.xujie.sys.modules.pms.entity.DetailTree>
**/
@PostMapping("/searchModelTree")
public List<DetailTree> searchModelTree(@RequestBody QcInspectionRecordsData data){
// 查出所有分类
List<DetailTree> list = qcService.searchFamily(data.getFamilyType());
// 根据分类ID查出所有模板
for (int i = 0; i < list.size(); i++) {
List<DetailTree> modelList = qcService.searchModel(list.get(i).getValue());
// 将模板集合加入tree
list.get(i).setChildren(modelList);
}
return list;
}
/**
* @description: 判断主信息和明细信息是否已填写
* @author: fengyuan_yang
* @date: 2023/4/1 19:44
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/checkCompleted")
public ResponseData checkCompleted(@RequestBody QcInspectionRecordsData data){
ResponseData responseData = qcService.checkCompleted(data);
return responseData;
}
/**
* @description: 根据物料编码查询检验模板
* @author: fengyuan_yang
* @date: 2023/4/4 0:00
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/selectModelByPartNo")
public R selectModelByPartNo(@RequestBody QcModelPartData data){
List list = qcService.selectModelByPartNo(data.getPartNo(),data.getInspectionTypeNo());
return R.ok().put("rows", list);
}
/**
* @description: 根据工单号查询物料编码
* @author: fengyuan_yang
* @date: 2023/4/6 10:37
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/selectInformationByWorkOrderNo")
public R selectInformationByWorkOrderNo(@RequestBody ShopOrderData data){
List<ShopOrderData> list = qcService.selectInformationByWorkOrderNo(data);
return R.ok().put("rows", list);
}
// ======================= 质检员信息维护API =======================
/**
@ -750,9 +386,9 @@ public class QcController {
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping(value="/ItemDetailsSearch")
public R ItemDetailsSearch(@RequestBody QcTemplateData data){
List<QcTemplateData> list = qcService.ItemDetailsSearch(data);
@PostMapping(value="/templateDetailsSearch")
public R templateDetailsSearch(@RequestBody QcTemplateData data){
List<QcTemplateData> list = qcService.templateDetailsSearch(data);
return R.ok().put("rows", list);
}
@ -781,7 +417,7 @@ public class QcController {
// 获取当前项目不包含的明细
List<QcTemplateData> row1 = qcService.getItemList(data);
// 获取当前项目所包含的明细
List<QcTemplateData> row2 = qcService.ItemDetailsSearch(data);
List<QcTemplateData> row2 = qcService.templateDetailsSearch(data);
return R.ok().put("row1", row1).put("row2", row2);
}
@ -1534,6 +1170,125 @@ public class QcController {
return R.ok();
}
// ======================= IQC检验API =======================
/**
* @description: IQC检验记录查询
* @author: fengyuan_yang
* @date: 2023/4/29 13:38
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping(value="/qcIQCInspectionSearch")
public R qcIQCInspectionSearch(@RequestBody QcFAIRecordData data){
PageUtils page = qcService.qcIQCInspectionSearch(data);
return R.ok().put("page", page);
}
/**
* @description: iqc检验记录查询
* @author: fengyuan_yang
* @date: 2023/5/4 11:46
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/iqcDetailSearch")
public R iqcDetailSearch(@RequestBody QcFAIRecordData data){
List<QcFAIRecordData> list = qcService.iqcDetailSearch(data);
return R.ok().put("rows", list);
}
/**
* @description: 查询IQC子明细记录
* @author: fengyuan_yang
* @date: 2023/5/4 13:11
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/selectIQCSubDetailedRecord")
public R selectIQCSubDetailedRecord(@RequestBody SubDetailValues data){
List<SubDetailValues> list = qcService.selectIQCSubDetailedRecord(data);
return R.ok().put("rows", list);
}
/**
* @description: 检查子明细中的实测值是否在规定范围
* @author: fengyuan_yang
* @date: 2023/5/4 13:17
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/checkIQCSubDetailValue")
public R checkIQCSubDetailValue(@RequestBody CheckSubDetailValueVo data){
Integer flag = qcService.checkIQCSubDetailValue(data);
return R.ok().put("flag", flag);
}
/**
* @description: 新增明细信息
* @author: fengyuan_yang
* @date: 2023/5/4 13:27
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/saveIQCDetailedRecord")
public R saveIQCDetailedRecord(@RequestBody QcFAIRecordData data){
qcService.saveIQCDetailedRecord(data);
return R.ok();
}
/**
* @description: 检查是否已提交
* @author: fengyuan_yang
* @date: 2023/5/4 13:59
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/checkIQCIsSubmit")
public R checkIQCIsSubmit(@RequestBody SubDetailValues data){
Integer flag = qcService.checkIQCIsSubmit(data);
return R.ok().put("flag", flag);
}
/**
* @description: 新增子明细信息
* @author: fengyuan_yang
* @date: 2023/5/4 15:54
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/saveIQCSubDetailed")
public R saveIQCSubDetailed(@RequestBody QcSubDetailInformationData data){
qcService.saveIQCSubDetailed(data);
return R.ok();
}
/**
* @description: 审核
* @author: fengyuan_yang
* @date: 2023/5/4 17:31
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/saveIQCSubmitResult")
public R saveIQCSubmitResult(@RequestBody QcFAIRecordData data){
qcService.saveIQCSubmitResult(data);
return R.ok();
}
/**
* @description: 删除检验记录
* @author: fengyuan_yang
* @date: 2023/5/4 17:38
* @param: [data]
* @return: com.xujie.sys.common.utils.R
**/
@PostMapping("/iqcRecordDelete")
public R iqcRecordDelete(@RequestBody QcFAIRecordData data){
qcService.iqcRecordDelete(data);
return R.ok();
}
}

20
src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
View File

@ -17,6 +17,8 @@ public class QcFAIRecordData extends QueryPage {
private String ssrId;
// 状态
private String state;
// 供应商编码
private String supplierNo;
// 检验结果
private String inspectionResult;
// 任务生成日期
@ -128,6 +130,16 @@ public class QcFAIRecordData extends QueryPage {
private List<QcFAIRecordData> itemList;
// IPQC的检验类型（巡检/末件检）
private String checkType;
// 标签条码
private String rollNo;
public String getRollNo() {
return rollNo;
}
public void setRollNo(String rollNo) {
this.rollNo = rollNo;
}
public String getOperationNo() {
return operationNo;
@ -568,4 +580,12 @@ public class QcFAIRecordData extends QueryPage {
public void setItemList(List<QcFAIRecordData> itemList) {
this.itemList = itemList;
}
public String getSupplierNo() {
return supplierNo;
}
public void setSupplierNo(String supplierNo) {
this.supplierNo = supplierNo;
}
}

12
src/main/java/com/xujie/sys/modules/pms/data/QcCheckOutItemData.java → src/main/java/com/xujie/sys/modules/pms/data/QcItemData.java
View File

@ -11,7 +11,7 @@ import java.util.Date;
* @author: fengyuan_yang
* @date: 2023/3/20 16:43
**/
public class QcCheckOutItemData {
public class QcItemData {
// 检验项目编码
private String itemNo;
// 检验项目名称
@ -42,6 +42,16 @@ public class QcCheckOutItemData {
private String methodNo;
// 方法名称
private String methodName;
// 方法备注
private String methodRemark;
public String getMethodRemark() {
return methodRemark;
}
public void setMethodRemark(String methodRemark) {
this.methodRemark = methodRemark;
}
public String getItemNo() {
return itemNo;

143
src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
View File

@ -19,57 +19,29 @@ import java.util.List;
@Mapper
public interface QcMapper {
List<QcCheckOutItemData> qcCheckOutItemSearch(QcCheckOutItemData data);
List<QcItemData> qcItemSearch(QcItemData data);
List<QcCheckOutItemData> checkEamPropertiesItem(QcCheckOutItemData data);
List<QcItemData> checkQcItem(QcItemData data);
void saveNewEamPropertiesItem(QcCheckOutItemData data);
void qcItemSave(QcItemData data);
void qcCheckOutItemUpdate(QcCheckOutItemData data);
void qcItemUpdate(QcItemData data);
void qcCheckOutItemDelete(QcCheckOutItemData data);
void qcItemDelete(QcItemData data);
List<QcMethodData> qcCheckOutMethodSearch(QcMethodData data);
List<QcMethodData> qcMethodSearch(QcMethodData data);
List<QcMethodData> checkQcMethod(QcMethodData data);
void qcCheckOutMethodSave(QcMethodData data);
void qcMethodSave(QcMethodData data);
void qcCheckOutMethodUpdate(QcMethodData data);
void qcMethodUpdate(QcMethodData data);
List<EamPropertiesItemData> checkMethodIsUsed(QcMethodData data);
void qcCheckOutMethodDelete(QcMethodData data);
void qcMethodDelete(QcMethodData data);
QcMethodItemData checkMethod(QcMethodItemData data);
List<EamPropertiesModelDetailData> checkItemIsUsed(QcCheckOutItemData data);
IPage<QcMasterInformationData> qcInspectionInformationSearch(Page<QcInspectionRecordsData> qcInspectionRecordsDataPage, @Param("query") QcInspectionRecordsData data);
void qcInspectionInformationSave(QcMasterInformationData data);
List<QcMasterInformationData> masterInformationSearch(QcInspectionRecordsData data);
void saveMasterInformationValue(List<QcMasterInformationData> data);
List<QcMasterInformationData> checkOutMasterInformation(String inspectionNo);
void updateMasterInformation(QcMasterInformationData data);
List<DetailTree> searchFamily(String familyType);
List<DetailTree> searchModel(String familyID);
List<QcDetailInformationData> checkOutDetailInformation(String inspectionNo);
List<QcDetailInformationData> detailInformationSearch(QcInspectionRecordsData data);
void updateDetailInformation(QcDetailInformationData qcDetailInformationData);
void saveDetailInformation(List<QcDetailInformationData> data);
void deleteMasterInformationRecord(QcFAIRecordData data);
List<EamPropertiesModelDetailData> checkItemIsUsed(QcItemData data);
void deleteFAIDetailedRecord(QcFAIRecordData data);
@ -85,47 +57,10 @@ public interface QcMapper {
void inspectorDelete(QcInspectorData data);
void methodItemUpdate(QcMethodData data);
void saveSubmitResult(QcInspectionRecordsData data);
void updateFAIMasterSubmitFlag(QcFAIRecordData data);
void updateFAIDetailSubmitFlag(QcFAIRecordData data);
IPage<QcModelFamilyData> qcFamilyModelSearch(Page<QcModelFamilyData> eamPropertiesModelHeaderDataPage,@Param("query") QcModelFamilyData data);
List<QcModelFamilyData> checkFamilyModel(QcModelFamilyData data);
void qcCheckOutModelSave(QcModelFamilyData data);
void saveFamilyModel(QcModelFamilyData data);
void updateModel(QcModelFamilyData data);
void updateFamilyModel(QcModelFamilyData data);
void deleteModel(QcModelFamilyData data);
void deleteFamilyModel(QcModelFamilyData data);
void deleteItemModel(QcModelFamilyData data);
IPage<QcModelPartData> qcPartModelSearch(Page<QcModelPartData> qcModelFamilyDataPage,@Param("query") QcModelPartData data);
void savePartModel(QcModelPartData data);
List<EamPropertiesModelDetailData> searchModalDetails(EamPropertiesModelDetailData data);
void updatePartModel(QcModelPartData data);
void qcPartModelDelete(QcModelPartData data);
List<QcModelPartData> selectPartModelByPartNo(String partNo, String inspectionTypeNo);
List<QcModelFamilyData> selectFamilyModelByPartNo(String partNo, String inspectionTypeNo);
Integer addMasterInformation(QcMasterInformationData data);
void saveFAISubDetailed(List<SubDetailValues> subDetailValues);
List<SubDetailValues> selectFAISubDetailedRecord(SubDetailValues data);
@ -134,10 +69,6 @@ public interface QcMapper {
QcFAIRecordData checkFAIIsSubmit(SubDetailValues data);
List<ShopOrderData> workOrderSearch(ShopOrderData data);
List<ShopOrderData> selectInformationByWorkOrderNo(ShopOrderData data);
List<SubDetailValues> selectFAISubDetailValue(String inspectionNo, String itemNo);
void deleteFAISubDetailedRecord(QcFAIRecordData data);
@ -156,7 +87,7 @@ public interface QcMapper {
void templateUpdate(QcTemplateData data);
List<QcTemplateData> ItemDetailsSearch(QcTemplateData data);
List<QcTemplateData> templateDetailsSearch(QcTemplateData data);
QcTemplateData selectItemDetails(QcTemplateData data);
@ -178,7 +109,7 @@ public interface QcMapper {
String selectLastItemNo();
String queryLastItemNo(QcCheckOutItemData data);
String queryLastItemNo(QcItemData data);
QcTemplateData selectTemplateByDesc(QcTemplateData data);
@ -232,8 +163,6 @@ public interface QcMapper {
String queryLastSamplingPlanNo(QcSamplingInspectionPlanData data);
String queryLastPartModelNo(String functionType);
String queryLastTemplateNo();
List<QcInspectionTypeData> InspectionTypeSearch();
@ -371,4 +300,52 @@ public interface QcMapper {
QcFAIRecordData selectResourceDesc(QcFAIRecordData data);
QcFAIRecordData selectPartDesc(QcFAIRecordData data);
List<QcFAIRecordData> selectIQCBasicData();
String queryLastIQCInspectionNo(QcFAIRecordData qcFAIRecordData);
void saveIQCDetailedRecord(QcFAIRecordData faiRecordData);
void updateIQCRecord(QcFAIRecordData qcFAIRecordData);
IPage<QcFAIRecordData> qcIQCInspectionSearch(Page<QcFAIRecordData> qcFAIRecordDataPage,@Param("query") QcFAIRecordData data);
List<QcFAIRecordData> iqcDetailSearch(QcFAIRecordData data);
List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data);
List<SubDetailValues> selectIQCSubDetailValue(String inspectionNo, String itemNo);
void updateIQCMasterRecord(QcFAIRecordData data);
void updateIQCDetailedRecord(QcFAIRecordData data);
List<QcFAIRecordData> checkIQCDetail(QcFAIRecordData data);
QcFAIRecordData checkIQCIsSubmit(SubDetailValues data);
void delIQCSubDetailedRecord(QcSubDetailInformationData data);
void saveIQCSubDetailed(List<SubDetailValues> subDetailValues);
void updateIQCMasterSubmitFlag(QcFAIRecordData data);
void updateIQCDetailSubmitFlag(QcFAIRecordData data);
void updateIQCSubDetailSubmitFlag(QcFAIRecordData data);
void deleteIQCRecord(QcFAIRecordData data);
void deleteIQCDetailedRecord(QcFAIRecordData data);
void deleteIQCSubDetailedRecord(QcFAIRecordData data);
String queryLastMethodNo();
void qcItemMethodDelete(QcItemData data);
void qcItemMethodSave(QcItemData data);
void qcItemMethodUpdate(QcItemData data);
}

857
src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
File diff suppressed because it is too large
View File

76
src/main/java/com/xujie/sys/modules/pms/service/QcService.java
View File

@ -11,35 +11,21 @@ import org.springframework.web.multipart.MultipartFile;
import java.util.List;
public interface QcService {
List<QcCheckOutItemData> qcCheckOutItemSearch(QcCheckOutItemData data);
List<QcItemData> qcItemSearch(QcItemData data);
ResponseData qcCheckOutItemSave(QcCheckOutItemData data);
void qcItemSave(QcItemData data);
ResponseData qcCheckOutItemUpdate(QcCheckOutItemData data);
void qcItemUpdate(QcItemData data);
ResponseData qcCheckOutItemDelete(QcCheckOutItemData data);
void qcItemDelete(QcItemData data);
List<QcMethodData> qcCheckOutMethodSearch(QcMethodData data);
List<QcMethodData> qcMethodSearch(QcMethodData data);
ResponseData qcCheckOutMethodSave(QcMethodData data);
void qcMethodSave(QcMethodData data);
ResponseData qcCheckOutMethodUpdate(QcMethodData data);
void qcMethodUpdate(QcMethodData data);
ResponseData qcCheckOutMethodDelete(QcMethodData data);
PageUtils qcInspectionInformationSearch(QcInspectionRecordsData data);
void qcInspectionInformationSave(QcMasterInformationData data);
List<QcMasterInformationData> masterInformationSearch(QcInspectionRecordsData data);
void saveMasterInformationValue(List<QcMasterInformationData> data);
List<DetailTree> searchFamily(String familyType);
List<DetailTree> searchModel(String familyID);
List<QcDetailInformationData> detailInformationSearch(QcInspectionRecordsData data);
void qcMethodDelete(QcMethodData data);
void saveFAIDetailedRecord(QcFAIRecordData data);
@ -55,38 +41,12 @@ public interface QcService {
void saveFAISubmitResult(QcFAIRecordData data);
ResponseData checkCompleted(QcInspectionRecordsData data);
PageUtils qcFamilyModelSearch(QcModelFamilyData data);
void qcCheckOutModelSave(QcModelFamilyData data);
void qcCheckOutModelUpdate(QcModelFamilyData data);
void qcCheckOutModelDelete(QcModelFamilyData data);
PageUtils qcPartModelSearch(QcModelPartData data);
void qcPartModelSave(QcModelPartData data);
List<EamPropertiesModelDetailData> searchModalDetails(EamPropertiesModelDetailData data);
void qcPartModelUpdate(QcModelPartData data);
void qcPartModelDelete(QcModelPartData data);
List selectModelByPartNo(String partNo, String inspectionTypeNo);
void saveFAISubDetailed(QcSubDetailInformationData data);
List<SubDetailValues> selectFAISubDetailedRecord(SubDetailValues data);
Integer checkFAIIsSubmit(SubDetailValues data);
List<ShopOrderData> workOrderSearch(ShopOrderData data);
List<ShopOrderData> selectInformationByWorkOrderNo(ShopOrderData data);
Integer checkFAISubDetailValue(CheckSubDetailValueVo data);
PageUtils samplingInspectionPlanSearch(QcSamplingInspectionPlanData data);
@ -103,7 +63,7 @@ public interface QcService {
void templateUpdate(QcTemplateData data);
List<QcTemplateData> ItemDetailsSearch(QcTemplateData data);
List<QcTemplateData> templateDetailsSearch(QcTemplateData data);
void addItemDetails(QcTemplateData data);
@ -220,4 +180,22 @@ public interface QcService {
List<QcFAIRecordData> getPartList(QcFAIRecordData data);
void saveOsInspection(QcFAIRecordData data);
PageUtils qcIQCInspectionSearch(QcFAIRecordData data);
List<QcFAIRecordData> iqcDetailSearch(QcFAIRecordData data);
List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data);
Integer checkIQCSubDetailValue(CheckSubDetailValueVo data);
void saveIQCDetailedRecord(QcFAIRecordData data);
Integer checkIQCIsSubmit(SubDetailValues data);
void saveIQCSubDetailed(QcSubDetailInformationData data);
void saveIQCSubmitResult(QcFAIRecordData data);
void iqcRecordDelete(QcFAIRecordData data);
}

958
src/main/resources/mapper/pms/QcMapper.xml
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save