From 958b12cccc9e0043eb0c6b9bb84ebdf554ebe1a1 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 03 六月 2021 11:21:22 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 62 +++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 7 deletions(-) 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..2d3a018 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 @@ -7,13 +7,13 @@ import com.zy.asrs.entity.MatCode; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.service.MatCodeService; +import com.zy.asrs.service.OutStockMainService; +import com.zy.asrs.service.OutStockService; import com.zy.asrs.service.WaitPakinService; import com.zy.asrs.utils.VersionUtils; import com.zy.common.service.erp.ErpService; import com.zy.common.service.erp.dto.InStockDto; -import com.zy.common.service.erp.entity.CPICMO; -import com.zy.common.service.erp.entity.InStockBillEntry; -import com.zy.common.service.erp.entity.M_item; +import com.zy.common.service.erp.entity.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; @@ -39,6 +39,10 @@ private MatCodeService matCodeService; @Autowired private WaitPakinService waitPakinService; + @Autowired + private OutStockMainService outStockMainService; + @Autowired + private OutStockService outStockService; private Map<Integer, M_item> itemMap = new HashMap<>(); @@ -109,7 +113,7 @@ /** * 鎴愬搧 */ -// @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/5 * * * * ? ") // @PostConstruct public void inCPICMOExecute(){ // List<M_item> item = erpService.getItem(); @@ -156,7 +160,7 @@ } } -// @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/5 * * * * ? ") public void syncMat(){ List<M_item> items = erpService.getItem(); for (M_item item : items) { @@ -166,11 +170,21 @@ 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()); @@ -178,6 +192,40 @@ } /** + * 鎴愬搧鍑哄簱-鍙戣揣閫氱煡鍗曡〃澶� + */ + @Scheduled(cron = "0/15 * * * * ? ") + public void syncOutStock(){ + List<OutStockBill> result = erpService.syncOutStock(); + for (Integer i = 0; i < result.size(); i++) { + OutStockBill main = outStockMainService.selectOne(new EntityWrapper<OutStockBill>().eq("FBrNo", result.get(i).getFBrNo()).and().eq("FInterID", result.get(i).getFInterID())); + if (null == main) { + if (!outStockMainService.insert(result.get(i))) { + log.info("鍑哄簱閫氱煡涓昏〃OutStockBill鍚屾澶辫触"); + }; + } else { + + } + } + } + + /** + * 鎴愬搧鍑哄簱-鍙戣揣閫氱煡鍗曡〃浣� + */ + @Scheduled(cron = "0/15 * * * * ? ") + public void syncOutStockDetail(){ + List<OutStockBillEntry> result = erpService.syncOutStockDetail(); + for (Integer i = 0; i < result.size(); i++) { + OutStockBillEntry main = outStockService.selectOne(new EntityWrapper<OutStockBillEntry>().eq("FInterID", result.get(i).getFInterID()).and().eq("FEntryID", result.get(i).getFEntryID())); + if (null == main) { + if (!outStockService.insert(result.get(i))) { + log.info("鍑哄簱閫氱煡鏄庣粏琛∣utStockBillEntry鍚屾澶辫触"); + }; + } + } + } + + /** * 鍘熸潗鏂欏嚭搴� */ // @Scheduled(cron = "0/3 * * * * ? ") -- Gitblit v1.9.1