From 75da80b237de79ff804888189a437fac920f5c0a Mon Sep 17 00:00:00 2001 From: siontion Date: Wed, 24 Jul 2024 10:13:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=87=BA=E5=BA=93=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E3=80=91=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/storage/StorageServiceImpl.java | 4 ++- .../storagemat/StorageMatServiceImpl.java | 28 ++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java index 28d049d5..365fe9ad 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java @@ -230,6 +230,7 @@ public class StorageServiceImpl implements StorageService { .setUnit(materialMapper.selectOne(MaterialDO::getCode,to.getProjectSubCode()).getUnit()) .setMatId(materialMapper.selectOne(MaterialDO::getCode,to.getProjectSubCode()).getId()) .setIsSend(0); + tplusStorageOutMapper.insert(tplusStorageOutDO); insertList.add(tplusStorageOutDO); }else{ tplusStorageOutDO.setStockId(updateObj.getId()) @@ -252,6 +253,7 @@ public class StorageServiceImpl implements StorageService { .setUnit(materialMapper.selectOne(MaterialDO::getCode,to.getProjectSubCode()).getUnit()) .setMatId(materialMapper.selectOne(MaterialDO::getCode,to.getProjectSubCode()).getId()) .setIsSend(0); + updateList.add(tplusStorageOutDO); } }); @@ -309,7 +311,7 @@ public class StorageServiceImpl implements StorageService { saveTplusStockInDate(updateObj,storageMatList,storageOutList.getList()); } if(CollUtil.isNotEmpty(insertList)) { - tplusStorageOutMapper.insertBatch(insertList); +// tplusStorageOutMapper.insertBatch(insertList); insertList.forEach(ino->{ TplusLastestStockDO tplusLastestStockDO = tplusLastestStockMapper.selectOne(TplusLastestStockDO::getInventoryCode,ino.getProductCode(), diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storagemat/StorageMatServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storagemat/StorageMatServiceImpl.java index d64db7ae..5ba8df1e 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storagemat/StorageMatServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storagemat/StorageMatServiceImpl.java @@ -1,17 +1,23 @@ package com.chanko.yunxi.mes.module.biz.service.storagemat; import cn.hutool.core.collection.CollUtil; +import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo.QueryCurrentStockResVO; import com.chanko.yunxi.mes.module.biz.controller.admin.storagemat.vo.StorageMatPageReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.storagemat.vo.StorageMatSaveReqVO; import com.chanko.yunxi.mes.module.biz.controller.admin.storagemat.vo.StorageMatValidRespVO; +import com.chanko.yunxi.mes.module.biz.dal.dataobject.tpluslasteststock.TplusLastestStockDO; import com.chanko.yunxi.mes.module.biz.dal.mysql.storagemat.StorageMatMapper; +import com.chanko.yunxi.mes.module.biz.dal.mysql.tpluslasteststock.TplusLastestStockMapper; import com.chanko.yunxi.mes.module.biz.manager.ChanjetManager; import com.google.common.collect.Maps; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; +import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; import com.chanko.yunxi.mes.module.biz.dal.dataobject.storagemat.StorageMatDO; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; @@ -34,6 +40,9 @@ public class StorageMatServiceImpl implements StorageMatService { @Resource private ChanjetManager chanjetManager; + @Resource + private TplusLastestStockMapper tplusLastestStockMapper; + @Override public Long createStorageMat(StorageMatSaveReqVO createReqVO) { // 插入 @@ -76,7 +85,24 @@ public class StorageMatServiceImpl implements StorageMatService { List storageMatDOList = storageMatMapper.selectMatByStorckID(pageReqVO.getStockId()); if(CollUtil.isNotEmpty(storageMatDOList)){ try { - chanjetManager.queryStockAndInject2(storageMatDOList, pageReqVO.getWhId()); +// chanjetManager.queryStockAndInject2(storageMatDOList, pageReqVO.getWhId()); + + List tplusLastestStockDOS = + tplusLastestStockMapper.selectList(new LambdaQueryWrapperX() + .eq(TplusLastestStockDO::getWarehouseId,pageReqVO.getWhId()) + .in(TplusLastestStockDO::getInventoryCode,storageMatDOList.stream().map(StorageMatDO::getProjectSubCode).collect(Collectors.toList()))); + //tplusLastestStockMapper.selectList(TplusLastestStockDO::getInventoryCode,storageMatDOList.stream().map(StorageMatDO::getProjectSubCode).collect(Collectors.toList()),TplusLastestStockDO::getWarehouseId,pageReqVO.getWhId()); + for (StorageMatDO aDo : storageMatDOList) { + List findDatas = + tplusLastestStockDOS.stream().filter(vo -> aDo.getProjectSubCode().equals(vo.getInventoryCode())).collect(Collectors.toList()); + if(CollUtil.isEmpty(findDatas)){ + aDo.setStockQuantity(new BigDecimal(0)); + }else{ + TplusLastestStockDO resVO = findDatas.get(0); + BigDecimal stockQuantity = new BigDecimal(resVO.getAvailableQuantity()); + aDo.setStockQuantity(stockQuantity); + } + } }catch (Exception e) { // do nothing }