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

2025-01-08 

维修工单增加待确认
java8
fengyuan_yang 1 year ago
parent
f4d8ef8aa4
commit
e52750aa24
5 changed files with 101 additions and 27 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. 51
      src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java
  2. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
  3. 41
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  4. 26
      src/main/resources/mapper/pms/EamMapper.xml
  5. 8
      src/main/resources/mapper/pms/QcMapper.xml

51
src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java
View File

@ -84,6 +84,57 @@ public class EamWorkOrderData extends QueryPage {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date lastExecutionDate;
/**
* 维修确认时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date confirmDate;
/**
* 维修确认人
*/
private String confirmBy;
/**
* 确认结果
*/
private String confirmResult;
/**
* 确认次数
*/
private Integer confirmCount;
public Date getConfirmDate() {
return confirmDate;
}
public void setConfirmDate(Date confirmDate) {
this.confirmDate = confirmDate;
}
public String getConfirmBy() {
return confirmBy;
}
public void setConfirmBy(String confirmBy) {
this.confirmBy = confirmBy;
}
public String getConfirmResult() {
return confirmResult;
}
public void setConfirmResult(String confirmResult) {
this.confirmResult = confirmResult;
}
public Integer getConfirmCount() {
return confirmCount;
}
public void setConfirmCount(Integer confirmCount) {
this.confirmCount = confirmCount;
}
public Date getLastExecutionDate() {
return lastExecutionDate;
}

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
View File

@ -1245,4 +1245,6 @@ public interface EamMapper {
String getResourceByObject(@Param("site") String site, @Param("objectID") String objectID);
void updateWorkPlanStatus2(EamWorkOrderInData inData);
void reportWorkOrder3(EamWorkOrderInData inData);
}

41
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
View File

@ -1870,7 +1870,7 @@ public class EamServiceImpl implements EamService {
if ("A".equals(inData.getFunctionType())) {
eamMapper.reportWorkOrder2(inData);
} else if ("B".equals(inData.getFunctionType()) ) {
eamMapper.reportWorkOrder(inData);
eamMapper.reportWorkOrder3(inData);
}
for (int i = 0; i <inData.getItemList().size(); i++) {
@ -1990,8 +1990,8 @@ public class EamServiceImpl implements EamService {
String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
@ -2129,20 +2129,6 @@ public class EamServiceImpl implements EamService {
inData.setDocumentSource("维修失败");
// 创建工单
eamMapper.saveDefectWorkOrder(inData);
// 根据设备查机台
String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
// 将记录新增到 redis
// 检查是否已创建 key
String key = inData.getSite() + "_" + resourceId;
Integer val = (Integer) redisTemplate.opsForValue().get(key);
if (val == null) {
// 如果 key 不存在，则新建 key 并设置 value 为 1
redisTemplate.opsForValue().set(key, 1);
} else {
// 如果 key 已经存在，则获取当前 value 并加 1
redisTemplate.opsForValue().set(key, val + 1);
}
// 保存故障信息
EamDefectFeedBackData feedBackData = new EamDefectFeedBackData();
feedBackData.setSite(inData.getSite());
@ -2172,8 +2158,8 @@ public class EamServiceImpl implements EamService {
String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
@ -2200,6 +2186,19 @@ public class EamServiceImpl implements EamService {
}
}
}
// 将记录新增到 redis
// 根据设备查机台
String resourceId = eamMapper.getResourceByObject(inData.getSite(), inData.getObjectID());
// 检查是否已创建 key
String key = inData.getSite() + "_" + resourceId;
Integer val = (Integer) redisTemplate.opsForValue().get(key);
if (val == null) {
// 如果 key 不存在，则新建 key 并设置 value 为 1
redisTemplate.opsForValue().set(key, 1);
} else {
// 如果 key 已经存在，则获取当前 value 并加 1
redisTemplate.opsForValue().set(key, val + 1);
}
}
@Override
@ -3010,8 +3009,8 @@ public class EamServiceImpl implements EamService {
String content = inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}

26
src/main/resources/mapper/pms/EamMapper.xml
View File

@ -724,7 +724,10 @@
dbo.joint_name(a.Site, a.bu_no, a.OrderNo, a.FunctionType) as operator,
a.check_remark,
a.document_source,
a.last_execution_date
a.last_execution_date,
a.handling_method,
a.fault_reason,
a.preventive_measure
FROM eam_workOrder a
LEFT JOIN eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID and a.bu_no = b.bu_no
LEFT JOIN eam_defect c on b.DefectID = c.DefectID
@ -1079,7 +1082,7 @@
<update id="reportWorkOrder" parameterType="EamWorkOrderInData">
update eam_workOrder
set Status = '待审核',
set Status = '待确认',
ActualOperator = #{actualOperator},
ActualDate = #{actualDate},
Remark = #{remark},
@ -1112,6 +1115,25 @@
where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo}
</update>
<update id="reportWorkOrder3" parameterType="EamWorkOrderInData">
update eam_workOrder
set Status = '待审核',
ActualOperator = #{actualOperator},
ActualDate = #{actualDate},
Remark = #{remark},
disposal_measures = #{disposalMeasures},
WorkTime = CASE
WHEN (DATEDIFF(SECOND, reach_date, #{actualDate}) <![CDATA[<]]> 60) THEN DATEDIFF(SECOND, reach_date, #{actualDate}) / 60.0
ELSE ceiling(floor(DATEDIFF(SECOND, reach_date, #{actualDate}) * 1.0 / 30) / 2)
END,
result = #{result,jdbcType=VARCHAR},
checkResult = #{checkResult},
handling_method = #{handlingMethod},
fault_reason = #{faultReason},
preventive_measure = #{preventiveMeasure}
where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo}
</update>
<update id="defectReportWorkOrder" >
update eam_workOrder
set Status = '已完工',

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

@ -2489,7 +2489,7 @@
sampling_qty = #{samplingQty,jdbcType=DECIMAL},
unqualified_qty = #{unqualifiedQty,jdbcType=DECIMAL},
submit_date = getDate()
WHERE site = #{site} and inspection_no = #{inspectionNo} and bu_no = #{buNo}
WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
</update>
<!-- 修改IQC明细记录信息 -->
@ -2815,19 +2815,19 @@
<!-- 删除FQC检验记录 -->
<delete id="deleteFQCRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fqc_record
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
</delete>
<!-- 删除FQC明细记录信息 -->
<delete id="deleteFQCDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fqc_detailed_record
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
</delete>
<!-- 删除FQC子明细记录信息 -->
<delete id="deleteFQCSubDetailedRecord" parameterType="QcFAIRecordData">
DELETE FROM qc_fqc_sub_detail_record
WHERE inspection_no = #{inspectionNo} and site = #{site} and bu_no = #{buNo}
WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
</delete>
<!-- 修改FQC主记录信息 -->

Write Preview
Loading…
Cancel
Save