奥普瑞斯从侧面口进出，盘点拣料功能修复

pang.jiabao

2 天以前 f0226479e92a906950aac0834048cc709e032e97

 src/main/java/com/zy/asrs/task/handler/JlerHandler.java

@@ -15,6 +15,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;

/**
 * @author pang.jiabao
@@ -50,11 +51,11 @@
        if(wrkMast.getIoType() == 110) {
            if(mesOutApply == null) { // 不是mes下发的空托出库
                TransTask transTask = new TransTask();
//                transTask.setTaskno(mesOutApply.getTaskno());
                transTask.setTaskno(String.valueOf(new Date().getTime()));
//                transTask.setTaskname(mesOutApply.getTaskname());
//                transTask.setOrderNo(mesOutApply.getOrderNo());
                transTask.setTransType("01");
                transTask.setCurStationId(WMS_TRANS_START_STATION_3);
                transTask.setCurStationId(wrkMast.getStaNo());
//                transTask.setNextProcess(mesOutApply.getProductLineId());
                transTask.setNextStationId(wrkMast.getAgvSta());
                transTask.setItemno(WMS_ZPALLET_ID);  // 固定为空托的编码
@@ -64,10 +65,6 @@
                transTask.setAgvFactory(1);
                JSONObject sendAgvTask = mesService.submitTask(transTask);
                if ("1".equals(sendAgvTask.getString("Success"))) {
                    String taskno = sendAgvTask.getString("taskno");
                    if(Cools.isEmpty(wrkMast.getTaskNo())) {
                        wrkMast.setTaskNo(taskno);
                    }
                    wrkMast.setCallAgv(1);
                    wrkMastService.updateById(wrkMast);
                }else {
@@ -79,7 +76,7 @@
                transTask.setTaskname(mesOutApply.getTaskname());
                transTask.setOrderNo(mesOutApply.getOrderNo());
                transTask.setTransType(mesOutApply.getTransType());
                transTask.setCurStationId(WMS_TRANS_START_STATION_3);
                transTask.setCurStationId(wrkMast.getStaNo());
                transTask.setNextProcess(mesOutApply.getProductLineId());
                transTask.setNextStationId(mesOutApply.getStationId());
                transTask.setItemno(WMS_ZPALLET_ID);  // 固定为空托的编码
@@ -90,10 +87,6 @@
                transTask.setAgvFactory(1);
                JSONObject sendAgvTask = mesService.submitTask(transTask);
                if ("1".equals(sendAgvTask.getString("Success"))) {
//                    String taskno = sendAgvTask.getString("taskno");
//                    if(Cools.isEmpty(wrkMast.getTaskNo())) {
//                        wrkMast.setTaskNo(taskno);
//                    }
                    wrkMast.setCallAgv(1);
                    wrkMastService.updateById(wrkMast);
                }else {
@@ -109,7 +102,7 @@
                transTask.setTaskname(mesOutApply.getTaskname());
                transTask.setOrderNo(mesOutApply.getOrderNo());
                transTask.setTransType(mesOutApply.getTransType());
                transTask.setCurStationId(WMS_TRANS_START_STATION_3);
                transTask.setCurStationId(wrkMast.getStaNo());
                transTask.setNextProcess(mesOutApply.getProductLineId());
                transTask.setNextStationId(mesOutApply.getStationId());
                transTask.setItemno(mesOutApply.getItemno());
@@ -122,10 +115,6 @@

                JSONObject sendAgvTask = mesService.submitTask(transTask);
                if ("1".equals(sendAgvTask.getString("Success"))) {
//                    String taskno = sendAgvTask.getString("taskno");
//                    if(Cools.isEmpty(wrkMast.getTaskNo())) {
//                        wrkMast.setTaskNo(taskno);
//                    }
                    wrkMast.setCallAgv(1);
                    wrkMastService.updateById(wrkMast);
                }else {