From fd435cf8df2be1c6f13f28c85a63747ee2465940 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 14 二月 2023 10:27:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 93 ++++++++++++++++++++--------------------------
1 files changed, 41 insertions(+), 52 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 94b508d..088dbb9 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -34,6 +34,8 @@
private Boolean erpEnabled;
@Value("${erp.useName.ip}")
private String ip;
+ @Value("${erp.enabledErpPrdt}")
+ private Boolean enabledErpPrdt;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -44,14 +46,14 @@
private MatService matService;
/**
- * 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂� 骞村墠
+ * 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂�
*/
@Scheduled(cron = "${erp.refreshtime}")
public void obtainPedt() {
- if (!erpEnabled) return;
- String sqlSelectPrdt = "select PRD_NO as prdNo,NAME as name,UT as ut,SPC as spc from PRDT where 1=1";
- String sqlUpDatePrdtOne = "update PRDT set STATUS=1 where PRD_NO=";
- String sqlUpDatePrdtTwo = "update PRDT set STATUS=2 where PRD_NO=";
+ if (!enabledErpPrdt) return;
+ String sqlSelectPrdt = "select prd_no as prdNo,name,ut,spc,status,type from ERP_PRDT where 1=1";
+ String sqlUpDatePrdtOne = "update ERP_PRDT set status=1 where prd_no=";
+ String sqlUpDatePrdtTwo = "update ERP_PRDT set status=2 ";
try {
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
@@ -59,31 +61,6 @@
if (prdts.size() > 0) {
for (Prdt prdt : prdts) {
Date date = new Date();
- Integer type = prdt.getType();
- Mat mat = matService.selectByMatnr(prdt.getPrdNo());
- if (Cools.isEmpty(mat)) {
- Mat matNew = new Mat();
- matNew.setTagId(tag.getId());
- matNew.setMatnr(prdt.getPrdNo());
- matNew.setMaktx(prdt.getName());
- matNew.setUnit(prdt.getUt());
- matNew.setSpecs(prdt.getSpc());
- matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setCreateTime(date);
- matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
- matNew.setUpdateTime(date);
- if (matService.insert(matNew)) {
-// erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
- } else {
-// erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佹坊鍔犲晢鍝佷俊鎭け璐ワ紒锛侊紒", false);
- }
- } else {
-// erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佸晢鍝佸凡瀛樺湪锛侊紒锛�", false);
- }
- /*Date date = new Date();
if (prdt.getStatus() == 0) {
Integer type = prdt.getType();
if (type == 1) {
@@ -101,14 +78,16 @@
matNew.setUpdateTime(date);
if (matService.insert(matNew)) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
+ callApiLogSave(prdt, "ERP_PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true);
} else {
- erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佹坊鍔犲晢鍝佷俊鎭け璐ワ紒锛侊紒", false);
+ erpSqlServer.update(sqlUpDatePrdtTwo +",Temp1='娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒'"
+ + "where 1=1 " +" and PRD_NO=" + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "ERP_PRDT", "娣诲姞ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
}
} else {
- erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佸晢鍝佸凡瀛樺湪锛侊紒锛�", false);
+ erpSqlServer.update(sqlUpDatePrdtTwo +",Temp1='鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佸晢鍝佸凡瀛樺湪锛侊紒锛�'"
+ + "where 1=1 " +" and PRD_NO=" + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "ERP_PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佸晢鍝佸凡瀛樺湪锛侊紒锛�", false);
}
} else if (type == 2) {
Mat mat = matService.selectByMatnr(prdt.getPrdNo());
@@ -118,10 +97,11 @@
mat.setSpecs(prdt.getSpc());
if (matService.updateById(mat)) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佷慨鏀瑰晢鍝佷俊鎭垚鍔燂紒", true);
+ callApiLogSave(prdt, "ERP_PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佷慨鏀瑰晢鍝佷俊鎭垚鍔燂紒", true);
} else {
- erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佷慨鏀瑰晢鍝佷俊鎭け璐ワ紒锛侊紒", false);
+ erpSqlServer.update(sqlUpDatePrdtTwo +",Temp1='鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佷慨鏀瑰晢鍝佷俊鎭け璐ワ紒锛侊紒'"
+ + "where 1=1 " +" and PRD_NO=" + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "ERP_PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佷慨鏀瑰晢鍝佷俊鎭け璐ワ紒锛侊紒", false);
}
}
} else if (type == 3) {
@@ -129,23 +109,28 @@
if (!Cools.isEmpty(mat)) {
if (matService.deleteById(mat.getId())) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭垚鍔燂紒", true);
+ callApiLogSave(prdt, "ERP_PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭垚鍔燂紒", true);
} else {
- erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
- callApiLogSave(prdt, "PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭け璐ワ紒", false);
+ erpSqlServer.update(sqlUpDatePrdtTwo +",Temp1='鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭け璐ワ紒'"
+ + "where 1=1 " +" and PRD_NO=" + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "ERP_PRDT", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭け璐ワ紒", false);
}
}
} else {
- callApiLogSave(prdt, "PRDT", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡鏈鐞嗭紒", false);
+ if (Cools.isEmpty(prdt.getTemp1()) && Cools.isEmpty(prdt.getTemp2()) && Cools.isEmpty(prdt.getTemp3())){
+ erpSqlServer.update(sqlUpDatePrdtTwo +",Temp1='鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛乼ype鐘舵�佸紓甯革紒锛侊紒'"
+ + "where 1=1 " +" and PRD_NO=" + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "ERP_PRDT", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡鏈鐞嗭紒", false);
+ }
}
- }*/ /*else if (prdt.getStatus() == 1) {
+ } else if (prdt.getStatus() == 1) {
HashMap<String, Object> condition = new HashMap<>();
- condition.put("PRD_NO", "'" + prdt.getPrdNo() + "'");
- condition.put("NAME", "'" + prdt.getName() + "'");
- condition.put("UT", "'" + prdt.getUt() + "'");
- condition.put("SPC", "'" + prdt.getSpc() + "'");
- condition.put("TYPE", "'" + prdt.getType() + "'");
- condition.put("STATUS", "'" + prdt.getStatus() + "'");
+ condition.put("prd_no", "'" + prdt.getPrdNo() + "'");
+ condition.put("name", "'" + prdt.getName() + "'");
+ condition.put("ut", "'" + prdt.getUt() + "'");
+ condition.put("spc", "'" + prdt.getSpc() + "'");
+ condition.put("type", "'" + prdt.getType() + "'");
+ condition.put("status", "'" + prdt.getStatus() + "'");
erpSqlServer.insert(PrdtBak.class, condition);
// callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鎴愬姛锛�", true);
@@ -154,13 +139,17 @@
erpSqlServer.delete(Prdt.class, condition2);
// callApiLogSave(prdt, "erp_prdt", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鍚庡垹闄ゆ垚鍔燂紒", true);
} else {
- callApiLogSave(prdt, "PRDT", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡鏈鐞嗭紒", false);
- }*/
+ if (Cools.isEmpty(prdt.getTemp1()) && Cools.isEmpty(prdt.getTemp2()) && Cools.isEmpty(prdt.getTemp3())){
+ erpSqlServer.update(sqlUpDatePrdtTwo +",Temp1='鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛乻tatus鐘舵�佸紓甯革紒锛侊紒'"
+ + "where 1=1 " +" and PRD_NO=" + "'" + prdt.getPrdNo() + "'");
+ callApiLogSave(prdt, "ERP_PRDT", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡鏈鐞嗭紒", false);
+ }
+ }
}
}
} catch (Exception e) {
Date date = new Date();
- log.error(date + ": 琛ㄥ悕锛歅RDT :" + e);
+ log.error(date + ": 琛ㄥ悕锛欵RP_PRDT :" + e);
}
}
--
Gitblit v1.9.1