From e38cf917b19b91bf6c8f07c70fb7bb391e1e80c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 十二月 2024 13:10:44 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/orderTablePakout.js | 5 +++--
src/main/webapp/views/orderPakout/out.html | 9 +++++++++
src/main/webapp/static/js/orderPakout/out.js | 1 +
src/main/java/com/zy/common/model/LocDto.java | 20 ++++++++++++++++++++
src/main/java/com/zy/asrs/controller/OutController.java | 11 +++++++++++
5 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 4713989..4be0c77 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -74,6 +74,7 @@
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ locDto.setFrozen(locDetl.getFrozen());
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
locDto.setStaNos(staNos);
locDtos.add(locDto);
@@ -99,6 +100,16 @@
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
+ List<LocDto> locDtoArrayList = new ArrayList<>();
+ for (LocDto locDto : locDtos){
+ if (locDto.getFrozen()!=1){
+ locDtoArrayList.add(locDto);
+ }
+ }
+ locDtos = locDtoArrayList;
+ if (Cools.isEmpty(locDtos)) {
+ return R.parse(BaseRes.PARAM);
+ }
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index ca099a3..fd543b4 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -22,6 +23,13 @@
private String orderNo;
private Double anfme;
+
+ /**
+ * 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
+ */
+ private Integer frozen;
+
+// private Integer frozen$;
private boolean lack = false;
@@ -67,4 +75,16 @@
}
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "鏈喕缁�";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "鏈喕缁�";
+ }
+ }
+
}
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index a308540..b6ccc03 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -162,6 +162,7 @@
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
+ {field: 'frozen$', title: '鍐荤粨', align: 'center', width: 90, templet: '#locFrozen'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
{type: 'checkbox', merge: ['locNo']},
]],
diff --git a/src/main/webapp/static/js/orderTablePakout.js b/src/main/webapp/static/js/orderTablePakout.js
index 3541aec..f7a4b63 100644
--- a/src/main/webapp/static/js/orderTablePakout.js
+++ b/src/main/webapp/static/js/orderTablePakout.js
@@ -40,8 +40,9 @@
defaultToolbar: [],
cols: [[
// {type: 'numbers', title: '#'},
- {field: 'orderTime', title: '鏃ユ湡'},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'}
+ {field: 'orderTime', title: '鏃ユ湡', width: 160},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center', width: 155},
+ {field: 'docType$', title: '鍗曟嵁绫诲瀷', align: 'center'}
]],
done: function (res, curr, count) {
$('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
diff --git a/src/main/webapp/views/orderPakout/out.html b/src/main/webapp/views/orderPakout/out.html
index db2ebc4..42c7f1a 100644
--- a/src/main/webapp/views/orderPakout/out.html
+++ b/src/main/webapp/views/orderPakout/out.html
@@ -201,6 +201,15 @@
{{# } }}
</script>
+<script type="text/html" id="locFrozen">
+ <span name="frozen"
+ {{# if( d.lack === false){ }}
+ class="layui-badge layui-badge-green" >{{d.frozen$}}</span>
+ {{# } else { }}
+ class="layui-badge layui-badge-red" >鏈煡</span>
+ {{# } }}
+</script>
+
<!-- 琛屾牱寮� -->
<script type="text/html" id="orderNoTpl">
<span name="orderNo" class="layui-badge layui-badge-gray">{{d.orderNo}}</span>
--
Gitblit v1.9.1