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

2023-10-19，设备和质量修改

java8
杨奉源 2 years ago
parent
95a75811d8
commit
1bee30a76a
3 changed files with 91 additions and 113 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. 12
      src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
  2. 142
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
  3. 50
      src/main/resources/mapper/pms/QcMapper.xml

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

@ -33,8 +33,6 @@ public interface QcMapper {
IPage<QcMethodData> qcMethodSearch(Page<QcMethodData> page, @Param("query") QcMethodData data);
List<QcMethodData> checkQcMethod(QcMethodData data);
void qcMethodSave(QcMethodData data);
void qcMethodUpdate(QcMethodData data);
@ -109,8 +107,6 @@ public interface QcMapper {
void insertItem(EamPropertiesItemData task);
String selectLastItemNo();
// String queryLastItemNo(QcItemData data);
QcTemplateData selectTemplateByDesc(QcTemplateData data);
@ -165,8 +161,6 @@ public interface QcMapper {
String queryLastSamplingPlanNo(QcSamplingInspectionPlanData data);
String queryLastTemplateNo();
List<QcInspectionTypeData> InspectionTypeSearch();
IPage<QcPartAttributeData> qcPartAttributeSearch(Page<QcPartAttributeData> qcPartAttributeDataPage,@Param("query") QcPartAttributeData data);
@ -411,4 +405,10 @@ public interface QcMapper {
List<QcTemplateData> queryTemplateList(QcTemplateData data);
List<QcFAIRecordData> selectTemplate(QcFAIRecordData data);
String getMethodNo(QcMethodData data);
String getItemNo(QcItemData data);
String getTemplateNo(QcTemplateData data);
}

142
src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
View File

@ -59,18 +59,16 @@ public class QcServiceImpl implements QcService {
**/
@Override
public void qcMethodSave(QcMethodData data) {
// // 查询最大编码，自增后赋值
// String s = qcMapper.queryLastMethodNo();
// if (s == null){
// data.setMethodNo("10001");
// }else {
// int no = Integer.parseInt(qcMapper.queryLastMethodNo());
// data.setMethodNo(String.valueOf(++no));
// }
// 检验是否已存在该检验方法
List<QcMethodData> methodData = qcMapper.checkQcMethod(data);
if(methodData.size() > 0){
throw new RuntimeException("该检验方法编码已存在!");
// 获取编码
String methodNo = qcMapper.getMethodNo(data);
if ("101".equals(data.getInspectionTypeNo()) || "102".equals(data.getInspectionTypeNo()) || "103".equals(data.getInspectionTypeNo()) || "104".equals(data.getInspectionTypeNo())) {
data.setMethodNo("IPQC-" + methodNo);
} else if ("105".equals(data.getInspectionTypeNo())) {
data.setMethodNo("IQC-" + methodNo);
} else if ("106".equals(data.getInspectionTypeNo())) {
data.setMethodNo("FAI-" + methodNo);
} else if ("107".equals(data.getInspectionTypeNo())) {
data.setMethodNo("FQC-" + methodNo);
}
// 新增数据
qcMapper.qcMethodSave(data);
@ -87,11 +85,6 @@ public class QcServiceImpl implements QcService {
public void qcMethodUpdate(QcMethodData data) {
// 修改方法
qcMapper.qcMethodUpdate(data);
// // 检验是否已存在该检验方法
// List<QcMethodData> methodData = qcMapper.checkQcMethod(data);
// if(methodData.size() > 1){
// throw new RuntimeException("该方法名已存在!");
// }
}
/**
@ -149,18 +142,17 @@ public class QcServiceImpl implements QcService {
}
}
}
List<QcItemData> itemList = qcMapper.checkQcItem(data);
if(itemList.size() > 0){
throw new RuntimeException("该检验项目编码已存在!");
}
// // 查询最大编码，自增后赋值
// String s = qcMapper.queryLastItemNo(data);
// if (s == null){
// data.setItemNo("10001");
// }else {
// int no = Integer.parseInt(qcMapper.queryLastItemNo(data));
// data.setItemNo(String.valueOf(++no));
// }
// 获取编码
String itemNo = qcMapper.getItemNo(data);
if ("101".equals(data.getInspectionTypeNo()) || "102".equals(data.getInspectionTypeNo()) || "103".equals(data.getInspectionTypeNo()) || "104".equals(data.getInspectionTypeNo())) {
data.setItemNo("IPQC-" + itemNo);
} else if ("105".equals(data.getInspectionTypeNo())) {
data.setItemNo("IQC-" + itemNo);
} else if ("106".equals(data.getInspectionTypeNo())) {
data.setItemNo("FAI-" + itemNo);
} else if ("107".equals(data.getInspectionTypeNo())) {
data.setItemNo("FQC-" + itemNo);
}
// 新增项目
qcMapper.qcItemSave(data);
// 新增项目里的方法
@ -237,16 +229,6 @@ public class QcServiceImpl implements QcService {
int rows = sheet.getPhysicalNumberOfRows();
// 声明对象
QcItemData task = null;
int no = 0;
// 查询最大编码，自增后赋值
String s = qcMapper.selectLastItemNo();
if (s == null){
no = 10001;
}else {
no = Integer.parseInt(qcMapper.selectLastItemNo());
}
// 查出最大的编码值
//int no = Integer.parseInt(qcMapper.selectLastItemNo());
// 遍历每一行（从第二行开始）
for (int j = 1; j < rows; j++) {
// 实例化对象
@ -254,7 +236,19 @@ public class QcServiceImpl implements QcService {
//获得该行
XSSFRow row = sheet.getRow(j);
// 为对象赋值
task.setItemNo(String.valueOf(++no));
task.setSite(data.getSite());
task.setInspectionTypeNo(row.getCell(3).getRawValue());
// 获取编码
String itemNo = qcMapper.getItemNo(task);
if ("101".equals(task.getInspectionTypeNo()) || "102".equals(task.getInspectionTypeNo()) || "103".equals(task.getInspectionTypeNo()) || "104".equals(task.getInspectionTypeNo())) {
task.setItemNo("IPQC-" + itemNo);
} else if ("105".equals(task.getInspectionTypeNo())) {
task.setItemNo("IQC-" + itemNo);
} else if ("106".equals(task.getInspectionTypeNo())) {
task.setItemNo("FAI-" + itemNo);
} else if ("107".equals(task.getInspectionTypeNo())) {
task.setItemNo("FQC-" + itemNo);
}
task.setItemDesc(row.getCell(0).getStringCellValue());
task.setValueType(row.getCell(1).getStringCellValue());
if (row.getCell(1).getStringCellValue().equals("文本")){
@ -263,34 +257,27 @@ public class QcServiceImpl implements QcService {
task.setMinValue(null);
} else if (row.getCell(1).getStringCellValue().equals("数字")) {
task.setValueTypeDb("N");
if(row.getCell(3) == null){
if (row.getCell(3) == null) {
task.setMaxValue(null);
}else {
} else {
task.setMaxValue(BigDecimal.valueOf(row.getCell(3).getNumericCellValue()));
}
if(row.getCell(4) == null){
if (row.getCell(4) == null) {
task.setMinValue(null);
}else {
} else {
task.setMinValue(BigDecimal.valueOf(row.getCell(4).getNumericCellValue()));
}
}else {
} else {
task.setValueTypeDb(null);
}
if(row.getCell(2) == null){
if (row.getCell(2) == null) {
task.setDefaultValue(null);
}else {
} else {
task.setDefaultValue(row.getCell(2).getRawValue());
}
task.setItemType("D");
task.setCreatedBy(data.getCreateBy());
task.setMethodNo(row.getCell(5).getRawValue());
// 查重
String itemDesc = task.getItemDesc();
String itemType = task.getItemType();
EamPropertiesItemData propertiesItem = qcMapper.getItemByItemNo(task);
if(propertiesItem != null){
throw new Exception("项目已存在");
}
// 新增
qcMapper.qcItemSave(task);
// 新增项目里的方法
@ -472,18 +459,16 @@ public class QcServiceImpl implements QcService {
**/
@Override
public void templateSave(QcTemplateData data) {
// 根据模板名称查询模板
QcTemplateData templateData = qcMapper.selectTemplateByDesc(data);
if (templateData != null){
throw new RuntimeException("该模板已存在!");
}
// 查询最大编码，自增后赋值
String s = qcMapper.queryLastTemplateNo();
if (s == null){
data.setTemplateId("10001");
}else {
int no = Integer.parseInt(qcMapper.queryLastTemplateNo());
data.setTemplateId(String.valueOf(++no));
// 获取编码
String templateNo = qcMapper.getTemplateNo(data);
if ("101".equals(data.getInspectionTypeNo()) || "102".equals(data.getInspectionTypeNo()) || "103".equals(data.getInspectionTypeNo()) || "104".equals(data.getInspectionTypeNo())) {
data.setTemplateId("IPQC-" + templateNo);
} else if ("105".equals(data.getInspectionTypeNo())) {
data.setTemplateId("IQC-" + templateNo);
} else if ("106".equals(data.getInspectionTypeNo())) {
data.setTemplateId("FAI-" + templateNo);
} else if ("107".equals(data.getInspectionTypeNo())) {
data.setTemplateId("FQC-" + templateNo);
}
// 新增
qcMapper.templateSave(data);
@ -624,16 +609,6 @@ public class QcServiceImpl implements QcService {
int rows = sheet.getPhysicalNumberOfRows();
// 声明对象
QcTemplateData task = null;
int no = 0;
// 查询最大编码，自增后赋值
String s = qcMapper.queryLastTemplateNo();
if (s == null){
no = 10001;
}else {
no = Integer.parseInt(qcMapper.queryLastTemplateNo());
}
// 查出最大的编码值
// int no = Integer.parseInt(qcMapper.queryLastTemplateNo());
// 遍历每一行（从第二行开始）
for (int j = 1; j < rows; j++) {
// 实例化对象
@ -641,8 +616,19 @@ public class QcServiceImpl implements QcService {
// 获得该行
XSSFRow row = sheet.getRow(j);
// 为对象赋值
task.setTemplateId(String.valueOf(++no));
task.setSite(paraData.getSite());
task.setInspectionTypeNo(row.getCell(9).getRawValue());
// 获取编码
String templateNo = qcMapper.getTemplateNo(task);
if ("101".equals(task.getInspectionTypeNo()) || "102".equals(task.getInspectionTypeNo()) || "103".equals(task.getInspectionTypeNo()) || "104".equals(task.getInspectionTypeNo())) {
task.setTemplateId("IPQC-" + templateNo);
} else if ("105".equals(task.getInspectionTypeNo())) {
task.setTemplateId("IQC-" + templateNo);
} else if ("106".equals(task.getInspectionTypeNo())) {
task.setTemplateId("FAI-" + templateNo);
} else if ("107".equals(task.getInspectionTypeNo())) {
task.setTemplateId("FQC-" + templateNo);
}
task.setTemplateName(row.getCell(0).getStringCellValue());
task.setSamplingProgrammeNo(row.getCell(1).getRawValue());
task.setSamplingLevelNo(row.getCell(2).getRawValue());
@ -678,8 +664,6 @@ public class QcServiceImpl implements QcService {
}else {
task.setRe(BigDecimal.valueOf(row.getCell(8).getNumericCellValue()));
}
task.setInspectionTypeNo(row.getCell(9).getRawValue());
if (row.getCell(10) == null){
task.setTemplateRemark(null);
}else {

50
src/main/resources/mapper/pms/QcMapper.xml
View File

@ -34,20 +34,13 @@
</where>
</select>
<!-- &lt;!&ndash; 获取最大物料模板编码 &ndash;&gt;-->
<!-- <select id="queryLastMethodNo" resultType="string">-->
<!-- SELECT top 1 method_no-->
<!-- FROM qc_method-->
<!-- WHERE site = #{site}-->
<!-- ORDER BY method_no Desc-->
<!-- </select>-->
<!-- 检测是否存在该方法 -->
<select id="checkQcMethod" parameterType="QcMethodData" resultType="QcMethodData">
SELECT method_no,
method_name
<!-- 获得检验方法单号 -->
<select id="getMethodNo" resultType="string" parameterType="QcMethodData">
SELECT
Right('0000' + convert(varchar(10),isnull(max(convert(INT,Right(method_no,4))),0)+1),4)
FROM qc_method
WHERE site = #{site} and method_no = #{methodNo}
WHERE site = #{site}
AND inspection_type_no = #{inspectionTypeNo}
</select>
<!-- 新增检验方法 -->
@ -134,6 +127,14 @@
WHERE site = #{site} and ItemNo = #{itemNo} and ItemType = #{itemType}
</select>
<!-- 获得检验项目单号 -->
<select id="getItemNo" resultType="string" parameterType="QcItemData">
SELECT
Right('0000' + convert(varchar(10),isnull(max(convert(INT,Right(ItemNo,4))),0)+1),4)
FROM eam_properties_item
WHERE site = #{site} and ItemType = 'D' and inspection_type_no = #{inspectionTypeNo}
</select>
<!-- 新增检验项目 -->
<insert id="qcItemSave" parameterType="QcItemData">
INSERT INTO eam_properties_item (site, ItemNo, ItemDesc, DefaultValue, ValueType, ValueType_DB, ValueChooseFlag, CreatedDate, CreatedBy, MaxValue, MinValue, ItemRemark, ItemType, update_date, update_by, inspection_type_no)
@ -384,19 +385,20 @@
</where>
</select>
<!-- 获得检验模板单号 -->
<select id="getTemplateNo" resultType="string" parameterType="QcTemplateData">
SELECT
Right('0000' + convert(varchar(10),isnull(max(convert(INT,Right(template_id,3))),0)+1),3)
FROM qc_template
WHERE site = #{site} and inspection_type_no = #{inspectionTypeNo}
</select>
<!-- 新增模板 -->
<insert id="templateSave" parameterType="QcTemplateData">
INSERT INTO qc_template (site, template_id, template_name, template_version, template_remark, template_type, sampling_programme_no, inspection_type_no, create_time, create_by, sampling_level_no, inspection_cycle, AQL, AC, RE, default_sampling_quantity, default_sampling_proportion, update_date, update_by)
VALUES (#{site}, #{templateId}, #{templateName},#{templateVersion}, #{templateRemark}, #{templateType}, #{samplingProgrammeNo}, #{inspectionTypeNo}, getDate(), #{createBy}, #{samplingLevelNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{aql}, #{ac}, #{re}, #{defaultSamplingQuantity}, #{defaultSamplingProportion}, getDate(), #{updateBy})
</insert>
<!-- 获取最大模板编码 -->
<select id="queryLastTemplateNo" resultType="string">
SELECT top 1 template_id
FROM qc_template
ORDER BY template_id Desc
</select>
<!-- 修改模板 -->
<update id="templateUpdate" parameterType="QcTemplateData">
UPDATE qc_template
@ -532,14 +534,6 @@
VALUES(#{itemNo},#{itemDesc}, #{defaultValue}, #{valueType}, #{valueTypeDb}, GetDate(), #{createdBy}, #{maxValue,jdbcType=DECIMAL}, #{minValue,jdbcType=DECIMAL}, #{itemRemark}, #{itemType})
</insert>
<!-- 获取最大明细编码 -->
<select id="selectLastItemNo" resultType="string">
SELECT top 1 ItemNo
FROM eam_properties_item
WHERE ItemType = 'D'
ORDER BY ItemNo Desc
</select>
<!-- &lt;!&ndash; 获取最大项目编码 &ndash;&gt;-->
<!-- <select id="queryLastItemNo" resultType="string" parameterType="QcItemData">-->
<!-- SELECT top 1 ItemNo-->

Write Preview
Loading…
Cancel
Save