#

ytfl

6 天以前 1ea41a22eadfb3eef3d434bef7d2efff3bae331c

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

@@ -7,6 +7,7 @@
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -90,6 +91,20 @@
                        locDto.setFrozen(locDetl.getFrozen());
                        locDto.setFrozenLoc(locMast.getFrozen());
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 107);
                        locDto.setBrand(orderDetl.getBrand());
                        locDto.setStandby1(orderDetl.getStandby1());
                        locDto.setStandby2(orderDetl.getStandby2());
                        locDto.setStandby3(orderDetl.getStandby3());
                        locDto.setBoxType1(orderDetl.getBoxType1());
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());

                        //计算辅单位
                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                        locDto.setWeight(weight);

                        locDto.setUnit(orderDetl.getUnit());

                        locDto.setStaNos(staNos);
                        locDtos.add(locDto);
                        // 剩余待出数量递减
@@ -100,6 +115,20 @@
                }
                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                    locDto.setBrand(orderDetl.getBrand());

                    locDto.setStandby1(orderDetl.getStandby1());
                    locDto.setStandby2(orderDetl.getStandby2());
                    locDto.setStandby3(orderDetl.getStandby3());
                    locDto.setBoxType1(orderDetl.getBoxType1());
                    locDto.setBoxType2(orderDetl.getBoxType2());
                    locDto.setBoxType3(orderDetl.getBoxType3());

                    //计算辅单位
                    Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                    locDto.setWeight(weight);

                    locDto.setUnit(orderDetl.getUnit());
                    locDto.setLack(Boolean.TRUE);
                    locDtos.add(locDto);
                }
@@ -119,8 +148,23 @@
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                        locDto.setFrozen(locDetl.getFrozen());
                        locDto.setFrozenLoc(locMast.getFrozen());
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                        int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
                        List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
                        locDto.setStaNos(staNos);
                        locDto.setBrand(orderDetl.getBrand());

                        locDto.setStandby1(orderDetl.getStandby1());
                        locDto.setStandby2(orderDetl.getStandby2());
                        locDto.setStandby3(orderDetl.getStandby3());
                        locDto.setBoxType1(orderDetl.getBoxType1());
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());
                        locDto.setUnit(orderDetl.getUnit());

                        //计算辅单位
                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                        locDto.setWeight(weight);

                        locDtos.add(locDto);
                        exist.add(locDetl.getLocNo());
                        // 剩余待出数量递减
@@ -131,6 +175,19 @@
                }
                if (issued > 0) {
                    LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                    locDto.setBrand(orderDetl.getBrand());
                    locDto.setStandby1(orderDetl.getStandby1());
                    locDto.setStandby2(orderDetl.getStandby2());
                    locDto.setStandby3(orderDetl.getStandby3());
                    locDto.setBoxType1(orderDetl.getBoxType1());
                    locDto.setBoxType2(orderDetl.getBoxType2());
                    locDto.setBoxType3(orderDetl.getBoxType3());

                    //计算辅单位
                    Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());
                    locDto.setWeight(weight);

                    locDto.setUnit(orderDetl.getUnit());
                    locDto.setLack(Boolean.TRUE);
                    locDtos.add(locDto);
                }