1

Administrator

21 小时以前 913604496c47484263604063e1fbb47778cb3795

1

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java

@@ -110,11 +110,11 @@

                    ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
                    if (locOfWms != null) {
                        Integer workNo = getWorkNo();
                        staProtocol.setWorkNo(workNo);
                        staProtocol.setWorkNo(staProtocol.getWorkNo());
                        staProtocol.setStaNo(inSta.getTargetSta());
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        job.setLoc(locOfWms.getLocNo());
                        job.setStaNo(String.valueOf(inSta.getTargetSta()+1));
                        job.setTaskNo(locOfWms.getTaskNo());
                        job.setBatchNo(locOfWms.getBatchNo());
                        job.setBarcode(barcode);

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/SendTaskOperationHandler.java

@@ -6,6 +6,7 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
@@ -63,10 +64,10 @@
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                // 遍历入库口
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                for (DevpSlave.Sta sta : devp.getTakeSta()) {
                    // 根据输送线plc遍历
                    Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
                    StaProtocol staProtocol = stationMap.get(inSta.getTargetSta());
                    StaProtocol staProtocol = stationMap.get(sta.getSourceStaNo());
                    if (staProtocol == null) {
                        continue;
                    } else {
@@ -85,10 +86,7 @@
                        News.error("{},输送线上无货有任务号，需要人工处理站点：{}", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (!staProtocol.isInEnable()) {
                        //News.error("{},站点：{},没有可入信号", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }

                    Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
                    if (jobByJobNo == null) {
                        News.error("{}：站点：{}，找不到任务", config.getMark(), staProtocol.getSiteId());
@@ -106,6 +104,9 @@
                        jobByJobNo.setJobSts(ConveyorStateType.SENDTASK.getStatus());
                        jobByJobNo.setRcsTime(new Date());
                        jobService.updateById(jobByJobNo);
                        staProtocol.setWorkNo(staProtocol.getWorkNo());
                        staProtocol.setStaNo(sta.getTargetSta());
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        News.error("{},任务发送给RCS成功,WMS任务号：{},输送线工作号：{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());
                    } else {
                        News.error("{},任务发送给RCS失败,WMS任务号：{},输送线工作号：{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java

@@ -100,7 +100,7 @@


                    if (staProtocol.getWorkNo() == 0 && !staProtocol.isStartUpFlag()) {
                        Job job = initJob(getWorkNo(), staProtocol.getSiteId() + "");
                        Job job = initJob(getWorkNo());
                        staProtocol.setWorkNo(job.getJobNo());
                        staProtocol.setStaNo(inSta.getStaNo());
                        staProtocol.setStartUpFlag(false);
@@ -118,9 +118,8 @@
        }
    }

    private Job initJob(Integer workNo, String staNo) {
    private Job initJob(Integer workNo) {
        Job job = new Job();
        job.setStaNo(staNo);
        job.setJobNo(workNo);
        job.setJobSts(ConveyorStateType.STARTUP.getStatus());
        job.setStartTime(new Date());

 zy-asc-conveyor/src/main/resources/application.yml

@@ -125,6 +125,8 @@
      targetSta: 1012
    # ctu取货站点
    takeSta[0]:
      # 源站点
      sourceStaNo: 1007
      # 本站点
      staNo: 1013