11.6

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml

@@ -76,7 +76,7 @@
         from warehouse_info a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            a.address like concat('%',#{belongingPlace},'%')
+            a.address like concat('%',#{belongingPlace},'%') and a.isDelete !=1;
         </where>
     </select>
     <update id="updateBySidIsDelete">

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java

@@ -109,35 +109,9 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             qw.apply(StringUtils.isNotBlank(query.getEndTime()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')"
             );
         }
+        qw.ne("a.isDelete","1");
         List<ProjectDetailsVo> storeInfos = baseMapper.listQuery(qw);
         for (ProjectDetailsVo storeInfo : storeInfos) {
-//            List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
-//            if (warehouseInventories.size()!=0){
-//                List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
-//                        .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1"));
-//                if(list.size()!=0){
-//                    storeInfo.setSupplierName(list.get(0).getBillObjName());
-//                    List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
-//                            .eq("sourceBillSid",list.get(0).getSourceBillSid()));
-//                    for (PurchaseInventoryBillDetail detail : details) {
-//                        if(StringUtils.isBlank(storeInfo.getGoodsDetail())){
-//                            Double s=detail.getCount();
-//                            if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
-//                                storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-//                            }else{
-//                                storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-//                            }
-//                        }else{
-//                            Double s=detail.getCount();
-//                            if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
-//                                storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-//                            }else{
-//                                storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-//                            }
-//                        }
-//                    }
-//                }
-//            }
             if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
                 String []w=storeInfo.getLngAndLat().split(",");
                 storeInfo.setLatitude(w[1]);
@@ -208,6 +182,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         if(query.getSids().size()!=0){
             qw.in("a.sid",query.getSids());
         }
+        qw.ne("a.isDelete","1");
         IPage<ProjectDetailsVo> page = PagerUtil.queryToPage(pq);
         IPage<ProjectDetailsVo> pagging = baseMapper.listQuery1(page, qw);