#1

lsh

2024-05-31 c22edcc5e29212dfa3e7b629c45ba00c30f310f8

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

@@ -13,6 +13,7 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -115,6 +116,7 @@
    @PostMapping("/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    @Transactional
    @Synchronized
    public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {

        //判断是否可以生成出库工作档
@@ -124,6 +126,13 @@
            if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) {
                return R.error(locDto.getLocNo()+"库位请选择出库站");
            }

            AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
            List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),agvLocMast.getFloor());

            if(!staNoList.contains(locDto.getAgvStaNo())){
                return R.error(locDto.getAgvStaNo()+"该站点已有出库任务，无法选择该站点出库");
            }
        }
        //如果所有库都没有库存，则返回
        for (LocDto locDto : locDtos) {