1

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

@@ -824,7 +824,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("status_flag", "1")
                     .eq("deliver_type", "2")
                     .eq("delete_flag", "0")
-                    .orderBy("update_date", false));cumulant
+                    .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                         .eq("contract_id", contractManagementInfo.getId()));
@@ -1277,9 +1277,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 Map<String, Object> pageView = new HashMap<>();
                 pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
                 pageView.put("compId", warehouseBaseInfo.getCompId());
-                // 查询质检信息包括已删除的
+                pageView.put("serviceManagementType","3");
+                // 查询收购质检信息包括已删除的
                 Integer dataCount = baseMapper.getCountByCondition(pageView);
+                Map<String, Object> pageView1 = new HashMap<>();
+                pageView1.put("warehouseName", warehouseBaseInfo.getWarehouseName());
+                pageView1.put("compId", warehouseBaseInfo.getCompId());
+                pageView1.put("serviceManagementType","1");
+                // 查询贸易质检信息包括已删除的
+                Integer dataCount1 = baseMapper.getCountByCondition(pageView1);
                 warehouseBaseInfo.setCount(dataCount);
+                warehouseBaseInfo.setTradeCount(dataCount1);
             }
         } else {
             String staffId = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffId();