root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
gongbaoxiong
2024-07-04 14:33:22 +08:00
parent 9ea855ce58 2df0a36d4e
commit 5083f4b85d
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
View File

@@ -12,7 +12,7 @@
AND bic.point_location = #{area} AND bic.point_location = #{area}
AND 0 = (SELECT COUNT(*) AND 0 = (SELECT COUNT(*)
FROM sch_base_task t FROM sch_base_task t
WHERE t.task_status <![CDATA[ < ]]> '07' WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07'
AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code
OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1 OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1
OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2) OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2)

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java
View File

@@ -316,12 +316,15 @@ public class AutoCallAirShaftTask {
device.put("device_code", shafttubeivt.getPoint_code()); device.put("device_code", shafttubeivt.getPoint_code());
array.add(device); array.add(device);
JSONObject pointStatus = wmsToAcsService.getPointStatus(array); JSONObject pointStatus = wmsToAcsService.getPointStatus(array);
log.info("ACS反馈气胀轴库信息：{}", pointStatus);
JSONArray data = pointStatus.getJSONArray("data"); JSONArray data = pointStatus.getJSONArray("data");
JSONObject jsonObject = data.getJSONObject(0); JSONObject jsonObject = data.getJSONObject(0);
if (jsonObject.getInteger("qty") == 0) { if (jsonObject.getInteger("qty") == 0) {
// 没有货 // 没有货
log.info("ACS告知无气胀轴，申请从气胀轴密集库出气胀轴");
toCreatShaftCacheTask(qzzSize, location, empty); toCreatShaftCacheTask(qzzSize, location, empty);
} else { } else {
log.info("开始给ACS写信号出气胀轴");
JSONArray acsParam = new JSONArray(); JSONArray acsParam = new JSONArray();
JSONObject acsQzz = new JSONObject(); JSONObject acsQzz = new JSONObject();
acsQzz.put("device_code", shafttubeivt.getPoint_code()); acsQzz.put("device_code", shafttubeivt.getPoint_code());

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
View File

@@ -53,7 +53,7 @@
AND bcp.point_location = #{location} AND bcp.point_location = #{location}
AND 0 = ( AND 0 = (
SELECT COUNT(*) FROM sch_base_task t SELECT COUNT(*) FROM sch_base_task t
WHERE t.task_status <![CDATA[ < ]]> '07' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1 WHERE t.task_status <![CDATA[ <= ]]> '071' AND t.task_status <![CDATA[ <> ]]> '07' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1
OR t.point_code4 = bcp.truss_point_code1 OR t.point_code2 = bcp.truss_point_code2 OR t.point_code4 = bcp.truss_point_code2) OR t.point_code4 = bcp.truss_point_code1 OR t.point_code2 = bcp.truss_point_code2 OR t.point_code4 = bcp.truss_point_code2)
) )
ORDER BY ABS(bcp.sort_seq - #{sortSeq}) ORDER BY ABS(bcp.sort_seq - #{sortSeq})

4
lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java
View File

@@ -64,13 +64,13 @@ public class SysNoticeController {
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
@Log("获取未读的接收消息条数") // @Log("获取未读的接收消息条数")
@GetMapping("/countByReceiveNotRead") @GetMapping("/countByReceiveNotRead")
public ResponseEntity<Object> countByReceiveNotRead() { public ResponseEntity<Object> countByReceiveNotRead() {
return new ResponseEntity<>(noticeService.countByReceiveNotRead(), HttpStatus.OK); return new ResponseEntity<>(noticeService.countByReceiveNotRead(), HttpStatus.OK);
} }
@Log("接收消息分页") // @Log("接收消息分页")
@GetMapping("/pageByReceive") @GetMapping("/pageByReceive")
public ResponseEntity<Object> pageByReceive() { public ResponseEntity<Object> pageByReceive() {
return new ResponseEntity<>(noticeService.pageByReceive(), HttpStatus.OK); return new ResponseEntity<>(noticeService.pageByReceive(), HttpStatus.OK);

5
lms/nladmin-system/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java
View File

@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer;
/** /**
* <p> * <p>
@@ -57,7 +58,9 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
LambdaQueryWrapper<SysLog> lam = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysLog> lam = new LambdaQueryWrapper<>();
lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type) lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type)
.eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username) .eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username)
.like(ObjectUtil.isNotEmpty(blurry), SysLog::getDescription, blurry) .and(ObjectUtil.isNotEmpty(blurry), la -> la.like(SysLog::getDescription, blurry)
.or()
.like(SysLog::getParams, blurry))
.le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time) .le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time)
.ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time) .ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time)
.orderByDesc(SysLog::getCreate_time); .orderByDesc(SysLog::getCreate_time);