1

zhang

23 小时以前 912d09bc076272770a507517e71703078c8ae9d7

1

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

@@ -14,7 +14,6 @@
import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.JobService;
import com.zy.acs.conveyor.service.WmsMainService;
import com.zy.acs.conveyor.service.WrkLastnoService;
@@ -89,16 +88,16 @@
                        News.error("{}：站点：{}，无物", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.isWeightErr()){
                    if (staProtocol.isWeightErr()) {
                        News.error("{}：站点：{}，重量异常：{}", config.getMark(), staProtocol.getSiteId(), staProtocol.getWeight());
                        continue;
                    }
                    if (staProtocol.isBarcodeErr()){
                        News.error("{}：站点：{}，条码异常：{}",  config.getMark(),staProtocol.getSiteId(), staProtocol.getBarcode());
                    if (staProtocol.isBarcodeErr()) {
                        News.error("{}：站点：{}，条码异常：{}", config.getMark(), staProtocol.getSiteId(), staProtocol.getBarcode());
                        continue;
                    }
                    if (staProtocol.isLoadErr()){
                        News.error("{}：站点：{}，入库时检测托盘上有无货物",  config.getMark(),staProtocol.getSiteId());
                    if (staProtocol.isLoadErr()) {
                        News.error("{}：站点：{}，入库时检测托盘上有无货物", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    String barcode = staProtocol.getBarcode();
@@ -120,7 +119,7 @@
                        continue;
                    }

                    ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
                    ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(job, barcode, inSta.getStaNo() + "", staProtocol));
                    if (locOfWms != null) {
                        staProtocol.setWorkNo(staProtocol.getWorkNo());
                        staProtocol.setStaNo(inSta.getTargetSta());
@@ -163,12 +162,11 @@
    }



    private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
    private ApplyInDto applyIn(Job job, String barcode, String staNo, StaProtocol staProtocol) {
        ApplyInDto applyInDto = new ApplyInDto();
        applyInDto.setStaNo(staNo);
        applyInDto.setBarcode(barcode);
        applyInDto.setFull(staProtocol.isFullPlt());
        applyInDto.setFull(Boolean.valueOf(job.getFull()));
        applyInDto.setWeight(staProtocol.getWeight());
        return applyInDto;
    }

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

@@ -99,7 +99,7 @@


                    if (staProtocol.getWorkNo() == 0 && staProtocol.isStartUpFlag()) {
                        Job job = initJob(getWorkNo());
                        Job job = initJob(getWorkNo(), staProtocol.isFullPlt());
                        staProtocol.setWorkNo(job.getJobNo());
                        staProtocol.setStaNo(inSta.getStaNo());
                        staProtocol.setStartUpFlag(false);
@@ -117,12 +117,13 @@
        }
    }

    private Job initJob(Integer workNo) {
    private Job initJob(Integer workNo, Boolean fullPlt) {
        Job job = new Job();
        job.setJobNo(workNo);
        job.setJobSts(ConveyorStateType.STARTUP.getStatus());
        job.setStartTime(new Date());
        job.setCreateTime(new Date());
        job.setFull(fullPlt.toString());
        return job;
    }


 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/entity/Job.java

@@ -57,8 +57,11 @@
     */
    @TableField("job_no")
    private Integer jobNo;


    /**
     * 是否满版
     */
    @TableField("full")
    private String full;
    /**
     * 工作状态
     */