From 9e50037f45269812b3f343de22c56db2fb9d89a1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 十二月 2024 15:47:26 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js | 2 +-
src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js | 14 ++------------
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 14 +++++++++++++-
src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html | 6 +++++-
4 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 63d1b96..879e668 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -121,8 +121,20 @@
@ManagerAuth
public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
String orderNo = inventoryCheckOrder.getOrderNo();
+ long time = new Date().getTime();
if (Cools.isEmpty(orderNo)) {
- return R.parse("鍗曟嵁缂栧彿涓嶈兘涓虹┖锛�" + orderNo);
+ switch (inventoryCheckOrder.getArea()){
+ case "鍫嗗灈鏈�":
+ orderNo = "DDJ"+time;
+ break;
+ case "鍥涘悜搴�":
+ orderNo = "SXK"+time;
+ break;
+ case "CTU":
+ orderNo = "CTU"+time;
+ break;
+ }
+ inventoryCheckOrder.setOrderNo(orderNo);
}
int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
diff --git a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js
index 00b6d21..0a5e1c8 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js
+++ b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheakOrderTable.js
@@ -42,7 +42,7 @@
// {type: 'numbers', title: '#'},
{field: 'createTime$', title: '鏃ユ湡'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'},
- {field: 'status', title: '鐘舵��', align: 'center'}
+ {field: 'status$', 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/static/js/inventoryCheckOrder/inventoryCheckOrder.js b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
index a4bfba5..f15b002 100644
--- a/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
+++ b/src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js
@@ -91,13 +91,7 @@
$('#showFormBtn').on('click', function () {
// 寮规鍐呭
var content = `
- <form class="layui-form" id="billForm" style="padding: 20px;">
- <div class="layui-form-item" style="margin-bottom: 20px;">
- <label class="layui-form-label" style="width: 80px; font-size: 14px; text-align: left">鍗曟嵁缂栧彿锛�</label>
- <div class="layui-input-block" style="margin-left: 110px;">
- <input type="text" id="billNumber" class="layui-input" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" style="height: 38px; font-size: 14px; padding: 0 15px; width: 100%;" required>
- </div>
- </div>
+ <form class="layui-form" id="billForm" style="padding: 20px;">
<div class="layui-form-item" style="margin-bottom: 20px;">
<label class="layui-form-label" style="width: 80px; font-size: 14px;">搴撳尯锛�</label>
<div class="layui-input-block" style="margin-left: 110px;">
@@ -129,11 +123,6 @@
var billNumber = $('#billNumber').val();
var warehouseArea = $('#warehouseArea').val();
- // 琛ㄥ崟楠岃瘉
- if (!billNumber) {
- layer.msg('璇疯緭鍏ュ崟鎹紪鍙�');
- return;
- }
// 鍙戦�� Ajax 璇锋眰鍒板悗绔�
$.ajax({
@@ -213,6 +202,7 @@
});
}
+
});
/* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
diff --git a/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html b/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
index ba16a75..5eb829d 100644
--- a/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
+++ b/src/main/webapp/views/inventoryCheckOrder/inventoryCheckOrder.html
@@ -81,7 +81,8 @@
<button class="layui-btn icon-btn" lay-filter="originTbReset" lay-submit>
<i class="layui-icon"></i>閲嶇疆
</button>
- <button id="showFormBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞</button>
+
+
</div>
</div>
</form>
@@ -150,6 +151,9 @@
<!-- </div>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="submitERP"><i class="layui-icon"></i>鎻愪氦ERP</button>-->
<button id="submitERP" class="layui-btn icon-btn btn-add" lay-event="submitERP"><i class="layui-icon"></i>鎻愪氦ERP</button>
+ <button id="showFormBtn" class="layui-btn icon-btn" lay-submit>
+ <i class="layui-icon"></i>娣诲姞鍗曟嵁
+ </button>
</script>
<!-- 琛屽伐鍏锋爮 -->
--
Gitblit v1.9.1