From b802f67f272e5d14b8d3b9205b55e75e31fb5524 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期四, 25 七月 2024 20:47:20 +0800
Subject: [PATCH] 前端添加查询条件
---
src/main/webapp/views/locDetl/locDetl.html | 2 +-
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 2 +-
src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java | 1 -
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 2 +-
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 2 --
src/main/resources/mapper/LocDetlMapper.xml | 26 ++++++++++++++++++--------
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 2 +-
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 3 ++-
src/main/webapp/views/report/viewWorkIn.html | 2 +-
src/main/resources/application.yml | 10 +++++-----
src/main/webapp/views/report/viewWorkCountIn.html | 2 +-
11 files changed, 31 insertions(+), 23 deletions(-)
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 e24843d..987aae1 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -29,12 +29,10 @@
@Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
- //log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
for (InCancelTB in : ins) {
- System.out.println(in);
com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
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 253a3d2..139c9b7 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -42,7 +42,6 @@
List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
if (!inHeds.isEmpty()) {
for (InHedTB inHed : inHeds) {
- System.out.println(inHed);
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
@@ -51,6 +50,7 @@
hedAndDet.put("det", inDetTBS);
boolean result = inMS.createInOrder(inHed, inDetTBS);
if (result) {
+ log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
move(hedAndDet);
} else {
String sql = "UPDATE erp_InHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
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 9349421..703e185 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -37,13 +37,14 @@
List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
if (itemTBS != null && itemTBS.size() > 0) {
for (ItemTB itemTB : itemTBS) {
- System.out.println(itemTB);
+ log.info("鏂板鐗╂枡鎴愬姛,{}", itemTB);
//00浠ｈ〃鏂板
if (itemTB.getFlag().equals("00")) {
erpItemService.addToMainDatabase(itemTB);
}
//22浠ｈ〃鍒犻櫎
if (itemTB.getFlag().equals("22")) {
+ log.info("鍒犻櫎鐗╂枡鎴愬姛,{}", itemTB);
erpItemService.deleteFromMainDatabase(itemTB);
}
moveToBak(itemTB);
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 3240bdb..7a01aa3 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
@@ -35,7 +35,6 @@
String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='涓壃浜屾湡'";
List<OutCancelTB> ins = erpSqlServer.select(sqlInCancelTB, OutCancelTB.class);
for (OutCancelTB in : ins) {
- System.out.println(in);
com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
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 c1de539..e803553 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -42,7 +42,6 @@
List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
if (!inHeds.isEmpty()) {
for (OutHedTB inHed : inHeds) {
- System.out.println(inHed);
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
@@ -51,6 +50,7 @@
hedAndDet.put("det", inDetTBS);
boolean result = inMS.createOutOrder(inHed, inDetTBS);
if (result) {
+ log.info("鍑哄簱鍗曟嵁鎴愬姛,{}", inHed.getBillNo());
move(hedAndDet);
} else {
String sql = "UPDATE erp_OutHedTB SET Temp3 = 鈥榝ault鈥� WHERE BillNo = '" + inHed.getBillNo() + "'";
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 16a3003..5f91455 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -102,12 +102,12 @@
lcid: 2052
#ERP鎺ュ彛
- #enabled: true
- enabled: false
+ enabled: true
+ #enabled: false
#鏌ョ湅ERP涓棿琛ㄩ棿闅�
refreshtime: 0/5 * * * * ?
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.1.147:1433;databasename=XDLinkLK
- username: sa
- password: sa@123
+ url: jdbc:sqlserver://192.168.1.147:1800;databasename=XDLinkLK
+ username: XGMLK
+ password: xunda0413
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 9feb053..79d0924 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -109,6 +109,16 @@
<if test="specs!=null and specs!='' ">
and a.specs like '%' + #{specs} + '%'
</if>
+
+ <if test="sPgNO!=null and sPgNO!='' ">
+ and a.pg_no like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo!=null and outOrderNo!='' ">
+ and a.out_order_no like '%' + #{outOrderNo} + '%'
+ </if>
+ <if test="zpallet!=null and zpallet!='' ">
+ and a.zpallet like '%' + #{zpallet} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
@@ -427,22 +437,22 @@
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}
+ AND matnr like '%' + #{matnr}+ '%'
</if>
<if test="maktx != null and maktx != ''">
- AND maktx like #{maktx}
+ AND maktx like '%' + #{maktx}+ '%'
</if>
<if test="specs != null and specs != ''">
- AND specs like #{specs}
+ AND specs like '%' + #{specs}+ '%'
</if>
- <if test="sPgNO != null">
- AND pgNO like #{sPgNO}
+ <if test="sPgNO != null and sPgNO != ''">
+ AND pgNO like '%' + #{sPgNO} + '%'
</if>
- <if test="outOrderNo != null">
- AND outOrderNo like #{outOrderNo}
+ <if test="outOrderNo != null and outOrderNo != ''">
+ AND outOrderNo like '%' + #{outOrderNo} + '%'
</if>
) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 18c05a2..3a96c09 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -35,7 +35,7 @@
{field: 'matnr', title:'浜у搧缂栫爜', align: 'center'},
{field: 'specs', title:'浜у搧瑙勬牸', align: 'center'},
{field: 'maktx', title:'浜у搧鍚嶇О', align: 'center'},
- {field: 'sPgNO', title:'娲惧伐鍗曞彿', align: 'center'},
+ {field: 'pgNO', title:'娲惧伐鍗曞彿', align: 'center'},
{field: 'outOrderNo', title:'璁㈠崟鍙�', align: 'center'},
{field: 'batch', title:'鎵规', align: 'center'}
]],
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 0f78a29..7c1c555 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -46,7 +46,7 @@
</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">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 290px">
</div>
</div>
<!-- <div class="layui-inline">-->
diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html
index 0b183b8..30d9236 100644
--- a/src/main/webapp/views/report/viewWorkCountIn.html
+++ b/src/main/webapp/views/report/viewWorkCountIn.html
@@ -25,7 +25,7 @@
</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">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 290px">
</div>
</div>
<div id="data-search-btn" class="layui-btn-container layui-form-item">
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index ba0d4a0..482532c 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -51,7 +51,7 @@
</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">
+ <input class="layui-input layui-laydate-range" name="query_date" type="text" placeholder="鍏ュ簱璧峰鏃堕棿 - 鍏ュ簱缁堟鏃堕棿" autocomplete="off" style="width: 290px">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1