From cbe66641fba623b7e1234055c6d591c6462f656c Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期四, 14 三月 2024 13:24:21 +0800 Subject: [PATCH] #XGHYSRJTXC 优化 --- src/main/java/com/zy/common/model/MatDto.java | 4 ++++ src/main/java/com/zy/asrs/controller/RgvController.java | 2 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java index c33b833..6c8a410 100644 --- a/src/main/java/com/zy/asrs/controller/RgvController.java +++ b/src/main/java/com/zy/asrs/controller/RgvController.java @@ -91,7 +91,7 @@ vo.setWalkPos(rgvProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�"); vo.setWorkNo2(rgvProtocol.getTaskNo2()); // 宸ヤ綅2浠诲姟鍙� vo.setStatus2(rgvProtocol.getStatusType2().desc); // 宸ヤ綅2鐘舵�� - vo.setLoading2(rgvProtocol.getLoaded2()==0?"鏃犵墿":"鏈夌墿"); // 宸ヤ綅2鏈夌墿 + vo.setLoading2(rgvProtocol.getLoaded2()==0?"鏃犵墿":rgvProtocol.getLoaded2().toString()); // 宸ヤ綅2鏈夌墿 vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm())); if (rgvProtocol.getAlarm() > 0) { 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 900bc6d..48242e4 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -3318,7 +3318,7 @@ wrkMast.setSheetNo("5"); wrkMastMapper.updateById(wrkMast); - boolean result4 = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol147)); + boolean result4 = MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol147)); } } diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java index 6194887..b78e622 100644 --- a/src/main/java/com/zy/common/model/MatDto.java +++ b/src/main/java/com/zy/common/model/MatDto.java @@ -1,5 +1,6 @@ package com.zy.common.model; +import com.core.common.Cools; import com.zy.asrs.entity.WrkDetl; import lombok.Data; @@ -57,6 +58,9 @@ this.specs = wrkDetl.getSpecs(); this.batch = wrkDetl.getBatch(); this.model = wrkDetl.getModel(); + if (Cools.isEmpty(wrkDetl.getPrice())){ + wrkDetl.setPrice(0.0); + } this.price = wrkDetl.getPrice().toString(); // this.juanNo = wrkDetl.getSku(); this.count = wrkDetl.getAnfme(); -- Gitblit v1.9.1