From eec672cc4ec17464b2a4d8f191b3d6368ebf8129 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 29 一月 2023 15:27:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 insertions(+), 17 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 168e85b..79f1b65 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -3,20 +3,13 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.zy.common.model.DetlDto;
+import com.zy.asrs.service.*;
import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.ErpDetTbBak;
-import com.zy.ints.entity.Prdt;
-import com.zy.ints.entity.PrdtBak;
import com.zy.ints.erp.ErpSqlServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +17,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -41,6 +34,8 @@
*/
@Value("${erp.enabled}")
private Boolean erpEnabled;
+ @Value("${erp.useName.ip}")
+ private String ip;
@Autowired
private ErpSqlServer erpSqlServer;
@Autowired
@@ -53,6 +48,8 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private ApiLogService apiLogService;
/**
* 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
@@ -74,6 +71,7 @@
Mat mat = matService.selectByMatnr(erpDetTb.getPrdNo());
if (Cools.isEmpty(mat)) {
erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'");
+ callApiLogSave(erpDetTb, "erp_det_tb", "鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒", false);
} else {
Order order = orderService.selectByNo(erpDetTb.getBillNo());
if (Cools.isEmpty(order)) {
@@ -118,7 +116,10 @@
if (!Cools.isEmpty(docType)) {
order.setDocType(docType.getDocId());
if (!orderService.insert(order)) {
- throw new CoolException("娣诲姞璁㈠崟涓绘。淇℃伅澶辫触锛侊紒锛�");
+ callApiLogSave(erpDetTb, "erp_det_tb", "璁㈠崟涓绘。娣诲姞澶辫触锛侊紒", false);
+ continue;
+ } else {
+ callApiLogSave(erpDetTb, "erp_det_tb", "璁㈠崟涓绘。娣诲姞鎴愬姛锛侊紒", true);
}
}
}
@@ -142,15 +143,19 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9999L);
orderDetl.setUpdateTime(now);
- if (orderDetlService.insert(orderDetl)){
+ orderDetl.setMemo(erpDetTb.getWh());
+ if (orderDetlService.insert(orderDetl)) {
erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'");
- }else {
+ callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹鎴愬姛锛侊紒", true);
+ } else {
erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'");
+ callApiLogSave(erpDetTb, "erp_det_tb", "ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false);
}
}
}
}
} else if (status == 1) {
+ String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now);
HashMap<String, Object> condition = new HashMap<>();
condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
condition.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
@@ -159,22 +164,25 @@
condition.put("qty", "'" + erpDetTb.getQty() + "'");
condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
condition.put("wh", "'" + erpDetTb.getWh() + "'");
- condition.put("billdate", "'" + erpDetTb.getBilldate() + "'");
+ condition.put("billdate", "'" + format + "'");
condition.put("status", "'" + erpDetTb.getStatus() + "'");
condition.put("temp1", "'" + erpDetTb.getTemp1() + "'");
condition.put("temp2", "'" + erpDetTb.getTemp2() + "'");
condition.put("temp3", "'" + erpDetTb.getTemp3() + "'");
erpSqlServer.insert(ErpDetTbBak.class, condition);
+// callApiLogSave(erpDetTb, "erp_det_tb_bak", "ERP涓嬪彂璁㈠崟澶囦唤鎴愬姛锛侊紒", true);
+
HashMap<String, String> condition2 = new HashMap<>();
- condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
+ condition2.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
condition2.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
- condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
+ condition2.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
erpSqlServer.delete(ErpDetTb.class, condition2);
- } else if (status == 2) {
+
+// callApiLogSave(erpDetTb, "erp_det_tb", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true);
} else {
-
+ callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
}
}
}
@@ -183,4 +191,10 @@
log.error(date + ": 琛ㄥ悕锛歟rp_det_tb :" + e);
}
}
+
+ public void callApiLogSave(ErpDetTb erpDetTb, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", tableName, "null", ip,
+ "璁㈠崟鍙凤細" + erpDetTb.getBillNo() + "銆佸搧鍙凤細" + erpDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpDetTb.getPrdMark() + "銆佺姸鎬侊細" + erpDetTb.getStatus$(),
+ response, bool);
+ }
}
--
Gitblit v1.9.1