From 1a0409e260b79b030f79a4fad995078a7f1b945c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 26 五月 2025 07:59:44 +0800
Subject: [PATCH] 13
---
src/main/webapp/views/orderPakin/order.html | 9 +++-
src/main/webapp/static/js/orderPakout/order.js | 18 +++++++++
src/main/java/com/zy/nc/task/PlanOrderTask.java | 2
src/main/webapp/static/js/order/order.js | 18 +++++++++
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 4 ++
src/main/webapp/static/js/orderPakin/order.js | 18 +++++++++
src/main/webapp/views/orderPakout/order.html | 9 +++-
src/main/webapp/views/order/order.html | 7 ++-
8 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 5ebd329..c7d116d 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -178,7 +178,7 @@
public void execute4() {
List<String> strings = nccCkPddWmsService.selectPdd();
for (String string : strings) {
- List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
+ List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG",4).eq("hdr", 0).eq("bdr", 0));
ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
if (!returnT.isSuccess()) {
for (NccCkPddWms wms : wmsFlag) {
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 6a304ed..200498f 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -24,6 +24,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Service
@@ -229,7 +230,10 @@
inventoryCheckOrderDetlService.insert(checkOrderDetl);
nccScZkmxbWms.setWmsFlag(1);
param.setOrderNo(nccScZkmxbWms.getVbillcode());
+ param.setCreateBy(nccScZkmxbWms.getPdrmc());
+
}
+ param.setCreateTime(new Date());
param.setStatus("1");
inventoryCheckOrderService.insert(param);
nccCkPddWmsService.updateBatchById(wmsFlag);
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e9d8a02..11e6d0e 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -79,6 +79,13 @@
insTb.reload({where: data.field, page: {curr: 1}});
});
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
// 娣诲姞
$("#orderAddBtn").click(function () {
showEditModel();
@@ -546,3 +553,14 @@
,range: true
});
});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ insTb.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 7b6bfb8..6e95f20 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -79,6 +79,13 @@
insTb.reload({where: data.field, page: {curr: 1}});
});
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
// 娣诲姞
$("#orderAddBtn").click(function () {
showEditModel();
@@ -546,3 +553,14 @@
,range: true
});
});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ insTb.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index d6fb9aa..15b289a 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -79,6 +79,13 @@
insTb.reload({where: data.field, page: {curr: 1}});
});
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
// 娣诲姞
$("#orderAddBtn").click(function () {
showEditModel();
@@ -546,3 +553,14 @@
,range: true
});
});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ insTb.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index dd8a05d..42323ba 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -46,7 +46,7 @@
<div class="layui-card">
<div class="layui-card-body">
<!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
- <div class="layui-form toolbar">
+ <div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline mr0">
@@ -78,6 +78,9 @@
<div class="layui-inline">
<button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
</button>
<button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
</button>
@@ -319,7 +322,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/order/order.js?v=3" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js?v=6" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index b45c3e1..460cef8 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -46,7 +46,7 @@
<div class="layui-card">
<div class="layui-card-body">
<!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
- <div class="layui-form toolbar">
+ <div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline mr0">
@@ -79,8 +79,11 @@
<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 class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <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>
@@ -319,7 +322,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/orderPakin/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/orderPakin/order.js?v=1" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index ef24a81..295c65d 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -46,7 +46,7 @@
<div class="layui-card">
<div class="layui-card-body">
<!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
- <div class="layui-form toolbar">
+ <div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline mr0">
@@ -79,8 +79,11 @@
<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 class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <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>
@@ -319,7 +322,7 @@
<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/orderPakout/order.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/orderPakout/order.js?v=2" charset="utf-8"></script>
<script type="text/template" id="docTypeTpl">
<option value="">閫夋嫨绫诲瀷</option>
--
Gitblit v1.9.1