From 5bd4cd1d16d7ba8cf8a296809790c765d1c40914 Mon Sep 17 00:00:00 2001 From: Ledo Date: Sun, 6 Jul 2025 11:26:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8D=E5=86=8D=E8=81=94?= =?UTF-8?q?=E6=9F=A5=E7=89=A9=E6=96=99=E5=9F=BA=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/storagecheck/StorageCheckServiceImpl.java | 9 +++++++-- .../storageinventory/StorageInventoryServiceImpl.java | 5 +++-- .../mapper/storageinventory/StorageInventoryMapper.xml | 3 +++ .../src/views/heli/storagecheck/checkdetail.vue | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java index 3d1173e..6df44f3 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java @@ -177,7 +177,12 @@ public class StorageCheckServiceImpl implements StorageCheckService { BigDecimal bigDecimal = new BigDecimal(storageMatDO.getOnemoney()); storageInventoryDO.setPrice(bigDecimal); } - storageInventoryMapper.insertOrUpdate(storageInventoryDO); + if (storageInventoryDO.getId() != null){ + storageInventoryMapper.updateById(storageInventoryDO); + }else{ + storageInventoryMapper.insert(storageInventoryDO); + } + } else { //不然就是出库 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -194,7 +199,7 @@ public class StorageCheckServiceImpl implements StorageCheckService { BigDecimal bigDecimal = new BigDecimal(storageMatDO.getOnemoney()); storageInventoryDO.setPrice(bigDecimal); } - storageInventoryMapper.insertOrUpdate(storageInventoryDO); + storageInventoryMapper.updateById(storageInventoryDO); } // 插入库存日志表 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java index 2b30fad..53ba83d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storageinventory/StorageInventoryServiceImpl.java @@ -83,11 +83,12 @@ public class StorageInventoryServiceImpl implements StorageInventoryService { public List getStorageNowList(StorageInventoryPageReqVO queryReqVO) { if(queryReqVO.getNoZero().equals(1)){ // 根据仓库id排除库存为o的物料 - return storageInventoryMapper.selectNoZero(queryReqVO); + return storageInventoryMapper.selectNowList(queryReqVO); }else{ // 筛选全部的实时库存数据，包含未分配仓库的物料信息和已分配仓库的物料信息 if(queryReqVO.getSelectAll() == 1){ - return storageInventoryMapper.selectNowListAll(queryReqVO); +// return storageInventoryMapper.selectNowListAll(queryReqVO); + return storageInventoryMapper.selectNowList(queryReqVO); }else{ return storageInventoryMapper.selectNowList(queryReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml index d75275e..19d74a0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storageinventory/StorageInventoryMapper.xml @@ -65,6 +65,9 @@ AND gh.mat_spec LIKE CONCAT('%', #{matSpec}, '%') + + AND gh.mat_rest != 0 + ORDER BY gh.mat_code diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue index 529f9f1..e935704 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue @@ -131,7 +131,7 @@ - + --> - +