agv 订单出库功能完善

zyx

2023-08-04 3f30983db5b3cd2b25cb215579501a2ef134883c

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

@@ -5,6 +5,7 @@
import com.core.common.Cools;
import com.zy.asrs.entity.AgvBasDevp;
import com.zy.asrs.entity.AgvWaitPakin;
import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.mapper.AgvBasDevpMapper;
import com.zy.asrs.service.AgvBasDevpService;
@@ -108,20 +109,36 @@
                AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
                BeanUtils.copyProperties(agvBasDevp, agvBasDevpDto);

                if (Cools.isEmpty(agvBasDevpDto.getBarcode())) {
//                if (Cools.isEmpty(agvBasDevpDto.getBarcode())) {
//                    return agvBasDevpDto;
//                }

                if("O".equals(agvBasDevpDto.getLocSts())){
                    return agvBasDevpDto;
                }

                AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
                        .eq("zpallet", agvBasDevpDto.getBarcode()));

                agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);

//              AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
//                        .eq("barcode", agvBasDevpDto.getBarcode()));
                AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                        .eq("barcode", agvBasDevpDto.getBarcode()));
                        .eq("loc_no", agvBasDevpDto.getDevNo())
                        .or().eq("source_loc_no",agvBasDevpDto.getDevNo()));

                agvBasDevpDto.setAgvWrkMast(agvWrkMast);

                if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
                    AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
                            .eq("zpallet", agvBasDevpDto.getBarcode()));

                    agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);

                    if(Cools.isEmpty(agvWaitPakin)){
                        AgvWrkDetl agvWrkDetl = agvWrkDetlService.selectOne(new EntityWrapper<AgvWrkDetl>().
                                eq("wrk_no",agvWrkMast.getWrkNo()));

                        agvBasDevpDto.setAgvWrkDetl(agvWrkDetl);
                    }
                }

                return agvBasDevpDto;

            }).collect(Collectors.toList());