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

Merge remote-tracking branch 'origin/master'

java8
yuejiayang 1 year ago
parent
a1f5bb571f 00e255997e
commit
c15808a74f
6 changed files with 34 additions and 57 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. 4
      src/main/java/com/xujie/sys/common/utils/TaskUtils.java
  2. 8
      src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java
  3. 9
      src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
  4. 8
      src/main/resources/mapper/pms/EamMapper.xml
  5. 60
      src/main/resources/mapper/pms/QcReportMapper.xml
  6. 2
      src/main/resources/mapper/quote/QuoteDetailRoutingMapper.xml

4
src/main/java/com/xujie/sys/common/utils/TaskUtils.java
View File

@ -59,9 +59,9 @@ public class TaskUtils {
modbusCommunicateService.getInfoByModbus();
}
@Scheduled(cron = "${task.data.modbusCommunicate}")
@Scheduled(cron = "${task.data.readPerSecond}")
public void readPerSecond(){
// modbusCommunicateService.readPerSecond();
modbusCommunicateService.readPerSecond();
}
}

8
src/main/java/com/xujie/sys/modules/reader/config/TCPClient.java
View File

@ -79,8 +79,12 @@ public class TCPClient {
log.error("连接设备失败,IP:{},Port:{}",config.getIp(),config.getPort(),e);
}finally {
try {
Objects.requireNonNull(in).close();
Objects.requireNonNull(socket).close();
if (in!= null){
in.close();
}
if (socket!= null && !socket.isClosed()){
socket.close();
}
} catch (IOException e) {
log.error("关闭输入流失败", e);
}

9
src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java
View File

@ -153,7 +153,14 @@ public class ModbusCommunicateServiceImpl implements ModbusCommunicateService {
@Override
@Transactional
public void readPerSecond() {
List<EquipmentFolderLocation> list = equipmentFolderLocationService.lambdaQuery().eq(EquipmentFolderLocation::getSuffix, "RS232/RS485").list();
List<EquipmentFolderLocation> list = equipmentFolderLocationService
.lambdaQuery()
.eq(EquipmentFolderLocation::getSuffix, "RS232/RS485")
.and(wrapper -> {
wrapper.isNull(EquipmentFolderLocation::getTransparentFlag)
.or().eq(EquipmentFolderLocation::getTransparentFlag,"N");
})
.list();
if (list.isEmpty()){
log.info("没有维护RS232/RS485的设备信息");
return;

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

@ -728,7 +728,7 @@
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
LEFT JOIN operator as d on a.site = d.site and a.CreateBy = d.operator_id and d.active = 'Y'
LEFT JOIN operator as d on a.site = d.site and a.CreateBy = d.operator_id
left join eam_object as eo on eo.site = a.site and eo.ObjectID = a.ObjectID and eo.bu_no = a.bu_no
left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id and eo.bu_no = sd.bu_no
left join Access_dept as ead ON ead.site = sd.site and ead.department_id = sd.department_id and ead.bu_no = sd.bu_no
@ -857,8 +857,8 @@
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
left join operator as d on a.site = d.site and a.CreateBy = d.operator_id and d.active = 'Y'
left join eam_object as e on a.site = e.site and a.ObjectID = e.ObjectID and e.Active = 'Y' and a.bu_no = e.bu_no
left join operator as d on a.site = d.site and a.CreateBy = d.operator_id
left join eam_object as e on a.site = e.site and a.ObjectID = e.ObjectID and a.bu_no = e.bu_no
left join sys_department as f on e.site = f.site and e.dept_id = f.department_id and e.bu_no = f.bu_no
left join Access_dept as ead ON ead.site = f.site and ead.department_id = f.department_id and ead.bu_no = f.bu_no
left join sys_user as ea on ead.username = ea.username
@ -3082,7 +3082,7 @@
<select id="getResourceByObject" resultType="string">
select
ObjectID
ResourceID
from eam_object
where Site = #{site} and ObjectID = #{objectID}
</select>

60
src/main/resources/mapper/pms/QcReportMapper.xml
View File

@ -142,10 +142,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.create_date desc
a.inspection_no, b.item_no desc
</select>
<!-- 获取IPQC报表 -->
@ -270,10 +267,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date desc
a.inspection_no, b.item_no desc
</select>
<!-- 获取FAI报表 -->
@ -400,10 +394,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date desc
a.inspection_no, b.item_no desc
</select>
<!-- 获取FQC报表 -->
@ -528,10 +519,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date desc
a.inspection_no, b.item_no desc
</select>
@ -667,10 +655,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.create_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取IQC明细报表总条数 -->
<select id="getIQCDetailReportCount" parameterType="QcDetailReport" resultType="QcDetailReport">
@ -874,10 +859,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.create_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取IPQC明细报表 -->
@ -1012,10 +994,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取IPQC明细报表总条数 -->
<select id="getIPQCDetailReportCount" parameterType="QcDetailReport" resultType="QcDetailReport">
@ -1225,10 +1204,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取FAI明细报表 -->
@ -1359,10 +1335,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取FAI明细报表总条数 -->
<select id="getFAIDetailReportCount" parameterType="QcDetailReport" resultType="QcDetailReport">
@ -1568,10 +1541,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取FQC明细报表 -->
@ -1702,10 +1672,7 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
<!-- 获取FQC明细报表总条数 -->
<select id="getFQCDetailReportCount" parameterType="QcDetailReport" resultType="QcDetailReport">
@ -1911,9 +1878,6 @@
</if>
</where>
ORDER BY
CASE WHEN a.state = '待检验' THEN 1
WHEN a.state = '待审核' THEN 2
WHEN a.state = '已完成' THEN 3
END, a.task_date, c.num desc
a.inspection_no, b.item_no, c.num desc
</select>
</mapper>

2
src/main/resources/mapper/quote/QuoteDetailRoutingMapper.xml
View File

@ -103,6 +103,7 @@
left join work_center wc
on qdr.work_center_no = wc.work_center_no and qdr.site = wc.site and qdr.bu_no = wc.bu_no
where qdr.tree_id = #{treeId}
order by qdr.tree_id, qdr.operation_no
</select>
<select id="queryQuoteDetailRoutingByTreeIds"
resultType="com.xujie.sys.modules.quote.entity.QuoteDetailRouting">
@ -162,6 +163,7 @@
)
</if>
</where>
order by qdr.tree_id, qdr.operation_no
</select>
<select id="queryQuoteDetailRoutingByVersion"
resultType="com.xujie.sys.modules.quote.entity.QuoteDetailRouting">

Write Preview
Loading…
Cancel
Save