#

luxiaotao1123

2021-01-12 cbe346528fea2fea06b92b354ec5a71717544c12

#

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

@@ -1,12 +1,11 @@
package com.zy.asrs.task.handler;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkDetlLogService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.service.WrkMastLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,10 +27,22 @@
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitPakinLogService waitPakinLogService;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {

            if (!Cools.isEmpty(wrkMast.getBarcode())) {
                // 保存入库通知档历史档
                waitPakinLogService.save(wrkMast.getBarcode());
                // 删除入库通知档
                waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
            }

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -1,9 +1,7 @@
package com.zy.asrs.utils;

import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.*;
import com.zy.common.model.LocTypeDto;
import com.zy.common.utils.excel.matcode.MatCodeExcel;

/**
@@ -154,5 +152,15 @@
        matCode.setNum6(excel.getNum6());
    }

    /**
     *  库位移转时类型检测
     **/
    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
        // 如果源库位是高库位，目标库位是低库位
        if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
            return false;
        }
        return true;
    }

}

 src/main/java/com/zy/common/service/CommonService.java

@@ -7,6 +7,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
@@ -139,9 +140,11 @@
                // 检测目标库位是否为空库位
                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
                    locMast = shallowLoc;
                    crnNo = locMast.getCrnNo();
                    break;
                    if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
                        locMast = shallowLoc;
                        crnNo = locMast.getCrnNo();
                        break;
                    }
                }
            }
        }