From 780012a4b70c87c81c5c9222db82196303eeebdb Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期四, 26 六月 2025 17:19:19 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 40 +++++++++----------- src/main/java/com/zy/asrs/controller/BasErrLogController.java | 6 ++ src/main/java/com/zy/asrs/entity/BasErrLog.java | 23 +++++++++++ 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasErrLogController.java b/src/main/java/com/zy/asrs/controller/BasErrLogController.java index a261d64..e64f386 100644 --- a/src/main/java/com/zy/asrs/controller/BasErrLogController.java +++ b/src/main/java/com/zy/asrs/controller/BasErrLogController.java @@ -48,7 +48,11 @@ } else { wrapper.orderBy("CREATE_TIME", false); } - return R.ok(basErrLogService.selectPage(new Page<>(curr, limit), wrapper)); + + List<BasErrLog> basErrLogList = basErrLogService.selectList(wrapper); + Page<BasErrLog> page = new Page<BasErrLog>(0, 10).setRecords(basErrLogList); + page.setTotal(basErrLogList.size()); + return R.ok(page); } private void convert(Map<String, Object> map, EntityWrapper wrapper){ diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java index e0c2d43..218fd43 100644 --- a/src/main/java/com/zy/asrs/entity/BasErrLog.java +++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.enums.IdType; import com.core.common.Cools; import com.core.common.SpringUtils; +import com.zy.asrs.service.BasWrkIotypeService; +import com.zy.asrs.service.BasWrkStatusService; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -175,7 +177,8 @@ public BasErrLog() {} - public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) { + public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo, + String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) { this.uuid = uuid; this.wrkNo = wrkNo; this.startTime = startTime; @@ -285,6 +288,15 @@ this.wrkSts = wrkSts; } + public String getWrkSts$(){ + BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class); + BasWrkStatus basWrkStatus = service.selectById(this.wrkSts); + if (!Cools.isEmpty(basWrkStatus)){ + return String.valueOf(basWrkStatus.getWrkDesc()); + } + return null; + } + public Integer getIoType() { return ioType; } @@ -293,6 +305,15 @@ this.ioType = ioType; } + public String getIoType$(){ + BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class); + BasWrkIotype basWrkIotype = service.selectById(this.ioType); + if (!Cools.isEmpty(basWrkIotype)){ + return String.valueOf(basWrkIotype.getIoDesc()); + } + return null; + } + public Integer getCrnNo() { return crnNo; } diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index c22aa53..438cf44 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -31,7 +31,6 @@ import com.zy.core.thread.RgvThread; import com.zy.core.thread.SiemensDevpThread; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -55,8 +54,6 @@ @Autowired private SlaveProperties slaveProperties; - @Autowired - private WrkMastMapper wrkMastMapper; @Autowired private LocMastService locMastService; @Autowired @@ -1340,34 +1337,33 @@ if (crnProtocol == null) { continue; } - if (false) { -// if (crnProtocol.getModeType() != CrnModeType.STOP) { + if (crnProtocol.getModeType() != CrnModeType.STOP) { // 鏈変换鍔� if (crnProtocol.getTaskNo() != 0) { BasErrLog latest = basErrLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue()); // 鏈夊紓甯� if (latest == null) { if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) { - WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo()); - if (wrkMast == null) { + TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo())); + if (taskWrk == null) { continue; } - BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm()); + BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm().intValue()); String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName(); BasErrLog basErrLog = new BasErrLog( null, // 缂栧彿 - wrkMast.getWrkNo(), // 宸ヤ綔鍙� + taskWrk.getWrkNo(), // 宸ヤ綔鍙� now, // 鍙戠敓鏃堕棿 null, // 缁撴潫鏃堕棿 - wrkMast.getWrkSts(), // 宸ヤ綔鐘舵�� - wrkMast.getIoType(), // 鍏ュ嚭搴撶被鍨� + taskWrk.getWrkSts().longValue(), // 宸ヤ綔鐘舵�� + taskWrk.getIoType(), // 鍏ュ嚭搴撶被鍨� crn.getId(), // 鍫嗗灈鏈� null, // plc - wrkMast.getLocNo(), // 鐩爣搴撲綅 - wrkMast.getStaNo(), // 鐩爣绔� - wrkMast.getSourceStaNo(), // 婧愮珯 - wrkMast.getSourceLocNo(), // 婧愬簱浣� - wrkMast.getBarcode(), // 鏉$爜 + taskWrk.getTargetPoint(), // 鐩爣搴撲綅 + 0, // 鐩爣绔� + 0, // 婧愮珯 + taskWrk.getStartPoint(), // 婧愬簱浣� + taskWrk.getBarcode(), // 鏉$爜 (int) crnProtocol.getAlarm(), // 寮傚父鐮� errName, // 寮傚父 1, // 寮傚父鎯呭喌 @@ -2175,7 +2171,7 @@ // 鍛戒护闆嗗悎 List<LedCommand> commands = new ArrayList<>(); // 宸ヤ綔妗i泦鍚� - List<WrkMast> wrkMasts = new ArrayList<>(); + List<TaskWrk> taskWrks = new ArrayList<>(); for (Integer staNo : led.getStaArr()) { // 鑾峰彇鍙夎溅绔欑偣 StaProtocol staProtocol = devpThread.getStation().get(staNo); @@ -2199,7 +2195,7 @@ ledCommand.getMatDtos().add(matDto); commands.add(ledCommand); } - Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet()); + Set<Integer> workNos = taskWrks.stream().map(TaskWrk::getWrkNo).collect(Collectors.toSet()); // 鑾峰彇LED绾跨▼ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId()); // 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护 @@ -2218,10 +2214,10 @@ try { // 淇敼涓绘。led鏍囪 - for (WrkMast wrkMast : wrkMasts) { - wrkMast.setOveMk("Y"); - wrkMast.setModiTime(new Date()); - if (wrkMastMapper.updateById(wrkMast) == 0) { + for (TaskWrk taskWrk : taskWrks) { +// taskWrk.setOveMk("Y"); + taskWrk.setModiTime(new Date()); + if (taskWrkMapper.updateById(taskWrk) == 0) { // News.errorNoLog(""+mark+" - 4"+" - 鏇存柊宸ヤ綔妗eけ璐�"); throw new CoolException("鏇存柊宸ヤ綔妗eけ璐�"); } -- Gitblit v1.9.1