#

LSH

2024-06-21 f055f21676aa745087ecc0a21f4ade980d98e8bc

#

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

@@ -2035,10 +2035,13 @@
     */
    public synchronized void crnStnToLoc1Big(CrnSlave slave, CrnProtocol crnProtocol, Integer crnStation) {
        List<WrkMast> wrkMasts = wrkMastMapper.selectPakInStep12(slave.getId());
        Integer crnStation1 = crnStation;//记录
        for(WrkMast wrkMast : wrkMasts){
            if (wrkMast == null) {
                continue;
            }

            crnStation=crnStation1;//刷新

            CrnSlave.CrnStn crnStn = null;
            for (CrnSlave.CrnStn crnStn1 : slave.getCrnInStn()){
@@ -2102,6 +2105,10 @@
                }
            }else {
                break;
            }

            if (locMast.getBay1()==81){
                crnStation=2;
            }


@@ -2925,10 +2932,13 @@
     */
    public synchronized void locToCrnStn1Big(CrnSlave slave, CrnProtocol crnProtocol, Integer crnStation) {
        List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
        Integer crnStation1 = crnStation;
        for (WrkMast wrkMast : wrkMasts) {
            if (wrkMast == null) {
                continue;
            }

            crnStation = crnStation1;

            CrnSlave.CrnStn crnStn = null;
            for (CrnSlave.CrnStn crnStn1 : slave.getCrnOutStn()){
@@ -3010,6 +3020,10 @@
                    break;
                }

                if (sourceSta.getBay1().shortValue()==81){
                    crnStation = 2;
                }

                // 双深库位且浅库位有货，则需先对浅库位进行库位移转
                if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
                    String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());