#

Junjie

2024-09-23 4ac5ff223ee7757b55d86b0f34b74152874d68c9

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java

@@ -738,11 +738,13 @@

    @Override
    public ShuttleCommand getLiftCommand(Integer taskNo, Boolean lift) {
        int deviceTaskNo = this.generateDeviceTaskNo(taskNo, lift ? MotionCtgType.SHUTTLE_PALLET_LIFT : MotionCtgType.SHUTTLE_PALLET_DOWN);

        HashMap<String, Object> body = new HashMap<>();
        body.put("messageName", "actionOrder");
        body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
        body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
        body.put("taskId", taskNo);
        body.put("taskId", deviceTaskNo);
        body.put("action", lift ? 1 : 2);

        ShuttleCommand command = new ShuttleCommand();
@@ -754,11 +756,13 @@

    @Override
    public ShuttleCommand getChargeCommand(Integer taskNo, Boolean charge) {
        int deviceTaskNo = this.generateDeviceTaskNo(taskNo, charge ? MotionCtgType.SHUTTLE_CHARGE_ON : MotionCtgType.SHUTTLE_CHARGE_OFF);

        HashMap<String, Object> body = new HashMap<>();
        body.put("messageName", "runOrder");
        body.put("msgTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
        body.put("deviceNo", Integer.parseInt(this.device.getDeviceNo()));
        body.put("taskId", taskNo);
        body.put("taskId", deviceTaskNo);
        body.put("action", charge ? 3 : 4);

        ShuttleCommand command = new ShuttleCommand();