#

zjj

2024-11-21 82f5a3c1fdcfcde25c20805feea64e5a3c315201

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

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.utils.OutStockInterceptUtil;
@@ -91,19 +92,19 @@
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", false));
                        }else if (locMast.getBay1() >=4 && locMast.getBay1()<=12){
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", true));
                        }else {
                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                    .eq("gro1", locMast.getGro1())
                                    .eq("crn_no", 7)
                                    .eq("lev1",locMast.getLocType1())
                                    .eq("loc_type1",locMast.getLocType1())
                                    .orderBy("bay1", false));
                        }
                        for (LocMast locMast1 : locMasts){
@@ -117,7 +118,14 @@
                                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                                            locDto.setStaNos(staNos);
                                            List<LocDto.staListDto> maps = new ArrayList<>();
                                            for (Integer staNo : staNos) {
                                                LocDto.staListDto staListDto = new LocDto.staListDto();
                                                staListDto.setStaNo(staNo);
                                                staListDto.setStaName(Utils.getStaName(staNo));
                                                maps.add(staListDto);
                                            }
                                            locDto.setStaNos(maps);
                                            locDtos.add(locDto);
                                            // 剩余待出数量递减
                                            issued = issued - locDetl.getAnfme();
@@ -135,9 +143,16 @@
                            LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                    issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                            List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                            locDto.setStaNos(staNos);
                            List<LocDto.staListDto> maps = new ArrayList<>();
                            for (Integer staNo : staNos) {
                                LocDto.staListDto staListDto = new LocDto.staListDto();
                                staListDto.setStaNo(staNo);
                                staListDto.setStaName(Utils.getStaName(staNo));
                                maps.add(staListDto);
                            }
                            locDto.setStaNos(maps);
                            locDtos.add(locDto);
                            exist.add(locDetl.getLocNo());
//                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减
                            issued = issued - locDetl.getAnfme();
                        }else {