添加移库接口 修改自动下发任务 添加条码入库申请

skyouc

4 天以前 7dd4ffa405be3d4aaf23b328b5db2b9d485a17d1

添加移库接口
修改自动下发任务
添加条码入库申请

 src/main/java/com/zy/api/controller/WcsApiController.java

@@ -6,6 +6,8 @@
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.param.CompleteParam;
import com.zy.asrs.service.MobileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@

    @Autowired
    private WcsApiService wcsApiService;
    @Autowired
    private MobileService mobileService;


    /**
@@ -68,6 +72,26 @@
        return wcsApiService.pubWrkToWcs(params);
    }


    @ManagerAuth(memo = "条码站入库申请")
    @RequestMapping("/cache/comb/pub")
    public R cacheCombPub(@RequestBody CompleteParam combParam) {
        if (Objects.isNull(combParam)) {
            return R.error("参数不能为空!!");
        }
        return wcsApiService.combInPub(combParam, 10031L);
    }

    @ManagerAuth(memo = "移库任务")
    @RequestMapping("/task/move")
    public R taskMove(@RequestBody CompleteParam combParam) {
        if (Objects.isNull(combParam)) {
            return R.error("参数不能为空!!");
        }
        return mobileService.taskMove(combParam, 10031L);
    }


    @ManagerAuth
    @ApiOperation("设备执行状态回写")
    @PostMapping("/openapi/report")

 src/main/java/com/zy/api/service/WcsApiService.java

@@ -3,6 +3,7 @@
import com.core.common.R;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.controller.params.WorkTaskParams;
import com.zy.asrs.entity.param.CompleteParam;

import java.util.Map;
import java.util.Set;
@@ -68,4 +69,12 @@
     * @return
     */
    R getStations(Map<String, String> params);

    /**
     * 条码站扫码入库申请
     * @param combParam
     * @param l
     * @return
     */
    R combInPub(CompleteParam combParam, long l);
}

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -12,6 +12,7 @@
import com.zy.api.entity.dto.LocMastDto;
import com.zy.api.service.WcsApiService;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CompleteParam;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.LocDetlServiceImpl;
import com.zy.asrs.service.impl.MatServiceImpl;
@@ -230,4 +231,15 @@
    public R getStations(Map<String, String> params) {
        return null;
    }

    /**
     * 条码站入库申请
     * @param combParam
     * @param l
     * @return
     */
    @Override
    public R combInPub(CompleteParam combParam, long l) {
        return null;
    }
}

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

@@ -363,7 +363,6 @@
        if (Objects.isNull(callAgvBackParam.getOrgSite())) {
            return R.error("参数不能为空!!");
        }
    
       return mobileService.agvCallback(callAgvBackParam, getUserId());
    }


 src/main/java/com/zy/asrs/entity/param/CompleteParam.java

@@ -16,6 +16,9 @@
    //站點
    private String sourceStaNo;

    //源库位
    private String sourceLocSta;

    //可用排
    private List<Integer> rowList;


 src/main/java/com/zy/asrs/service/MobileService.java

@@ -168,4 +168,12 @@
     * @return com.core.common.R
     */
    R agvCallback(AgvCallParams callAgvBackParam, Long userId);

    /**
     * 移库任务申请
     * @param combParam
     * @param l
     * @return
     */
    R taskMove(CompleteParam combParam, long l);
}

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

@@ -2579,6 +2579,22 @@
    }

    /**
     * 移库任务申请
     * @param combParam
     * @param userId
     * @return
     */
    @Override
    public R taskMove(CompleteParam combParam, long userId) {
//        /openapi/createLocMoveTask




        return null;
    }

    /**
     * 按优先级查找可用库位
     * 顺序：入库缓存区 -> SO区 -> EO区
     */

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -77,34 +77,34 @@


    /**
     * 任务自动下发
     * 任务自动下发出库任务
     *
     * @author Ryan
     * @date 2026/1/10 14:42
     */
    @Scheduled(cron = "0/15 * * * * ? ")
    private void autoPubTasks() {
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(11L)));
        if (wrkMasts.isEmpty()) {
            return;
        }
        Collections.shuffle(wrkMasts);
        wrkMasts.forEach(wrkMast -> {
            WorkTaskParams params = new WorkTaskParams();
            if (wrkMast.getIoType().equals(1)) {
                params.setType("in");
                params.setTaskNo(wrkMast.getWrkNo() + "")
                        .setLocNo(wrkMast.getLocNo())
                        .setBarcode(wrkMast.getBarcode())
                        .setTaskPri(wrkMast.getIoPri().intValue());
            } else {
//            if (wrkMast.getIoType().equals(1)) {
//                params.setType("in");
//                params.setTaskNo(wrkMast.getWrkNo() + "")
//                        .setLocNo(wrkMast.getLocNo())
//                        .setBarcode(wrkMast.getBarcode())
//                        .setTaskPri(wrkMast.getIoPri().intValue());
//            } else {
                params.setType("out")
                        .setTaskNo(wrkMast.getWrkNo() + "")
                        .setLocNo(wrkMast.getLocNo())
                        .setStaNo(wrkMast.getStaNo())
                        .setTaskPri(wrkMast.getIoPri().intValue());
                wcsApiService.pubWrkToWcs(params);
            }
//            }
        });
    }