bug修复

skyouc

昨天 7bd1e8326844525956f13ebaf4e5549943be484f

bug修复

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -176,7 +176,7 @@


    @PostMapping("/cache/agv/call")
    @ApiOperation("呼叫空车")
    @ApiOperation("缓冲区入库")
    @ManagerAuth
    public R callAgvMove(@RequestBody AgvCallParams params) {
        if (Objects.isNull(params)) {

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.api.enums.LocAreaType;
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasAreasServiceImpl;
import com.zy.asrs.service.impl.BasStationServiceImpl;
@@ -329,7 +330,7 @@
            return R.error("库存不足");
        }

        Thread.sleep(1000L);
        Thread.sleep(300L);

        List<TaskDto> taskDtos = new ArrayList<>();
        // 根据 （库位 & 出库站） 分组； 理想状态：一组为一次出库任务
@@ -347,7 +348,10 @@
        // -----------------------------------------------------------------------------------------------
        for (TaskDto taskDto : taskDtos) {
//            BasDevp staNo = basDevpService.checkSiteStatus(taskDto.getStaNo());
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", taskDto.getAgvStaNo()));
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
                    .in("loc_sts", Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_O.type))
                    .eq("dev_no", taskDto.getAgvStaNo()));
            if (Objects.isNull(station)) { throw new CoolException("数据错误，站点不存在或已使用！！"); }
            workService.agvStockOut(station, taskDto, getUserId());
        }
        return R.ok();

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -1540,7 +1540,7 @@
            station.setModiTime(new Date());
            station.setModiUser(userId);
            if (!basStationService.updateById(station)) {
                throw new CoolException("更新目标库位状态失败");
                throw new CoolException("更新目标站点状态失败");
            }
        } else {
            throw new CoolException("移转失败，目标库位状态：" + station.getLocSts());
@@ -2456,7 +2456,7 @@

        if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
            station.setLocSts("R"); // S.入库预约
            station.setBarcode(barcode);
//            station.setBarcode(barcode);
            station.setModiTime(new Date());
            station.setModiUser(userId);
            if (!basStationService.updateById(station)) {

 src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java

@@ -59,6 +59,7 @@
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", wrkMast.getSourceStaNo()));
            if (!Objects.isNull(station)) {
                station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                station.setBarcode(null);
                if (!basStationService.updateById(station)) {
                    throw new CoolException("站点状态修改失败!!");
                }
@@ -213,6 +214,7 @@
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", wrkMast.getStaNo()));
            if (station.getLocSts().equals("S")) {
                station.setLocSts("O");
                station.setBarcode(null);
                station.setModiTime(new Date());
                station.setModiUser(userId);
                if (!basStationService.updateById(station)) {

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

@@ -427,7 +427,7 @@
                    }

                    String agvSta = null;
                    if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
                    if (wrkMast.getIoType() == TaskIOType.MERGE_IN.type) {
                        agvSta = wrkMast.getPauseMk();
                    }

@@ -769,6 +769,7 @@
                throw new CoolException("站点：" + task.getSourceStaNo() + ", 不存在！！");
            }
            devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
            devNo.setBarcode(task.getBarcode());
            devNo.setModiTime(new Date());
            if (!basStationService.updateById(devNo)) {
                throw new CoolException("站点信息修改失败！！");
@@ -882,6 +883,20 @@
    @Transactional(rollbackFor = Exception.class)
    public ReturnT<String> agvDoIn(Task wrkMast) {
        LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));

        if (!Objects.isNull(wrkMast.getSourceStaNo())) {
            BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
                    .eq("dev_no", wrkMast.getSourceStaNo()));
            if (!Objects.isNull(station)) {
                List<String> list = Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type);
                if (!list.contains(station.getLocSts())) {
                    station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
                }
                station.setBarcode(null);
                basStationService.updateById(station);
            }
        }

        if(wrkMast.getIoType().equals(1)){
            if (Objects.isNull(locCache)) {
                throw new CoolException("数据错误，库位不存在！！");

 src/main/webapp/static/js/orderPakout/agvOut.js

@@ -179,7 +179,7 @@
                                let data = tableCache[index];
                                for (let i = 0; i<tableCache.length; i++) {
                                    if (tableCache[i].locNo === data.locNo) {
                                        tableCache[i]['staNo'] = Number(obj.elem.value);
                                        tableCache[i]['agvStaNo'] = obj.elem.value;
                                    }
                                }
                                obj.othis.children().find("input").css("color", "blue");
@@ -199,7 +199,7 @@
                                // 出库站取交集
                                let staBatchSelectVal = [];
                                for(let i = 0; i<stoPreTabData.length; i++) {
                                    let staNos = stoPreTabData[i].staNos;
                                    let staNos = stoPreTabData[i].agvStaNos;
                                    if (staNos !== null) {
                                        if (staBatchSelectVal.length === 0) {
                                            staBatchSelectVal = staNos;
@@ -229,7 +229,7 @@
                                        // 确认
                                        form.on('submit(staBatchSelectConfirm)', function (obj) {
                                            let loadIdx = layer.load(2);
                                            let batchSta = Number(obj.field.batchSta);
                                            let batchSta = obj.field.batchSta;
                                            let arr = [];
                                            for (let j = 0; j<stoPreTabData.length; j++) {
                                                for (let i = 0; i<tableCache.length; i++) {