From c58ad9efcba82433d826c26ebdc73b619b1b9684 Mon Sep 17 00:00:00 2001 From: liaohechuan Date: Mon, 25 Nov 2024 17:25:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=88=E5=B7=A5=E5=BA=8F=E5=87=BA?= =?UTF-8?q?=E7=AB=99=EF=BC=89=EF=BC=9A=E8=B0=83=E7=94=A8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foreverwin/iep/MesCoreApp.java | 2 ++ ...aterialCompleteTransactionServiceImpl.java | 2 +- .../service/impl/OperationOutServiceImpl.java | 33 +++++++++---------- .../iep/wip/mapper/OperationOutMapper.java | 2 ++ .../mapper/wip/OperationOutMapper.xml | 18 ++++++++++ 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/mes-app/src/main/java/com/foreverwin/iep/MesCoreApp.java b/mes-app/src/main/java/com/foreverwin/iep/MesCoreApp.java index 7818f253..fda80d4f 100644 --- a/mes-app/src/main/java/com/foreverwin/iep/MesCoreApp.java +++ b/mes-app/src/main/java/com/foreverwin/iep/MesCoreApp.java @@ -4,6 +4,7 @@ import com.foreverwin.iep.dynamic.annotation.EnableDynamicRegister; import com.foreverwin.mom.common.feign.annotation.EnableMomFeignClients; import com.foreverwin.mom.common.security.annotation.EnableMomResourceServer; import com.foreverwin.mom.common.swagger.annotation.EnableMomSwagger2; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -21,6 +22,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableMomResourceServer @SpringBootApplication(scanBasePackages = {"com.foreverwin.mom", "com.foreverwin.iep","com.foreverwin.nlv", "cn.hutool.extra.spring"}) @EnableAsync +@MapperScan(basePackages={"com.foreverwin.**.mapper"}) public class MesCoreApp { public static void main(String[] args) { SpringApplication springApplication = new SpringApplication(MesCoreApp.class); diff --git a/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java b/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java index c3fcd1ef..46e8fec2 100644 --- a/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java +++ b/mes-core/src/main/java/com/foreverwin/iep/prd/service/impl/ZLotMaterialCompleteTransactionServiceImpl.java @@ -80,7 +80,7 @@ public class ZLotMaterialCompleteTransactionServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(); - queryWrapper.eq(WmsStorageLocation::getSite, site); - queryWrapper.eq(WmsStorageLocation::getWorkCenterBo, WorkCenter.genHandle(site, resultZLotMaterialCompleteTransaction.getWorkCenter())); - queryWrapper.eq(WmsStorageLocation::getFabNoBo, FabBasis.genHandle(site, resultZLotMaterialCompleteTransaction.getFabNo())); - List wmsStorageLocationList = wmsStorageLocationMapper.selectList(queryWrapper); - if (CollectionUtils.isNotEmpty(wmsStorageLocationList)) { - resultZLotMaterialCompleteTransaction.setStorageLocation(wmsStorageLocationList.get(0).getStorageLocation()); + List zLotMaterialCompleteTransactionList = baseMapper.readStorageLocationByFabNo(site, WorkCenter.genHandle(site, resultZLotMaterialCompleteTransaction.getWorkCenter()), FabBasis.genHandle(site, resultZLotMaterialCompleteTransaction.getFabNo())); + if (CollectionUtils.isNotEmpty(zLotMaterialCompleteTransactionList)) { + resultZLotMaterialCompleteTransaction.setStorageLocation(zLotMaterialCompleteTransactionList.get(0).getStorageLocation()); + resultZLotMaterialCompleteTransaction.setWarehouseCode(zLotMaterialCompleteTransactionList.get(0).getWarehouseCode()); + resultZLotMaterialCompleteTransaction.setStorageBin(zLotMaterialCompleteTransactionList.get(0).getStorageBin()); } else { // 有可能产线为空的情况 - wmsStorageLocationList = wmsStorageLocationMapper.selectList(Wrappers.lambdaQuery() - .eq(WmsStorageLocation::getSite, site) - .eq(WmsStorageLocation::getFabNoBo, FabBasis.genHandle(site, resultZLotMaterialCompleteTransaction.getFabNo())) - ); - if (CollectionUtils.isNotEmpty(wmsStorageLocationList)) { - resultZLotMaterialCompleteTransaction.setStorageLocation(wmsStorageLocationList.get(0).getStorageLocation()); + zLotMaterialCompleteTransactionList = baseMapper.readStorageLocationByFabNo(site, null, FabBasis.genHandle(site, resultZLotMaterialCompleteTransaction.getFabNo())); + if (CollectionUtils.isNotEmpty(zLotMaterialCompleteTransactionList)) { + resultZLotMaterialCompleteTransaction.setStorageLocation(zLotMaterialCompleteTransactionList.get(0).getStorageLocation()); + resultZLotMaterialCompleteTransaction.setWarehouseCode(zLotMaterialCompleteTransactionList.get(0).getWarehouseCode()); + resultZLotMaterialCompleteTransaction.setStorageBin(zLotMaterialCompleteTransactionList.get(0).getStorageBin()); } } } @@ -373,6 +369,9 @@ public class OperationOutServiceImpl extends ServiceImpl { String getWmsInventoryBo(@Param("site") String site, @Param("materialLot") String materialLot); void insertWmsInventoryLog(@Param("uuid") String uuid, @Param("site") String site, @Param("wmsInventoryBo") String wmsInventoryBo, @Param("nowLocalDateTime") String nowLocalDateTime, @Param("user") String user); + + List readStorageLocationByFabNo(@Param("site") String site, @Param("workCenterBo") String workCenterBo, @Param("fabNoBo") String fabNoBo); } diff --git a/mes-db/src/main/resources/mapper/wip/OperationOutMapper.xml b/mes-db/src/main/resources/mapper/wip/OperationOutMapper.xml index 3cb967db..ccb43c60 100644 --- a/mes-db/src/main/resources/mapper/wip/OperationOutMapper.xml +++ b/mes-db/src/main/resources/mapper/wip/OperationOutMapper.xml @@ -371,4 +371,22 @@ and wi.INVENTORY_ID = #{materialLot} and ROUND(wi.QTY_ON_HAND, 6) = 0 + + +