1

zhang

昨天 25650bd51704793cf78408d28853c89fda837c4c

1

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

@@ -94,7 +94,8 @@
                        News.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                        continue;
                    }
                    Job job = jobService.getJobByBarcode(barcode);
                    Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
                    //Job job = jobService.getJobByBarcode(barcode);
                    if (job == null) {
                        News.error("{}：站点：{}，找不到任务", config.getMark(), staProtocol.getSiteId());
                        continue;
@@ -113,8 +114,16 @@
                        staProtocol.setWorkNo(workNo);
                        staProtocol.setStaNo(inSta.getTargetSta());
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                        job.setLoc(locOfWms.getLocNo());
                        job.setTaskNo(locOfWms.getTaskNo());
                        job.setBatchNo(locOfWms.getBatchNo());
                        job.setBarcode(barcode);
                        job.setWmsTime(new Date());
                        job.setJobSts(ConveyorStateType.INBOUND.getStatus());
                        //if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                        if (jobService.updateById(job)) {
                            News.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());

                        }
                    } else {
                        News.error("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());

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

@@ -20,6 +20,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.Map;


@@ -93,7 +94,7 @@
                        if (ctuMainService.checkComplete(job.getTaskNo())) {
                            staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(takeSta), (short) 1, false));
                            redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);

                            job.setUpdateTime(new Date());
                            job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
                            if (!jobService.updateById(job)) {
                                log.info("" + config.getMark() + "站点清空失败：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());

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

@@ -24,6 +24,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.Map;

@Slf4j
@@ -93,6 +94,7 @@
                            job = new Job();
                            job.setTaskNo(seqNum);
                            job.setJobNo(workNo);
                            job.setCreateTime(new Date());
                            job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
                            if (!jobService.insert(job)) {
                                throw new CoolException("插入输送线任务失败," + seqNum + " - " + workNo);

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

@@ -18,6 +18,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.Map;

/**
@@ -92,7 +93,7 @@
                    }
                    staProtocol.setStaNo(inSta.getStaNo());
                    redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);

                    jobByJobNo.setStartTime(new Date());
                    jobByJobNo.setJobSts(ConveyorStateType.STARTUP.getStatus());
                    if (!jobService.updateById(jobByJobNo)) {
                        News.info("{},启动入库：{},{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo());

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java

@@ -6,11 +6,14 @@
import com.zy.acs.conveyor.mapper.JobLogMapper;
import com.zy.acs.conveyor.mapper.JobMapper;
import com.zy.acs.conveyor.service.JobService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;

@Service
@@ -55,6 +58,9 @@
    public void saveJobLog(Job job) {
        JobLog jobLog = new JobLog();
        BeanUtils.copyProperties(job, jobLog);
        if (Cools.isEmpty(jobLog.getMemo())){
            jobLog.setMemo(DateUtils.convert(new Date()));
        }
        jobLogMapper.insert(jobLog);
        baseMapper.deleteById(job.getId());