From db92e88a70a59437b48c9369cf1c46dba0ecb0a5 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期日, 15 十月 2023 13:25:33 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 3 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 2ce259c..0b38dcd 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,12 +1,29 @@ 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.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * erp浠诲姟鎺у埗鍣� @@ -18,10 +35,101 @@ @Autowired private ErpService erpService; + @Autowired + private TagService tagService; + @Autowired + private MatService matService; + @Autowired + private AllLocDetlService allLocDetlService; + @Autowired + private InventoryVarianceService inventoryVarianceService; - @Scheduled(cron = "0/30 * * * * ? ") + //@Scheduled(cron = "0/5 * * * * ? ") @Synchronized - public void syncMat() { + @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 + public void syncLocDetl(){ + + List<InventoryVariance> inventoryVariances = new ArrayList<>(); + + int pageSize = 500; + int pageNumber = 0; + while (true){ + List<WlzhVStRd> wlzhVStRds = erpService.selectPage(pageSize, pageNumber); + if(wlzhVStRds.size() < pageSize){ + break; + } + + //ERP搴撳瓨涓庣珛搴撳簱瀛樻瘮瀵� + compileStock(wlzhVStRds,inventoryVariances); + pageNumber ++; + + } + + inventoryVarianceService.insertBatch(inventoryVariances); + + } + + private void compileStock(List<WlzhVStRd> wlzhVStRds, List<InventoryVariance> inventoryVariances){ + wlzhVStRds.forEach(wlzhVStRd -> { + String matnr = wlzhVStRd.getCInvCode(); + String csocode = wlzhVStRd.getCsocode(); + String isoseq = wlzhVStRd.getIsoseq(); + Double iQuantity = wlzhVStRd.getIQuantity(); + + Double anfme = 0.0; + + List<AllLocDetl> allLocDetlList = allLocDetlService.getByMatnrAndCsocodeAndIsoseq(matnr, csocode, isoseq); + for(AllLocDetl allLocDetl : allLocDetlList){ + anfme += allLocDetl.getAnfme(); + } + + int compare = Double.compare(iQuantity, anfme); + if(compare != 0){ + InventoryVariance inventoryVarianceParam = new InventoryVariance(matnr,csocode,isoseq,iQuantity,anfme); + inventoryVariances.add(inventoryVarianceParam); + } + + }); + } + + } -- Gitblit v1.9.1