From 90f1bff060e0ddca05e9a8e4f2f841d1c6c0a574 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 07 十一月 2025 12:57:17 +0800
Subject: [PATCH] 手动添加单据时区分单据类型
---
src/main/webapp/views/orderPakin/order.html | 4 +-
src/main/java/com/zy/asrs/controller/DocTypeController.java | 38 +++++++++++++++++++
src/main/webapp/views/orderPakout/order.html | 4 +-
src/main/webapp/views/order/order.html | 16 ++++----
4 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index e069350..5d43cb6 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -119,6 +119,44 @@
return R.ok(result);
}
+ // 鍙煡鍏ュ簱鍗曟嵁
+ @RequestMapping(value = "/docTypeQueryIn/auth")
+ @ManagerAuth
+ public R queryIn(String condition) {
+ EntityWrapper<DocType> wrapper = new EntityWrapper<>();
+ wrapper.like("doc_name", condition);
+ wrapper.eq("status", 1);
+ wrapper.eq("pakin", 1);
+ Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (DocType docType : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", docType.getDocId());
+ map.put("value", docType.getDocName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ // 鍙煡鍑哄簱鍗曟嵁
+ @RequestMapping(value = "/docTypeQueryOut/auth")
+ @ManagerAuth
+ public R queryOut(String condition) {
+ EntityWrapper<DocType> wrapper = new EntityWrapper<>();
+ wrapper.like("doc_name", condition);
+ wrapper.eq("status", 1);
+ wrapper.eq("pakout", 1);
+ Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (DocType docType : page.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", docType.getDocId());
+ map.put("value", docType.getDocName());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
@RequestMapping(value = "/docType/check/column/auth")
@ManagerAuth
public R query(@RequestBody JSONObject param) {
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 3e88192..ab58881 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -79,20 +79,20 @@
<button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
- </button>
+<!-- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞-->
+<!-- </button>-->
</div>
</div>
</div>
<table id="order" lay-filter="order"></table>
</div>
</div>
- <div class="layui-card">
- <div class="layui-card-body">
- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
- </div>
- </div>
+<!-- <div class="layui-card">-->
+<!-- <div class="layui-card-body">-->
+<!-- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��-->
+<!-- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index 5b15330..c6945d0 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -150,8 +150,8 @@
<input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
<input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="docTypeQueryInBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="docTypeQueryInBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index 7584f2e..4f3577d 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -150,8 +150,8 @@
<input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
<input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
<div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <input class="cool-auto-complete-window-input" data-key="docTypeQueryOutBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="docTypeQueryOutBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
</select>
</div>
</div>
--
Gitblit v1.9.1