#

yxFwq

2024-07-18 19a7e4ff6c165ba3b13aaa4e79b0aa407ae8fd3f

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -7895,7 +7895,7 @@
                    List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusListCharge(steSlave.getId(), new ArrayList<Integer>() {{
                        add(5);
                        add(11);
                        add(16);
                        add(17);
                    }});
                    if(!basJarMastList.isEmpty()){
                        continue;

 src/main/java/com/zy/common/model/MatDto.java

@@ -51,17 +51,21 @@
        this.specs = specs;
    }
    public MatDto(WrkDetl wrkDetl) {
        this.matNo = wrkDetl.getMatnr();
        this.matnr = wrkDetl.getMatnr();
        this.maknx = wrkDetl.getMaktx();
        this.specs = wrkDetl.getSpecs();
        this.batch = wrkDetl.getBatch();
        this.model = wrkDetl.getModel();
        this.price = wrkDetl.getPrice().toString();
        try{
            this.matNo = wrkDetl.getMatnr();
            this.matnr = wrkDetl.getMatnr();
            this.maknx = wrkDetl.getMaktx();
            this.specs = wrkDetl.getSpecs();
            this.batch = wrkDetl.getBatch();
            this.model = wrkDetl.getModel();
            this.price = wrkDetl.getPrice().toString();
//        this.juanNo = wrkDetl.getSku();
        this.count = wrkDetl.getAnfme();
        this.weight = wrkDetl.getWeight();
        this.volume = wrkDetl.getVolume();
        this.orderNo = wrkDetl.getOrderNo();
            this.count = wrkDetl.getAnfme();
            this.weight = wrkDetl.getWeight();
            this.volume = wrkDetl.getVolume();
            this.orderNo = wrkDetl.getOrderNo();
        } catch (Exception e){
            System.out.println("异常MatDto68");
        }
    }
}

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -318,6 +318,7 @@
                        staProtocol.setEndRow(siemensS7Net.getByteTransform().TransInt16(resultRgv2.Content, 0));     // 小车目标位

                        staProtocol.setNowRow(siemensS7Net.getByteTransform().TransInt16(resultRgv.Content, 2));   // 当前位置
//                        staProtocol.setNowRow((short)2);   // 当前位置

                        boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRgv.Content, 4, 1);
                        staProtocol.setRGV1(status[0]);  // 小车无货空闲