From 14aa8a9a4369fe0dc23ea8abfaab10caea78c9e7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 31 八月 2023 15:03:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 12 +-----------
src/main/webapp/views/mat/mat.html | 20 +++++++++++++++++---
src/main/webapp/static/js/order/order.js | 10 ++--------
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 936ebe1..e1ec863 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -169,14 +169,7 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- if (Cools.isEmpty(orderDetl.getOwner())){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ヨ揣涓荤紪鍙�");
- }else {
- LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
- if (Cools.isEmpty(locOwner)){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ュ瓨鍦ㄧ殑璐т富缂栧彿锛堟暣鏁帮級");
- }
- }
+
if (orderDetl.getBatch() == null) {
orderDetl.setBatch("");
}
@@ -197,9 +190,6 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- if(orderDetl.getPayment() == null){
- orderDetl.setPayment(1);
- }
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 0f33af4..232a262 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -192,8 +192,7 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'owner$', title: '璐т富', width: 160},
- {field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
+
// {field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
@@ -271,12 +270,7 @@
return false;
}
}
- for (let xi = 0; xi < nList.length; xi++) {
- if (nList[xi].owner <= 0){
- layer.msg('璐т富缂栧彿璇锋煡鐪嬭揣涓绘。妗�', {icon: 2});
- return false;
- }
- }
+
layer.load(2);
$.ajax({
url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 8aee13d..866f09e 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -193,9 +193,16 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">閰嶇疆</label>
+ <label class="layui-form-label">搴撻緞涓婇檺</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
+ <input name="inventoryAgeMax" placeholder="璇疯緭鍏ュ簱榫勪笂闄�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撳瓨涓婇檺</label>
+ <div class="layui-input-block">
+ <input name="inventoryMax" placeholder="璇疯緭鍏ュ簱瀛樹笂闄�" class="layui-input">
</div>
</div>
@@ -226,7 +233,7 @@
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+ <input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
</div>
</div>
@@ -237,6 +244,13 @@
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撳瓨涓嬮檺</label>
+ <div class="layui-input-block">
+ <input name="inventoryMin" placeholder="璇疯緭鍏ュ簱瀛樹笅闄�" class="layui-input">
+ </div>
+ </div>
+
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">鍗曠姣涢噸</label>-->
<!-- <div class="layui-input-block">-->
--
Gitblit v1.9.1