From 09b04dd475fffad1d38cecf946cd09b6698b0938 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 25 七月 2024 14:40:18 +0800
Subject: [PATCH] 需求
---
src/main/webapp/views/locDetl/locDetl.html | 15 +++++
src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java | 2
src/main/java/com/zy/asrs/controller/LocDetlController.java | 8 ++
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 5 +
src/main/resources/mapper/ViewWorkInMapper.xml | 6 ++
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 15 +++++
src/main/resources/mapper/LocDetlMapper.xml | 46 +++++++++++----
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 2
src/main/webapp/views/report/viewWorkIn.html | 10 +++
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 2
src/main/webapp/static/js/locDetl/locDetl.js | 6 +
src/main/webapp/views/waitPakin/waitPakin_detail.html | 2
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 2
src/main/webapp/views/report/viewWorkOut.html | 10 +++
src/main/java/com/zy/asrs/entity/StockStatisDTO.java | 4 +
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 16 +++++
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 2
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 2
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 4 +
src/main/resources/application.yml | 2
20 files changed, 139 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index a202a28..f7a0365 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -111,6 +111,8 @@
// param.remove("row");
// }
// }
+ Object query_date = param.get("query_date");
+ param.remove("query_date");
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
@@ -119,6 +121,12 @@
// wrapper.and()
// .where("loc_no like '" +row +"%'");
// }
+ if (query_date!=null){
+ if (query_date.toString().contains(" - ")) {
+ String[] dates = query_date.toString().split(" - ");
+ wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]);
+ }
+ }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
index 32d597d..ff3381e 100644
--- a/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
+++ b/src/main/java/com/zy/asrs/entity/StockStatisDTO.java
@@ -13,4 +13,8 @@
private int erpQty;
private String itemBatch;
private String specs;
+
+ private String pgNo;
+ private String outOrderNo;
+ private String batch;
}
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index a4947ff..58187d0 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -155,6 +155,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ private String outOrderNo;
+
+ private String sPgNO;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modi_user);
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
index fee4625..e24843d 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -29,7 +29,7 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
- log.info("InCancelScheduler寮�濮嬩簡");
+ //log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
index 34dc211..253a3d2 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -36,7 +36,7 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InHedTBScheduler() {
- log.info("InHedTBScheduler寮�濮嬩簡");
+ //log.info("InHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'";
List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
index 5d526de..9349421 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -31,7 +31,7 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void ItemScheduler() {
- log.info("ItemScheduler寮�濮嬩簡");
+ //log.info("ItemScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlItemTB = "select * from erp_ItemTB where LKName='涓壃浜屾湡'";
List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
index 9c154eb..3240bdb 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
@@ -30,7 +30,7 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
- log.info("InCancelScheduler寮�濮嬩簡");
+ //log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='涓壃浜屾湡'";
List<OutCancelTB> ins = erpSqlServer.select(sqlInCancelTB, OutCancelTB.class);
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index ad54500..c1de539 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -36,7 +36,7 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void OutHedTBScheduler() {
- log.info("OutHedTBScheduler寮�濮嬩簡");
+ //log.info("OutHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡'";
List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index a7de595..69dfab0 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -47,7 +47,7 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void pakinOrderComplete() {
- log.info("寮�濮嬪叆搴撴洿鏂板畬鎴愬洖鎶�");
+ //log.info("寮�濮嬪叆搴撴洿鏂板畬鎴愬洖鎶�");
// 鎵�鏈夎鍗�
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
DocType docType;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f5c83fc..5259bcd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -108,6 +108,6 @@
refreshtime: 0/5 * * * * ?
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.1.147:1433;databasename=XDLinkLK2
+ url: jdbc:sqlserver://192.168.1.147:1433;databasename=XDLinkLK
username: sa
password: sa@123
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e7bd9f2..9feb053 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -413,12 +413,42 @@
<id column="asrsQty" property="lkQty" />
<id column="erpQty" property="erpQty" />
+ <id column="pgNo" property="pgNo" />
+ <id column="outOrderNo" property="outOrderNo" />
+ <id column="batch" property="batch" />
+
</resultMap>
<select id="asrsAndErpList" resultMap="stockStatisDTO">
SELECT * FROM(
SELECT ROW_NUMBER ( ) OVER ( ORDER BY d.matnr ) AS row, * FROM (
SELECT * FROM asr_show_diff WHERE 1 = 1
+ <if test="different != null and different == 1 ">
+ and asrsQty != erpQty
+ </if>
+ <if test="different != null and different == 0 ">
+ and asrsQty = erpQty
+ </if>
+ <if test="matnr != null and matnr != ''">
+ AND matnr like #{matnr}
+ </if>
+ <if test="maktx != null and maktx != ''">
+ AND maktx like #{maktx}
+ </if>
+ <if test="specs != null and specs != ''">
+ AND specs like #{specs}
+ </if>
+ <if test="sPgNO != null">
+ AND pgNO like #{sPgNO}
+ </if>
+ <if test="outOrderNo != null">
+ AND outOrderNo like #{outOrderNo}
+ </if>
+ ) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+ <select id="asrsAndErpCount" resultType="java.lang.Long">
+ SELECT count(*) FROM asr_show_diff WHERE 1 = 1
<if test="different != null and different == 1 ">
and asrsQty != erpQty
</if>
@@ -434,19 +464,11 @@
<if test="specs != null">
AND specs like #{specs}
</if>
- ) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
-
- <select id="asrsAndErpCount" resultType="java.lang.Long">
- SELECT count(*) FROM asr_show_diff WHERE 1 = 1 and asrsQty != erpQty
- <if test="matnr != null">
- AND matnr like #{matnr}
+ <if test="sPgNO != null">
+ AND pgNO like #{sPgNO}
</if>
- <if test="maktx != null">
- AND maktx like #{maktx}
- </if>
- <if test="specs != null">
- AND specs like #{specs}
+ <if test="outOrderNo != null">
+ AND outOrderNo like #{outOrderNo}
</if>
</select>
</mapper>
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 0f5d0cd..6340944 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -48,6 +48,12 @@
<if test="specs != null and specs != ''">
and specs like concat('%',#{specs},'%')
</if>
+ <if test="outOrderNo != null and outOrderNo != ''">
+ and out_order_no like concat('%',#{outOrderNo},'%')
+ </if>
+ <if test="sPgNO != null and sPgNO != ''">
+ and pg_no like concat('%',#{sPgNO},'%')
+ </if>
</sql>
<sql id="viewWorkOutConditionSql">
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 90e8841..1beb9e2 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -454,7 +454,11 @@
clearFormVal($('#search-box'));
tableReload(false);
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
// 鏃堕棿閫夋嫨鍣�
layDate.render({
elem: '#modiTime\\$',
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index d1adefa..18c05a2 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -34,7 +34,10 @@
{field: 'erpQty', title:'ERP鏁伴噺', align: 'center', width:150},
{field: 'matnr', title:'浜у搧缂栫爜', align: 'center'},
{field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
- {field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'}
+ {field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
+ {field: 'sPgNO', title:'娲惧伐鍗曞彿', align: 'center'},
+ {field: 'outOrderNo', title:'璁㈠崟鍙�', align: 'center'},
+ {field: 'batch', title:'鎵规', align: 'center'}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 174bb0f..0f78a29 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -34,6 +34,21 @@
<input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="pg_no" placeholder="娲惧伐鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="out_order_no" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index 6cbd00d..28f68bc 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -32,6 +32,21 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input name="different" type="radio" value="0" title="鏄剧ず鍏ㄩ儴" checked>
<input name="different" type="radio" value="1" title="鏄剧ず宸紓">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 0e71897..6be55da 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -92,6 +92,22 @@
<input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 0636317..ba0d4a0 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -54,6 +54,16 @@
<input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 7e8a106..df9f05b 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -54,6 +54,16 @@
<input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="sPgNO" placeholder="娲惧伐鍗曞彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="outOrderNo" placeholder="鎴愬搧璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
diff --git a/src/main/webapp/views/waitPakin/waitPakin_detail.html b/src/main/webapp/views/waitPakin/waitPakin_detail.html
index d419c9d..8a8e32f 100644
--- a/src/main/webapp/views/waitPakin/waitPakin_detail.html
+++ b/src/main/webapp/views/waitPakin/waitPakin_detail.html
@@ -64,7 +64,7 @@
<div class="layui-input-inline">
<input id="status" class="layui-input" type="text">
</div>
- </div>
+ </div>aitPakin/list
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">澶囥��銆�娉細</label>
<div class="layui-input-inline">
--
Gitblit v1.9.1