From 1d0a07dd8084ba2d4efb621c1597d4a17ac51ed7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十一月 2024 17:09:40 +0800
Subject: [PATCH] #出库站信息修改
---
src/main/webapp/views/order/out.html | 2 +-
src/main/java/com/zy/common/model/LocDto.java | 14 +++++++++++---
src/main/java/com/zy/asrs/controller/OutController.java | 19 +++++++++++++++++--
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index b91a344..aa78b58 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/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());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index ca099a3..5399cce 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/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();
}
}
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 0d7e344..4c8ff22 100644
--- a/src/main/webapp/views/order/out.html
+++ b/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>
--
Gitblit v1.9.1