更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -161,7 +161,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                                     }
                                     // 查询应余量
                                     WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                                            .eq("position_id", warehouseInOutInfo.getPositionId()).eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey()));
+                                            .eq("position_id", warehouseInOutInfo.getPositionId())
+                                            .eq("goods_name_key", warehouseInOutInfo.getGoodsNameKey())
+                                            .eq("delete_flag", NumberConstant.CONSTANT0));
                                     if (warehousePositionStorageInfo != null) {
                                         storage = String.valueOf(warehousePositionStorageInfo.getStorage());
                                     } else {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -33,9 +33,6 @@
         <if test="warehouseName != null and warehouseName != ''">
             AND warehouse_name= #{warehouseName}
         </if>
-        <if test="pcFlag != null and pcFlag != ''and pcFlag == '2'">
-            AND comp_id = #{compId}
-        </if>
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
@@ -138,9 +135,6 @@
         <if test="managementType != null and managementType != ''">
             AND management_type = #{managementType}
         </if>
-        <if test="pcFlag != null and pcFlag != ''and pcFlag == '2'">
-            AND comp_id = #{compId}
-        </if>
         <if test="customerPhone != null and customerPhone != ''">
             AND customer_phone = #{customerPhone}
         </if>