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<StorageInventoryDO> 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<StorageInventoryDO> 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 @@
         <if test="matSpec != null and matSpec != ''">
             AND gh.mat_spec LIKE CONCAT('%', #{matSpec}, '%')
         </if>
+        <if test="noZero == 1 ">
+            AND gh.mat_rest != 0
+        </if>
     </where>
     ORDER BY gh.mat_code
     </select>
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 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
-                  <el-table-column prop="storageOkQty" min-width="120" align="center">
+                  <el-table-column prop="storageOkQty" align="center"  min-width="180" >
                     <template #header> <span class="hl-table_header">*</span>盘点数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty" class="mb-0px!">
@@ -148,9 +148,9 @@
 				    </el-form-item>
 				  </template>
 				</el-table-column> -->
-				 <el-table-column prop="onemoney" label="单价" min-width="120" align="center">
+				 <el-table-column prop="onemoney" label="单价"  align="center"  min-width="180" >
           				  <template #default="scope">
-				    <el-form-item :prop="`${scope.$index}.onemoney`"  class="mb-0px!" >
+				    <el-form-item :prop="`${scope.$index}.onemoney`" class="mb-0px!">
                    <el-input-number  v-model="scope.row.onemoney" :min="0"  :disabled="ctrView || ctrSave"/>
 				    </el-form-item>
 				  </template>