From 8b470245dae34e0fa6e558a895865503ba6d99f4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 04 一月 2023 13:52:27 +0800
Subject: [PATCH] #中间表对接：优化，添加记录
---
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
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 3f3b7d3..66179df 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -3,8 +3,10 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Tag;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.TagService;
+import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.Prdt;
import com.zy.ints.entity.PrdtBak;
import com.zy.ints.erp.ErpSqlServer;
@@ -31,6 +33,10 @@
*/
@Value("${erp.enabled}")
private Boolean erpEnabled;
+ @Value("${erp.useName.ip}")
+ private String ip;
+ @Autowired
+ private ApiLogService apiLogService;
@Autowired
private TagService tagService;
@Autowired
@@ -71,8 +77,10 @@
matNew.setUpdateTime(date);
if (matService.insert(matNew)) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
} else {
erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佹坊鍔犲晢鍝佷俊鎭け璐ワ紒锛侊紒", false);
}
}
} else if (type == 2) {
@@ -83,8 +91,10 @@
mat.setSpecs(prdt.getSpc());
if (matService.updateById(mat)) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佷慨鏀瑰晢鍝佷俊鎭垚鍔燂紒", true);
} else {
erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佷慨鏀瑰晢鍝佷俊鎭け璐ワ紒锛侊紒", false);
}
}
} else if (type == 3) {
@@ -92,12 +102,14 @@
if (!Cools.isEmpty(mat)) {
if (matService.deleteById(mat.getId())) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭垚鍔燂紒", true);
} else {
erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭け璐ワ紒", false);
}
}
} else {
-
+ callApiLogSave(prdt, "erp_prdt", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡锛�", false);
}
} else if (prdt.getStatus() == 1) {
HashMap<String, Object> condition = new HashMap<>();
@@ -108,21 +120,26 @@
condition.put("type", "'" + prdt.getType() + "'");
condition.put("status", "'" + prdt.getStatus() + "'");
erpSqlServer.insert(PrdtBak.class, condition);
+ callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鎴愬姛锛�", true);
HashMap<String, String> condition2 = new HashMap<>();
condition2.put("prd_no", "'" + prdt.getPrdNo() + "'");
erpSqlServer.delete(Prdt.class, condition2);
- } else if (prdt.getStatus() == 2) {
-
- } else {
-
+ callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鍚庡垹闄ゆ垚鍔燂紒", true);
+ } else{
+ callApiLogSave(prdt, "erp_prdt", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡锛�", false);
}
-
}
}
} catch (Exception e) {
-
+ Date date = new Date();
+ log.error(date + ": 琛ㄥ悕锛歟rp_prdt :" + e);
}
+ }
+ public void callApiLogSave(Prdt prdt, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", "涓棿琛細" + tableName, "null", ip,
+ "鍝佸彿锛�" + prdt.getPrdNo() + "鍝佸悕锛�" + prdt.getName() + "绫诲瀷锛�" + prdt.getType() + "鐘舵�侊細" + prdt.getStatus(),
+ response, bool);
}
}
--
Gitblit v1.9.1