From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期六, 29 三月 2025 15:52:09 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 65 ++++---------------------------- 1 files changed, 8 insertions(+), 57 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 0b38dcd..9296f87 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 @@ -1,28 +1,19 @@ package com.zy.common.service.erp.task; -import com.core.common.Cools; -import com.core.common.DateUtils; -import com.core.exception.CoolException; import com.zy.asrs.entity.AllLocDetl; import com.zy.asrs.entity.InventoryVariance; -import com.zy.asrs.entity.Mat; -import com.zy.asrs.entity.Tag; import com.zy.asrs.service.AllLocDetlService; import com.zy.asrs.service.InventoryVarianceService; import com.zy.asrs.service.MatService; import com.zy.asrs.service.TagService; import com.zy.asrs.task.AbstractHandler; import com.zy.common.service.erp.ErpService; -import com.zy.common.service.erp.entity.Goods; import com.zy.common.service.erp.entity.WlzhVStRd; -import lombok.Synchronized; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -44,55 +35,17 @@ @Autowired private InventoryVarianceService inventoryVarianceService; - //@Scheduled(cron = "0/5 * * * * ? ") - @Synchronized - @Transactional - public synchronized void syncMat() { - Tag top = tagService.getTop(); - List<Goods> goods = erpService.selectGoods(0); - Date now = new Date(); - if (!Cools.isEmpty(goods)) { - for (Goods good : goods) { - Mat mat = matService.selectByMatnr(good.getMaterialNO()); - if (mat == null) { - mat = new Mat(); - mat.setTagId(top.getId()); - mat.setMatnr(good.getMaterialNO()); -// mat.setMaktx(good.getBarCode()); - mat.setSpecs(good.getProdSpec()); - mat.setModel(good.getBatch()); - mat.setWeight(good.getNWT()); - mat.setUnits(good.getNumOfBobbins()==null?null:good.getNumOfBobbins().doubleValue()); - mat.setManuDate(good.getProdDate()); - mat.setCreateTime(now); - mat.setSku(good.getLocation()); - if (!Cools.isEmpty(good.getLastUpdatedDate())) { - mat.setUpdateTime(DateUtils.convert(good.getLastUpdatedDate().substring(0, 19))); - } - - if (!matService.insert(mat)) { - throw new CoolException(good.getBarCode() + "鍟嗗搧鍚屾澶辫触"); - } - } - int state = 1; - if (!erpService.updateStateForGoods(good.getBarCode(), state)) { - throw new CoolException(good.getBarCode() + "鍟嗗搧淇敼State涓�"+state+"澶辫触"); - } - } - } - } - - //@Scheduled(cron = "0/5 * * * * ? ") - @Synchronized - @Transactional + //@Scheduled(cron = "0 0 2 * * ? ") public void syncLocDetl(){ + log.info("搴撳瓨宸紓淇℃伅娓呴櫎"); + inventoryVarianceService.deleteAll(); - List<InventoryVariance> inventoryVariances = new ArrayList<>(); - + log.info("涓嶦RP姣斿寮�濮�"); int pageSize = 500; int pageNumber = 0; while (true){ + List<InventoryVariance> inventoryVariances = new ArrayList<>(); List<WlzhVStRd> wlzhVStRds = erpService.selectPage(pageSize, pageNumber); if(wlzhVStRds.size() < pageSize){ break; @@ -101,19 +54,17 @@ //ERP搴撳瓨涓庣珛搴撳簱瀛樻瘮瀵� compileStock(wlzhVStRds,inventoryVariances); pageNumber ++; - + inventoryVarianceService.insertBatch(inventoryVariances); } - - inventoryVarianceService.insertBatch(inventoryVariances); } private void compileStock(List<WlzhVStRd> wlzhVStRds, List<InventoryVariance> inventoryVariances){ wlzhVStRds.forEach(wlzhVStRd -> { - String matnr = wlzhVStRd.getCInvCode(); + String matnr = wlzhVStRd.getCinvcode(); String csocode = wlzhVStRd.getCsocode(); String isoseq = wlzhVStRd.getIsoseq(); - Double iQuantity = wlzhVStRd.getIQuantity(); + Double iQuantity = wlzhVStRd.getIquantity(); Double anfme = 0.0; -- Gitblit v1.9.1