Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs

luxiaotao1123

2022-12-03 275493fbbc1f7f2fbcbda8183a56c7813c96b085

 src/main/java/com/zy/asrs/controller/SteController.java

@@ -7,12 +7,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.param.CrnDemoParam;
import com.zy.asrs.domain.param.SteModeParam;
import com.zy.asrs.domain.param.SteOperatorParam;
import com.zy.asrs.domain.vo.SteDataVo;
import com.zy.asrs.domain.vo.SteMsgTableVo;
import com.zy.asrs.domain.vo.SteStateTableVo;
import com.zy.asrs.domain.vo.SteDataVo;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasSteService;
@@ -22,7 +21,6 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.SteTaskModeType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.SteCommand;
@@ -102,6 +100,12 @@
            }
            if (!Cools.isEmpty(steProtocol.getChargeStatus())) {
                vo.setChargeStatus(steProtocol.getChargeStatus()==1?"✔":"×");
            }
            if (!Cools.isEmpty(steProtocol.getAlarm())) {
                vo.setAlarm1(String.valueOf(steProtocol.getAlarm()));
            }
            if (!Cools.isEmpty(steProtocol.getAlarm0())) {
                vo.setAlarm2(String.valueOf(steProtocol.getAlarm0()));
            }
        }
        return R.ok().add(list);
@@ -205,6 +209,10 @@
        } else {
            throw new CoolException("命令下发失败");
        }
        basSte.setRow(vo.getRow());
        basSte.setBay(vo.getBay());
        basSte.setLev(vo.getLev());

        basSte.setPakMk(vo.getPakMk());
        basSte.setWrkNo(vo.getWorkNo());
        basSte.setCrnNo(vo.getCrnNo());