#增加生产日期，到期日期字段，增加库存明细超期库存检索

lty

4 天以前 9d38f2354b3a7267a2486d937bb7d256fcb949c1

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

@@ -28,6 +28,8 @@
import java.util.List;
import java.util.stream.Collectors;

import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;

/**
 * Created by vincent on 2020/10/30
 */
@@ -278,6 +280,8 @@
            WrkDetl wrkDetl = new WrkDetl();
            BeanUtils.copyProperties(waitPakin, wrkDetl);
            wrkDetl.setZpallet(barcode);
            wrkDetl.setProddate(waitPakin.getProddate());
            wrkDetl.setDeadline(waitPakin.getDeadline());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
@@ -633,7 +637,8 @@
            currentContainerMap = new HashMap<>();
        }

        String containerCode = param.getContainerCode();
        String containerCode = param.getContainerCode().split(";")[0];

        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
        }
@@ -651,19 +656,22 @@
            //查询旧容器的工作档
            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
            if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
                //发送容器立场请求，完成工作档
                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
                agvWrkMastList.add(agvWrkMast);
                try {
                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
                    if(code == 0){
                        //将工作党状态改为容器离场
                        agvWrkMast.setWrkSts(206L);
                        agvWrkMastService.updateById(agvWrkMast);
                    }
                } catch (IOException e) {
                    log.error(e.getMessage());
                }
                //将工作党状态改为容器离场
                agvWrkMast.setWrkSts(206L);
                agvWrkMastService.updateById(agvWrkMast);
//                //发送容器立场请求，完成工作档
//                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
//                agvWrkMastList.add(agvWrkMast);
//                try {
//                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
//                    if(code == 0){
//                        //将工作党状态改为容器离场
//                        agvWrkMast.setWrkSts(206L);
//                        agvWrkMastService.updateById(agvWrkMast);
//                    }
//                } catch (IOException e) {
//                    log.error(e.getMessage());
//                }
            }
        }

@@ -689,7 +697,7 @@
        if(!Cools.isEmpty(agvWrkMast)){
            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

            for (AgvWrkDetl agvWrkDetl : AgvWrkDetlList){
            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
                agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
                if(agvWrkMast.getIoType() == 103){
                    //寻找是否有相同物料的工作档明细，并返回数量之和
@@ -708,16 +716,21 @@
                }
            };


            return R.ok(agvWrkDetlList).add(agvWrkMast);
            agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
            agvBasDevpDto.setAgvWrkMast(agvWrkMast);
        }
        //查找该容器的入库通知档
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
        if(!Cools.isEmpty(agvWaitPakinList)){
            return R.ok(agvWaitPakinList);
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
        }

        return R.error("没有该容器的出库、拣料、入库信息等");
        System.out.println("currentContainerMap: " + currentContainerMap);


        System.out.println("agvBasDevpDto: " + agvBasDevpDto);

        return R.ok(agvBasDevpDto);
    }

    private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {