From 2cb1126682fb9dfaa1b20a1f03e95004b59b61a9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 08:54:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 1 +
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 19 +++++++++++++++----
src/main/java/com/zy/common/service/erp/entity/M_item.java | 2 ++
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 1 +
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index f81876e..8c9d5b5 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -45,6 +45,7 @@
else {
wrapper.orderBy("modi_time", false);
}
+ wrapper.isNotNull("zpallet");
return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index b3c6034..d6a6f70 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -80,6 +80,7 @@
matCode.setMatNo(item.getMnumber()); // 鐗╂枡缂栧彿
matCode.setMatName(item.getMname()); // 鐗╂枡鎻忚堪
matCode.setStr2(item.getMmodel()); // 鐗╂枡绫诲埆
+ matCode.setStr2(item.getMtypename());
}
// excel ----------------------------------------------------------------------
diff --git a/src/main/java/com/zy/common/service/erp/entity/M_item.java b/src/main/java/com/zy/common/service/erp/entity/M_item.java
index bee01bb..219570e 100644
--- a/src/main/java/com/zy/common/service/erp/entity/M_item.java
+++ b/src/main/java/com/zy/common/service/erp/entity/M_item.java
@@ -20,4 +20,6 @@
// 绫诲埆
private String Mmodel;
+ private String Mtypename;
+
}
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index ebd0150..de22ee3 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -109,7 +109,7 @@
/**
* 鎴愬搧
*/
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
// @PostConstruct
public void inCPICMOExecute(){
// List<M_item> item = erpService.getItem();
@@ -156,7 +156,7 @@
}
}
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
public void syncMat(){
List<M_item> items = erpService.getItem();
for (M_item item : items) {
@@ -166,17 +166,28 @@
VersionUtils.setMatCode(matCode, item);
matCode.setAppeTime(new Date());
matCode.setModiTime(new Date());
- matCodeService.insert(matCode);
+ boolean insert = matCodeService.insert(matCode);
+ if (insert) {
+ log.info("=====>> 鏂板鐗╂枡鎴愬姛 锛� {}", JSON.toJSONString(item));
+ } else {
+ log.error("=====>> 鏂板鐗╂枡澶辫触锛侊紒锛� 锛� {}", JSON.toJSONString(item));
+ }
} else {
VersionUtils.setMatCode(matCode, item);
matCode.setModiTime(new Date());
- matCodeService.updateById(matCode);
+ boolean b = matCodeService.updateById(matCode);
+ if (b) {
+ log.info("=====>> 鏇存柊鐗╂枡鎴愬姛 锛� {}", JSON.toJSONString(item));
+ } else {
+ log.error("=====>> 鏇存柊鐗╂枡澶辫触锛侊紒锛� 锛� {}", JSON.toJSONString(item));
+ }
}
// 鏇存柊瀹屼箣鍚庡垹闄�
erpService.deleteItem(item.getMnumber());
}
}
+
/**
* 鍘熸潗鏂欏嚭搴�
*/
--
Gitblit v1.9.1