#出库站信息修改

zjj

2024-11-12 1d0a07dd8084ba2d4efb621c1597d4a17ac51ed7

#出库站信息修改

 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;
@@ -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,7 +143,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);
                            exist.add(locDetl.getLocNo());
                            // 剩余待出数量递减

 src/main/java/com/zy/common/model/LocDto.java

@@ -4,6 +4,7 @@
import lombok.Data;

import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2022/3/28
@@ -25,9 +26,10 @@

    private boolean lack = false;

    private List<Integer> staNos;
    private List<staListDto> staNos;

    private Integer staNo;
    private String staName;

    public LocDto() {
    }
@@ -55,15 +57,21 @@
        this.orderNo = orderNo;
        this.anfme = anfme;
    }
    @Data
    public static class staListDto{
        private Integer staNo;
        private String staName;
    }

    public String getTitle() {
        return this.matnr + "（" + this.maktx + "）";
    }

    public void setStaNos(List<Integer> staNos) {
    public void setStaNos(List<staListDto> staNos) {
        this.staNos = staNos;
        if (!Cools.isEmpty(staNos)) {
            this.staNo = staNos.get(0);
            this.staNo = staNos.get(0).getStaNo();
            this.staName = staNos.get(0).getStaName();
        }
    }


 src/main/webapp/views/order/out.html

@@ -177,7 +177,7 @@
        <select class="order-sta-select" lay-filter="tbBasicTbStaNos">
            {{#if (d.staNos!=null) {}}
            {{# for(let i=0; i<d.staNos.length; i++) { }}
            <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
            <option value="{{d.staNos[i].staNo}}">{{d.staNos[i].staName}}</option>
            {{# } }}
            {{# } }}
        </select>