From eaaebd54f2cb44db7fac828dad6599fd8a662a4b Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 01 八月 2024 10:51:41 +0800
Subject: [PATCH] 添加显示字段
---
src/main/webapp/static/js/order/out.js | 1 +
src/main/webapp/views/order/out.html | 2 +-
src/main/java/com/zy/common/model/LocDto.java | 2 ++
src/main/java/com/zy/asrs/controller/OutController.java | 2 ++
4 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e3a151b..4a08e72 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -93,6 +93,7 @@
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
locDto.setStaNos(staNos);
locDtos.add(locDto);
+ locDto.setModel(locDetl.getModel());
exist.add(locDetl.getLocNo());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
@@ -104,6 +105,7 @@
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
locDto.setLack(Boolean.TRUE);
+ locDto.setModel(orderDetl.getModel());
locDtos.add(locDto);
}
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 767c372..ccf3f00 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -19,6 +19,8 @@
private String batch;
+ private String model;
+
private String orderNo;
private Double anfme;
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 2c1b1c1..21a809b 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -160,6 +160,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+ {field: 'model', title: '浜у搧缂栧彿', align: 'center'},
{field: 'batch', title: '鎵规', align: 'center'},
{field: 'sPgNO', title: '娲惧伐鍗曞彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 0d7e344..eccb8dc 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -277,7 +277,7 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/out.js?t=1" charset="utf-8"></script>
<!--<script type="text/template" id="takeSiteSelectTemplate">-->
<!-- {{#each data}}-->
<!-- <option value="{{siteId}}">{{desc}}</option>-->
--
Gitblit v1.9.1