#

Junjie

2023-10-13 46f0363f58916147427ace4ca1fadfc9e4decc36

 src/main/java/com/zy/common/web/WcsController.java

@@ -11,15 +11,15 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -105,11 +105,12 @@
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        locTypeDto.setLocType1(param.getLocType1());

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats);
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -131,7 +132,7 @@
     * 全板入库
     */
    @Transactional
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats) {
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<Mat> mats, List<WaitPakin> waitPakins) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
@@ -166,11 +167,13 @@
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        for (Mat mat : mats) {
            // 生成工作档明细
        waitPakins.forEach(waitPakin -> {
            Mat mat = matService.selectByMatnr(waitPakin.getMatnr());
            if(Cools.isEmpty(mat)){
                throw new CoolException(waitPakin.getMatnr() + "该物料号无法查询，请查看物料信息是否存在");
            }
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(mat);
            wrkDetl.setAnfme(mat.getWeight());
            BeanUtils.copyProperties(waitPakin,wrkDetl);
            wrkDetl.setZpallet(barcode);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
@@ -179,7 +182,21 @@
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }
        });
//        for (Mat mat : mats) {
//            // 生成工作档明细
//            WrkDetl wrkDetl = new WrkDetl();
//            wrkDetl.sync(mat);
//            wrkDetl.setAnfme(mat.getWeight());
//            wrkDetl.setZpallet(barcode);
//            wrkDetl.setWrkNo(wrkMast.getWrkNo());
//            wrkDetl.setIoTime(wrkMast.getIoTime());
//            wrkDetl.setAppeTime(now);
//            wrkDetl.setModiTime(now);
//            if (!wrkDetlService.insert(wrkDetl)) {
//                throw new CoolException("保存工作明细失败");
//            }
//        }

//        // 更新入库通知档 ioStatus ===>> Y
//        Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
@@ -281,4 +298,15 @@
        return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 库位号， 堆垛机，目标站
    }

    /*
    四项库往AGV补货，wcs调用此接口
     */
    @PostMapping("/replenishment")
    @ResponseBody
    public R replenishment(@RequestBody ReplenishmentParam param){


        return R.ok();
    }

}