From a740e5dfd94871f23b9ef859d0b552ade6790fff Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 04 一月 2023 16:11:24 +0800
Subject: [PATCH] #ERP对接优化
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 4 ++--
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 4 ++--
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java | 10 +++++-----
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 4 ++--
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
index 0f45745..9a11f89 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -171,7 +171,7 @@
condition.put("temp3", "'" + erpDetTb.getTemp3() + "'");
erpSqlServer.insert(ErpDetTbBak.class, condition);
- callApiLogSave(erpDetTb, "erp_det_tb_bak", "ERP涓嬪彂璁㈠崟澶囦唤鎴愬姛锛侊紒", true);
+// callApiLogSave(erpDetTb, "erp_det_tb_bak", "ERP涓嬪彂璁㈠崟澶囦唤鎴愬姛锛侊紒", true);
HashMap<String, String> condition2 = new HashMap<>();
condition2.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
@@ -179,7 +179,7 @@
condition2.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
erpSqlServer.delete(ErpDetTb.class, condition2);
- callApiLogSave(erpDetTb, "erp_det_tb", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true);
+// callApiLogSave(erpDetTb, "erp_det_tb", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true);
} else {
callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
index 3b6cb09..ce02456 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
@@ -61,7 +61,7 @@
param.put("matnr", erpLk.getPrdNo());
param.put("batch", erpLk.getPrdMark());
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(1, 10, param, LocDetl.class));
- if (stockStatis.getSize() == 1) {
+ if (stockStatis.getRecords().size() == 1) {
for (LocDetl locDetl : stockStatis.getRecords()) {
if (locDetl.getAnfme() - erpLk.getQty() == 0) {
erpSqlServer.update(sqlUpDateErpLkOne + "'" + erpLk.getPrdNo() + "' and prd_mark='" + erpLk.getPrdMark() + "'");
@@ -86,16 +86,16 @@
condition.put("temp3", "'" + erpLk.getTemp3() + "'");
erpSqlServer.insert(ErpLkBak.class, condition);
- callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤鎴愬姛锛侊紒锛佹�婚噺涓猴細" + erpLk.getQty(), true);
+// callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤鎴愬姛锛侊紒锛佹�婚噺涓猴細" + erpLk.getQty(), true);
HashMap<String, String> condition2 = new HashMap<>();
condition2.put("prd_no", "'" + erpLk.getPrdNo() + "'");
- condition2.put("prd_mark", "'" + erpLk.getPrdNo() + "'");
+ condition2.put("prd_mark", "'" + erpLk.getPrdMark() + "'");
erpSqlServer.delete(ErpLk.class, condition2);
- callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛侊紒鎬婚噺涓猴細" + erpLk.getQty(), true);
+// callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛侊紒鎬婚噺涓猴細" + erpLk.getQty(), true);
- }else {
+ } else {
callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮瀛樺湪寮傚父鏁版嵁鏈鐞嗭紒锛侊紒", false);
}
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
index b7f653f..911362f 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -122,12 +122,12 @@
condition.put("type", "'" + prdt.getType() + "'");
condition.put("status", "'" + prdt.getStatus() + "'");
erpSqlServer.insert(PrdtBak.class, condition);
- callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鎴愬姛锛�", true);
+// callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鎴愬姛锛�", true);
HashMap<String, String> condition2 = new HashMap<>();
condition2.put("prd_no", "'" + prdt.getPrdNo() + "'");
erpSqlServer.delete(Prdt.class, condition2);
- callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鍚庡垹闄ゆ垚鍔燂紒", true);
+// callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鍚庡垹闄ゆ垚鍔燂紒", true);
} else {
callApiLogSave(prdt, "erp_prdt", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡鏈鐞嗭紒", false);
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
index 9e29300..5e840c8 100644
--- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -110,7 +110,7 @@
}
//淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗�
if (orderDetlService.addToLogTable(orderDetl)) {
- callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｆ垚鍔燂紒", true);
+// callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗ｆ垚鍔燂紒", true);
//鍒犻櫎璁㈠崟鏄庣粏
orderDetlService.deleteById(orderDetl.getId());
callApiLogSaveOrderDetl(orderDetl, "璁㈠崟鏄庣粏妗ｄ繚瀛樺悗鍒犻櫎鎴愬姛锛�", true);
@@ -118,7 +118,7 @@
}
//淇濆瓨璁㈠崟鍘嗗彶妗�
if (orderService.addToLogTable(order)) {
- callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｆ垚鍔燂紒锛侊紒", true);
+// callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｆ垚鍔燂紒锛侊紒", true);
//鍒犻櫎瀹岀粨璁㈠崟
orderService.deleteById(order.getId());
callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗ｅ悗鍒犻櫎瀹岀粨璁㈠崟鎴愬姛锛侊紒锛�", true);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ff0437d..310366a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -103,6 +103,9 @@
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
</if>
+ <if test="batch!=null and batch!='' ">
+ and a.batch like '%' + #{batch} + '%'
+ </if>
</sql>
<select id="getStockOutPage" resultMap="BaseResultMap">
--
Gitblit v1.9.1