#XGHYSRJTXC 优化

lsh

2024-03-14 cbe66641fba623b7e1234055c6d591c6462f656c

#XGHYSRJTXC  优化

 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) {

 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));

                }
            }

 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();